Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

base: update AREA_DETECTOR version. #53

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

base: update AREA_DETECTOR version. #53

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion base/.env
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ IPAC_VERSION=2.16
CAPUTLOG_VERSION=R4.0
RETOOLS_VERSION=b7abe82533cdbd7ddbc2dc845c95a2c51b7f2db9

AREA_DETECTOR_VERSION=R3-12-1
AREA_DETECTOR_VERSION=R3-13
NDSSCPIMEGA_VERSION=1.0.0

MOTOR_VERSION=R7-3-1
Expand Down
1 change: 0 additions & 1 deletion base/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,6 @@ WORKDIR ${EPICS_MODULES_PATH}
COPY install_modules.sh .
RUN ./install_modules.sh

COPY backport-adsupport-nanohttp.patch .
COPY install_area_detector.sh .
RUN ./install_area_detector.sh

Expand Down
40 changes: 0 additions & 40 deletions base/backport-adsupport-nanohttp.patch
View file
Open in desktop

This file was deleted.

2 changes: 0 additions & 2 deletions base/install_area_detector.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,8 +92,6 @@ ARAVIS_INCLUDE=$(pkg-config --cflags-only-I aravis-0.8 | sed -e "s|-I||g")

cd -

patch -d ADSupport -Np1 < ${EPICS_MODULES_PATH}/backport-adsupport-nanohttp.patch

make -j${JOBS}
make clean

Expand Down