Skip to content

Commit 7aaf29d

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. This implies that any IOC that uses ADPimega must include an entry in RUNTIME_TAR_PACKAGES pointing to a tarball of the same version used during the support module build.
1 parent 46ae0c0 commit 7aaf29d

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
@@ -11,7 +11,9 @@ SSCAN_VERSION=R2-11-5
1111
RECCASTER_VERSION=1.5
1212
IPAC_VERSION=2.16
1313
AREA_DETECTOR_VERSION=R3-12-1
14+
ADPIMEGA_VERSION=2.5.2-1
1415
NDSSCPIMEGA_VERSION=1.0.0
1516
MOTOR_VERSION=R7-3-1
1617

18+
LIBPIMEGA_VERSION=2.5.2-0
1719
LIBSSCPIMEGA_VERSION=main

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 \
@@ -21,6 +23,11 @@ RUN apt update -y && \
2123

2224
COPY lnls-get-n-unpack.sh /usr/local/bin/lnls-get-n-unpack
2325

26+
ARG LIBPIMEGA_VERSION
27+
28+
RUN lnls-get-n-unpack -r \
29+
http://gca-jobs:1234/packages/libpimega_${LIBPIMEGA_VERSION}_amd64.tar.gz
30+
2431
ARG EPICS_BASE_VERSION
2532
ENV EPICS_BASE_PATH /opt/epics/base
2633
ENV EPICS_MODULES_PATH /opt/epics/modules
@@ -42,6 +49,7 @@ ARG SSCAN_VERSION
4249
ARG RECCASTER_VERSION
4350
ARG IPAC_VERSION
4451
ARG AREA_DETECTOR_VERSION
52+
ARG ADPIMEGA_VERSION
4553
ARG NDSSCPIMEGA_VERSION
4654
ARG MOTOR_VERSION
4755

base/docker-compose.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@ services:
2222
RECCASTER_VERSION: ${RECCASTER_VERSION}
2323
IPAC_VERSION: ${IPAC_VERSION}
2424
AREA_DETECTOR_VERSION: ${AREA_DETECTOR_VERSION}
25+
ADPIMEGA_VERSION: ${ADPIMEGA_VERSION}
2526
NDSSCPIMEGA_VERSION: ${NDSSCPIMEGA_VERSION}
2627
MOTOR_VERSION: ${MOTOR_VERSION}
28+
LIBPIMEGA_VERSION: ${LIBPIMEGA_VERSION}
2729
LIBSSCPIMEGA_VERSION: ${LIBSSCPIMEGA_VERSION}

base/install_area_detector.sh

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

0 commit comments

Comments
 (0)