Skip to content

Commit 88403ca

Browse files
base: add support for ADPimega module.
Pimega library is closed-source and its binaries and header files are thus installed from a tarball. pimegaIOC in `iocs` is currently used in deploy. Thus, it is build along with the support module.
1 parent 4537c9e commit 88403ca

File tree

4 files changed

+27
-0
lines changed

4 files changed

+27
-0
lines changed

base/.env

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,9 @@ IPAC_VERSION=2.16
1313
CAPUTLOG_VERSION=R4.0
1414

1515
AREA_DETECTOR_VERSION=R3-12-1
16+
ADPIMEGA_VERSION=2.5.2-1
1617
NDSSCPIMEGA_VERSION=1.0.0
1718
MOTOR_VERSION=R7-3-1
1819

20+
LIBPIMEGA_VERSION=2.5.2-0
1921
LIBSSCPIMEGA_VERSION=fb8acf533a7c01b5266bf32d60d1a5f923e19523

base/Dockerfile

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@ RUN apt update -y && \
1111
build-essential \
1212
git \
1313
libaravis-dev \
14+
libczmq-dev \
15+
libjson-c-dev \
1416
libreadline-dev \
1517
libtiff-dev \
1618
libusb-1.0-0-dev \
@@ -22,6 +24,11 @@ RUN apt update -y && \
2224
COPY lnls-get-n-unpack.sh /usr/local/bin/lnls-get-n-unpack
2325
COPY lnls-run.sh /usr/local/bin/lnls-run
2426

27+
ARG LIBPIMEGA_VERSION
28+
29+
RUN lnls-get-n-unpack -r \
30+
http://download.lnls.br/packages/libpimega_${LIBPIMEGA_VERSION}_amd64.tar.gz
31+
2532
ARG EPICS_BASE_VERSION
2633
ENV EPICS_BASE_PATH /opt/epics/base
2734
ENV EPICS_MODULES_PATH /opt/epics/modules
@@ -45,6 +52,7 @@ ARG IPAC_VERSION
4552
ARG CAPUTLOG_VERSION
4653

4754
ARG AREA_DETECTOR_VERSION
55+
ARG ADPIMEGA_VERSION
4856
ARG NDSSCPIMEGA_VERSION
4957
ARG MOTOR_VERSION
5058

base/docker-compose.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@ services:
2323
IPAC_VERSION: ${IPAC_VERSION}
2424
CAPUTLOG_VERSION: ${CAPUTLOG_VERSION}
2525
AREA_DETECTOR_VERSION: ${AREA_DETECTOR_VERSION}
26+
ADPIMEGA_VERSION: ${ADPIMEGA_VERSION}
2627
NDSSCPIMEGA_VERSION: ${NDSSCPIMEGA_VERSION}
2728
MOTOR_VERSION: ${MOTOR_VERSION}
29+
LIBPIMEGA_VERSION: ${LIBPIMEGA_VERSION}
2830
LIBSSCPIMEGA_VERSION: ${LIBSSCPIMEGA_VERSION}

base/install_area_detector.sh

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -112,3 +112,18 @@ ASYN=${EPICS_MODULES_PATH}/asyn
112112
AREA_DETECTOR=${EPICS_MODULES_PATH}/areaDetector
113113
ADCORE=${EPICS_MODULES_PATH}/areaDetector/ADCore
114114
"
115+
116+
cd areaDetector
117+
118+
lnls-get-n-unpack -l http://download.lnls.br/packages/ad-pimega_${ADPIMEGA_VERSION}.tar.gz
119+
120+
echo "
121+
EPICS_BASE=${EPICS_BASE_PATH}
122+
" > ADPimega/configure/RELEASE.local
123+
124+
echo "ADPIMEGA=${EPICS_MODULES_PATH}/areaDetector/ADPimega" >> $EPICS_RELEASE_FILE
125+
126+
echo "BUILD_IOCS=YES" >> configure/CONFIG_SITE
127+
cp $EPICS_RELEASE_FILE ADPimega/iocs/pimegaIOC/configure/RELEASE
128+
129+
make -C ADPimega

0 commit comments

Comments
 (0)