cafe/cpp
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: cafe:cafe-1.19.3
Branches Tags
cafe:master
cafe:0.0.0 cafe:cafe-1.20.1 cafe:cafe-1.19.3 cafe:cafe-1.19.0-py38-gcc-7.5.0 cafe:cafe-1.18.0 cafe:cafe-1.16.1 cafe:cafe-1.15.0 cafe:cafe-1-14.5 cafe:cafe-1-14.4-2 cafe:cafe-1.14.4 cafe:cafe-1.13.0 cafe:cafe-1.12.5 cafe:cafe-1.8.0 cafe:pycafe-1.5.0-final-2 cafe:cafe-1.5.0-final-2 cafe:pycafe-1.5.0-final-1 cafe:cafe-1.5.0-final-1 cafe:pycafe-1.3.0-final-2 cafe:cafe-1.3.0-final-2
...
compare: cafe:master
Branches Tags
cafe:master
cafe:0.0.0 cafe:cafe-1.20.1 cafe:cafe-1.19.3 cafe:cafe-1.19.0-py38-gcc-7.5.0 cafe:cafe-1.18.0 cafe:cafe-1.16.1 cafe:cafe-1.15.0 cafe:cafe-1-14.5 cafe:cafe-1-14.4-2 cafe:cafe-1.14.4 cafe:cafe-1.13.0 cafe:cafe-1.12.5 cafe:cafe-1.8.0 cafe:pycafe-1.5.0-final-2 cafe:cafe-1.5.0-final-2 cafe:pycafe-1.5.0-final-1 cafe:cafe-1.5.0-final-1 cafe:pycafe-1.3.0-final-2 cafe:cafe-1.3.0-final-2

5 Commits
cafe-1.19. ... master

Author SHA1 Message Date
chrin
3d955b1c98 varied gcc compiler in makefile 2025-10-10 12:09:56 +02:00
chrin
532abc7b1b README and cafe_version-py 2025-10-06 11:47:30 +02:00
chrin
9e00fc0e0c first user commit to gitea 2025-10-01 12:36:28 +02:00
chrin
a1c964f771 epics 7.0.8 2024-07-10 16:00:57 +02:00
chrin
df07cf1a29 v1.20.1 2024-07-04 11:47:27 +02:00
25 changed files with 708 additions and 998 deletions
Expand all files Collapse all files

5
.gitignore vendored
View File

@@ -1,6 +1,7 @@
# Temporary editor files # # Temporary editor files #
########################## ##########################
*~ *~
*-
# AFS temporary files # # AFS temporary files #
####################### #######################
@@ -35,6 +36,10 @@ src/*.lo
src/*.la src/*.la
src/.deps/* src/.deps/*
src/bitshuffle/.deps/* src/bitshuffle/.deps/*
src/bitshuffle/.libs/*
src/bitshuffle/*.o
src/bitshuffle/*.Plo
src/bitshuffle/*.lo
src/.libs/* src/.libs/*
examples/cafeTest/*.*- examples/cafeTest/*.*-
doc doc

44
README
View File

@@ -1,18 +1,25 @@
## ##
autogen_rel_py3.sh ==> generates library for use from within python and C++ Change cafe version in three place:
autogen_rel_py3_noqt.sh ==> generates library for use from within python and C++ (remove Qt4 dependency if xml not required) 1)
autogen_rel_noqt.sh ==> generates library for building a mex file (remove Qt4 dependence as matlab requires Qt5) configure.ac
autogen_rel.sh ==> normal c++ release AC_INIT([CAFE], [1.22.0], [Bug reports to: felix.armborst@psi.ch, j.chrin@hispeed.ch])
2)
src/makefile.am
libcafe_la_LDFLAGS = -version-info 23:0:22 #corresponds to 1.22.0 (run cafe_version.py)
3)
autogen.sh
CAFE_V="cafe-1.22.0"
EPICS_BASE='base-7.0.9' #change epics version here
autogen.sh sls2 py310/py38/py37 ==> generates library for use from within python and C++
autogen.sh sls2 cpp ==> generates library for use in cpp
autogen.sh sls2 matlab ==> generates library for building a mex file
autogen.sh hipa cpp ==> generates library for use cpp **without** qt libraries
autogen.sh sf py37 ==> generates library for use use in swissfel with bsread/zmq capabilty
Libraries are only made available when the appropriate is enabld
#ENABLE_OPTIONS+=" --enable-qt5"
##ENABLE_OPTIONS+=" --enable-qt4"
#ENABLE_OPTIONS+=" --enable-python37"
##ENABLE_OPTIONS+=" --enable-python35"
#ENABLE_OPTIONS+=" --enable-json"
#ENABLE_OPTIONS+=" --enable-zeromq"
#ENABLE_OPTIONS+=" --enable-curl"
#ENABLE_OPTIONS+=" --enable-lz4"
## ##
## -------------------------------------------------------------------------- ## --------------------------------------------------------------------------
@@ -23,17 +30,6 @@ Libraries are only made available when the appropriate is enabld
## ##
## --libdir: This is the directory to which the cafe shared objects are ## --libdir: This is the directory to which the cafe shared objects are
## installed ## installed
## --with-boost: base directory for the boost header files
## --with-epics7: epics7 top level directory
## --with-epics3: epics3 top level directory
## Note that configure.ac assume that the architecture is
## base/lib/${EPICS_HOST_ARCH}
## --with-qt5: Qt5 base directory (optional)
## --with-python37: Python 3.7 directory, if building PyCafe
## --with-python35: Python 3.5 directory, if bulding PyCafe
## Remaining libraries are specific to swissfel zmq streams
## -------------------------------------------------------------------------- ## --------------------------------------------------------------------------
1) Modify autogen.sh according to above 1) Modify autogen.sh according to above

86
autogen.sh
View File

@@ -1,86 +0,0 @@
### psi specific - select compiler
rm -f configure.ac
ln -s configurePSI.ac configure.ac
rm -f src/PyCafe.cpp
ln -s PyCafe_sls.cpp src/PyCafe.cpp
rm -f ./aclocal.m4
rm -rf ./autom4te.cache
aclocal --force -I m4
/opt/gfa/python-3.7/latest/bin/libtoolize --force --copy #select libtools 2.4.6
autoconf --force #interprets configure.ac
autoheader --force
automake --force --add-missing --copy
#Check what the EPICS RELEASE IS from ${EPICS}/base
#Used by ./configure
#Assumes format ${EPICS}/base-3.14.12
#source cafeVersion-gcc-7.3.0
CAFE_V="cafe-1.13.0"
#For later check of existence of HOST_ARCH for $EPICS/include/os/$HOST_ARCH
#Assume Linux but check if Darwin
CAFE_HOST_FLAG_DARWIN=$(echo ${EPICS_HOST_ARCH} | grep -c "Darwin")
echo 'darwin' $CAFE_HOST_FLAG_DARWIN
export CAFE_HOST_FLAG_DARWIN=$CAFE_HOST_FLAG_DARWIN
EPICS_BASE=$(readlink ${EPICS}/base)
#EB=$(readlink /afs/psi.ch/project/cafe/gitworkspace/CAFE/cpp/base)
echo $EPICS_BASE
if [ -z "$EPICS_BASE" ]
then
EPICS_BASE='base-7.4.1' #7.0 = 7+0 = 7 for major release
fi
echo 'input' "$0" "$1" "$2"
echo $EPICS_BASE
EB1=$(echo $EPICS_BASE | sed -e "s/[a-zA-Z]*-//g")
EBMAJ=$(echo $EB1 | sed -e "s/[[:punct:]].*//g")
EBMIN1=$(echo $EB1 | sed -e "s/^[[:digit:]]*[[:punct:]]//g")
EBMIN=$(echo $EBMIN1 | sed -e "s/[[:punct:]][[:digit:]]*//g")
EBPAT=$(echo $EB1 | sed -e "s/[[:digit:]]*[[:punct:]]//g")
echo EPICS_MAJOR=$EBMAJ
echo EPICS_MINOR=$EBMIN
echo EPICS_PATCH=$EBPAT
#echo $EBMIN1
export CAFE_EPICS_V_MAJOR=$EBMAJ
export CAFE_EPICS_V_MINOR=$EBMIN
export CAFE_EPICS_V_PATCH=$EBPAT
ENABLE_OPTIONS="--enable-boost-inc"
ENABLE_OPTIONS+=" --enable-epics3"
#ENABLE_OPTIONS+=" --enable-epics7"
ENABLE_OPTIONS+=" --enable-qt5"
#ENABLE_OPTIONS+=" --enable-qt4"
ENABLE_OPTIONS+=" --enable-python37"
#ENABLE_OPTIONS+=" --enable-python35"
#ENABLE_OPTIONS+=" --enable-json"
#ENABLE_OPTIONS+=" --enable-zeromq"
#ENABLE_OPTIONS+=" --enable-curl"
#ENABLE_OPTIONS+=" --enable-lz4"
echo 'ENABLE_OPTIONS='$ENABLE_OPTIONS
./configure \
--prefix=/opt/gfa/cafe/cpp/${CAFE_V} \
--libdir=/opt/gfa/cafe/cpp/${CAFE_V}/lib/${EPICS_HOST_ARCH} \
${ENABLE_OPTIONS} \
--with-boost-inc=/opt/gfa/cafe/boost/boost_1_61_0/include \
--with-epics7=${EPICS}/base-7.0.4.1 \
--with-epics3=${EPICS}/base \
--with-python37=/opt/gfa/python-3.7/latest \
--with-python35=/opt/gfa/python-3.5/latest \
--with-qt5=/opt/gfa/python-3.7/latest \
--with-qt4=/opt/gfa/python-3.5/latest \
--with-json=/opt/gfa/zmsglog/json/jsoncpp-src-0.6.0-rc2 \
--with-zeromq=/opt/gfa/zmq/zeromq-4.2.3-gcc-6.3.0 \
--with-curl=/opt/gfa/zmq/curl-7.55.1 \
--with-lz4=/opt/gfa/zmq/lz4/lib
unset CAFE_EPICS_V_PATCH
unset CAFE_EPICS_V_MINOR
unset CAFE_EPICS_V_MAJOR
unset CAFE_HOST_FLAG_DARWIN

1
autogen.sh Symbolic link
View File

@@ -0,0 +1 @@
autogen_sfbd.sh

293
autogen_psi.sh
View File

@@ -1,293 +0,0 @@
### psi specific - select compiler
#source <this_autogen_file> <facility> <target_language>
#<facility = sls sls2 sf> default is sf
#<target_language = cpp matlab python>
module unload gcc
module load gcc/7.3.0
### psi specific - end
rm -f configure.ac
ln -s configurePSI.ac configure.ac
rm -f ./aclocal.m4
rm -rf ./autom4te.cache
aclocal --force -I m4
/opt/gfa/python-3.7/latest/bin/libtoolize --force --copy #select libtools 2.4.6
autoconf --force #interprets configure.ac
autoheader --force
automake --force --add-missing --copy
#autoreconf not wanted
#Check what the EPICS RELEASE IS from ${EPICS}/base
#Used by ./configure
#Assumes format ${EPICS}/base-3.14.12
#source cafeVersion-gcc-7.3.0
CAFE_V="cafe-1.14.5"
#For later check of existence of HOST_ARCH for $EPICS/include/os/$HOST_ARCH
#Assume Linux but check if Darwin
CAFE_HOST_FLAG_DARWIN=$(echo ${EPICS_HOST_ARCH} | grep -c "Darwin")
export CAFE_HOST_FLAG_DARWIN=$CAFE_HOST_FLAG_DARWIN
RETURN_ON_WRONG_INPUT=true
RETURN_FLAG=false
EPICS_BASE=$(readlink ${EPICS}/base)
#EB=$(readlink /afs/psi.ch/project/cafe/gitworkspace/CAFE/cpp/base)
echo $EPICS_BASE
if [ -z "$EPICS_BASE" ]
then
EPICS_BASE='base-7' #7.0 = 7+0 = 7 for major release
fi
echo 'input' "$0" "$1" "$2"
echo $EPICS_BASE
FACILITY=$(echo "$1" | tr '[:upper:]' '[:lower:]')
CACLIENT=$(echo "$2" | tr '[:upper:]' '[:lower:]')
FACILITY_DEFAULT="sf"
CACLIENT_DEFAULT="python"
FACILITY_TEMP=""
CACLIENT_TEMP=""
echo 'input arg. facility/target' $FACILITY $CACLIENT
if [ -n "$FACILITY" ]
then
if [ "$FACILITY" = "matlab" ] || [ "$FACILITY" = "python" ] || \
[ "$FACILITY" = "py310" ] || [ "$FACILITY" = "py38" ] || \
[ "$FACILITY" = "py37" ] || [ "$FACILITY" = "py35" ] || \
[ "$FACILITY" = "julia" ] || [ "$FACILITY" = "cpp" ] || \
[ "$FACILITY" = "cc" ]
then
CACLIENT_TEMP=$FACILITY
FACILITY_TEMP=$2
fi
fi
if [ -n "$CACLIENT" ]
then
if [ "$CACLIENT" = "sls" ] || [ "$CACLIENT" = "sls2" ] || \
[ "$CACLIENT" = "sf" ] || [ "$CACLIENT" = "swissfel" ] || \
[ "$CACLIENT" = "sfel" ] || [ "$CACLIENT" = "hipa" ]
then
if [ -z $FACILITY_TEMP ]
then
FACILITY_TEMP=$CACLIENT
CACLIENT_TEMP=$1
fi
fi
fi
if [ -z "$FACILITY" ]
then
FACILITY="sf"
echo "FACILITY = " $FACILITY
if [ -z $CACLIENT ]
then
CACLIENT=$CACLIENT_DEFAULT
fi
elif [ "$FACILITY" = "sls" ] || [ "$FACILITY" = "sls2" ] || \
[ "$FACILITY" = "sf" ] || [ "$FACILITY" = "swissfel" ] || \
[ "$FACILITY" = "sfel" ] || [ "$FACILITY" = "hipa" ]
then
echo "FACILITY = " $FACILITY
elif [ -n "$FACILITY_TEMP" ]
then
if [ "$FACILITY_TEMP" = "sls" ] || [ "$FACILITY_TEMP" = "sls2" ] || \
[ "$FACILITY_TEMP" = "sf" ] || [ "$FACILITY_TEMP" = "swissfel" ] || \
[ "$FACILITY_TEMP" = "sfel" ] || [ "$FACILITY_TEMP" = "hipa" ]
then
FACILITY=$FACILITY_TEMP
else
if [ -n "$2" ]
then
echo "***UNRECOGNIZED INPUT FACILITY***" $FACILITY
echo "***VALID VALUES ARE: sls sls2 sf hipa"
RETURN_FLAG=true
fi
echo "***OTHERWISE THE DEFAULT FACILITY IS:" $FACILITY_DEFAULT
FACILITY=$FACILITY_DEFAULT
fi
else
echo "***UNRECOGNIZED INPUT FACILITY***" $FACILITY
echo "***VALID VALUES ARE: sls sls2 sf hipa"
RETURN_FLAG=true
echo "***OTHERWISE THE DEFAULT FACILITY IS: " $FACILITY_DEFAULT
FACILITY=$FACILITY_DEFAULT
fi
if [ -n "$CACLIENT" ]
then
if [ "$CACLIENT" = "matlab" ] || [ "$CACLIENT" = "python" ] || \
[ "$CACLIENT" = "py310" ] || [ "$CACLIENT" = "py38" ] || \
[ "$CACLIENT" = "py37" ] || [ "$CACLIENT" = "py35" ] || \
[ "$CACLIENT" = "julia" ] || [ "$CACLIENT" = "cpp" ] || \
[ "$CACLIENT" = "cc" ]
then
echo "CA TARGET = " $CACLIENT
else
if [ -n "$CACLIENT_TEMP" ]
then
if [ "$CACLIENT_TEMP" = "matlab" ] || [ "$CACLIENT_TEMP" = "python" ] || \
[ "$CACLIENT_TEMP" = "py310" ] || [ "$CACLIENT_TEMP" = "py38" ] || \
[ "$CACLIENT_TEMP" = "py37" ] || [ "$CACLIENT_TEMP" = "py35" ] || \
[ "$CACLIENT_TEMP" = "julia" ] || [ "$CACLIENT_TEMP" = "cpp" ] || \
[ "$CACLIENT_TEMP" = "cc" ]
then
CACLIENT=$CACLIENT_TEMP
else
echo "***UNRECOGNIZED INPUT CA TARGET***" $CACLIENT
echo "***VALID VALUES ARE: cpp matlab python"
RETURN_FLAG=true
echo "***OTHERWISE THE DEFAULT CA TARGET IS:" $CACLIENT_DEFAULT
CACLIENT=$CACLIENT_DEFAULT
fi
else
echo "***UNRECOGNIZED INPUT CA TARGET***" $CACLIENT
echo "***VALID VALUES ARE: cpp matlab python"
RETURN_FLAG=true
echo "***OTHERWISE THE DEFAULT CA TARGET IS:" $CACLIENT_DEFAULT
CACLIENT=$CACLIENT_DEFAULT
fi
fi
else
CACLIENT=$CACLIENT_DEFAULT
fi
if [ $RETURN_ON_WRONG_INPUT = true ] ; then
if [ $RETURN_FLAG = true ] ; then
return 1 2>/dev/null
exit 1
fi
fi
echo "FACILITY SELECTED = " $FACILITY
echo "CA TARGET SELECTED = " $CACLIENT
ENABLE_OPTIONS="--enable-boost-inc"
if [ "$FACILITY" = "sfel" ] || [ "$FACILITY" = "swissfel" ]
then
FACILITY="sf"
fi
if [ "$CACLIENT" = "python" ] || [ "$CACLIENT" = "julia" ]
then
CACLIENT="py37"
fi
if [ "$FACILITY" = "sls2" ]
then
ENABLE_OPTIONS+=" --enable-epics7"
CAFE_V+="-sls2"
else
ENABLE_OPTIONS+=" --enable-epics3"
if [ "$FACILITY" = "sf" ] && [ "$CACLIENT" != "matlab" ]
then
CAFE_V+="-sf"
fi
fi
if [ "$CACLIENT" = "py35" ]
then
ENABLE_OPTIONS+=" --enable-python35"
ENABLE_OPTIONS+=" --enable-qt4"
CAFE_V+="-py35"
elif [ "$CACLIENT" = "py37" ]
then
ENABLE_OPTIONS+=" --enable-python37"
ENABLE_OPTIONS+=" --enable-qt5"
CAFE_V+="-py37"
elif [ "$CACLIENT" = "py38" ]
then
ENABLE_OPTIONS+=" --enable-python38"
ENABLE_OPTIONS+=" --enable-qt5py38"
CAFE_V+="-py38"
elif [ "$CACLIENT" = "py310" ]
then
ENABLE_OPTIONS+=" --enable-python310"
#ENABLE_OPTIONS+=" --enable-qt5py310"
CAFE_V+="-py310"
else
ENABLE_OPTIONS+=" --enable-qt5"
fi
if [ "$FACILITY" = "sf" ] && [ "$CACLIENT" != "matlab" ]
then
#rm -f src/PyCafe.cpp
#ln -s PyCafe3.cpp src/PyCafe.cpp
ENABLE_OPTIONS+=" --enable-json"
ENABLE_OPTIONS+=" --enable-zeromq"
ENABLE_OPTIONS+=" --enable-curl"
ENABLE_OPTIONS+=" --enable-lz4"
#else
#rm -f src/PyCafe.cpp
#ln -s PyCafe_sls.cpp src/PyCafe.cpp
fi
CAFE_V+="-gcc-"$GCC_VERSION
echo "$CAFE_V"
#echo 'EPICS BASE IS='$EPICS_BASE
#echo 'EPICS BASE DIR='${EPICS}/base-7.0.4.1
EB1=$(echo $EPICS_BASE | sed -e "s/[a-zA-Z]*-//g")
EBMAJ=$(echo $EB1 | sed -e "s/[[:punct:]].*//g")
EBMIN1=$(echo $EB1 | sed -e "s/^[[:digit:]]*[[:punct:]]//g")
EBMIN=$(echo $EBMIN1 | sed -e "s/[[:punct:]][[:digit:]]*//g")
EBPAT=$(echo $EB1 | sed -e "s/[[:digit:]]*[[:punct:]]//g")
echo EPICS_MAJOR=$EBMAJ
echo EPICS_MINOR=$EBMIN
echo EPICS_PATCH=$EBPAT
#echo $EBMIN1
export CAFE_EPICS_V_MAJOR=$EBMAJ
export CAFE_EPICS_V_MINOR=$EBMIN
export CAFE_EPICS_V_PATCH=$EBPAT
#ENABLE_OPTIONS+=" --enable-qt5"
##ENABLE_OPTIONS+=" --enable-qt4"
#ENABLE_OPTIONS+=" --enable-python37"
##ENABLE_OPTIONS+=" --enable-python35"
#ENABLE_OPTIONS+=" --enable-json"
#ENABLE_OPTIONS+=" --enable-zeromq"
#ENABLE_OPTIONS+=" --enable-curl"
#ENABLE_OPTIONS+=" --enable-lz4"
echo 'ENABLE_OPTIONS='$ENABLE_OPTIONS
./configure \
--prefix=/opt/gfa/cafe/cpp/${CAFE_V} \
--libdir=/opt/gfa/cafe/cpp/${CAFE_V}/lib/${EPICS_HOST_ARCH} \
${ENABLE_OPTIONS} \
--with-boost-inc=/opt/gfa/cafe/boost/boost_1_61_0/include \
--with-epics3=${EPICS}/base \
--with-python310=/ioc/python/latest \
--with-python38=/opt/gfa/python-3.8/latest \
--with-python37=/opt/gfa/python-3.7/latest \
--with-python35=/opt/gfa/python-3.5/latest \
--with-qt5py310=/ioc/python/latest \
--with-qt5py38=/opt/gfa/python-3.8/latest \
--with-qt5=/opt/gfa/python-3.7/latest \
--with-qt4=/opt/gfa/python-3.5/latest \
--with-json=/opt/gfa/zmq/json/jsoncpp-src-0.6.0-rc2 \
--with-zeromq=/opt/gfa/zmq/zeromq-4.2.3-gcc-6.3.0 \
--with-curl=/opt/gfa/zmq/curl-7.55.1 \
--with-lz4=/opt/gfa/zmq/lz4/lib \
--with-epics7=${EPICS}/base-7.0.6
unset CAFE_EPICS_V_PATCH
unset CAFE_EPICS_V_MINOR
unset CAFE_EPICS_V_MAJOR
unset CAFE_HOST_FLAG_DARWIN

56
autogen_sfbd.sh
View File

@@ -3,8 +3,11 @@
#<facility = sls sls2 sf> default is sf #<facility = sls sls2 sf> default is sf
#<target_language = cpp matlab python> #<target_language = cpp matlab python>
module unload gcc module unload gcc
module load gcc/7.5.0 #7.5.0 for py38 py310 7.3.0 py37 module load gcc/10.4.0 ##rhel8 - default
#module load gcc/8.5.0 #rhel8 #Above overwritten for python in the below
#module load gcc/7.3.0 for py35 py37
#module load gcc/7.5.0 for py38 py310
### psi specific - end ### psi specific - end
rm -f configure.ac rm -f configure.ac
@@ -24,8 +27,8 @@ automake --force --add-missing --copy
#Used by ./configure #Used by ./configure
#Assumes format ${EPICS}/base-3.14.12 #Assumes format ${EPICS}/base-3.14.12
#source cafeVersion-gcc-7.3.0 #source cafeVersion-gcc-7.3.0
CAFE_V="cafe-1.19.3" CAFE_V="cafe-1.22.0"
EPICS_BASE='base-7.0.7' # EPICS_BASE='base-7.0.9' #
#For later check of existence of HOST_ARCH for $EPICS/include/os/$HOST_ARCH #For later check of existence of HOST_ARCH for $EPICS/include/os/$HOST_ARCH
#Assume Linux but check if Darwin #Assume Linux but check if Darwin
@@ -52,8 +55,11 @@ echo $EPICS_BASE
FACILITY=$(echo "$1" | tr '[:upper:]' '[:lower:]') FACILITY=$(echo "$1" | tr '[:upper:]' '[:lower:]')
CACLIENT=$(echo "$2" | tr '[:upper:]' '[:lower:]') CACLIENT=$(echo "$2" | tr '[:upper:]' '[:lower:]')
FACILITY_DEFAULT="sf" #FACILITY_DEFAULT="sf"
CACLIENT_DEFAULT="python" #CACLIENT_DEFAULT="python"
FACILITY_DEFAULT="sls2"
CACLIENT_DEFAULT="py37"
FACILITY_TEMP="" FACILITY_TEMP=""
CACLIENT_TEMP="" CACLIENT_TEMP=""
@@ -92,7 +98,7 @@ fi
if [ -z "$FACILITY" ] if [ -z "$FACILITY" ]
then then
FACILITY="sf" FACILITY=$FACILITY_DEFAULT
echo "FACILITY = " $FACILITY echo "FACILITY = " $FACILITY
if [ -z $CACLIENT ] if [ -z $CACLIENT ]
then then
@@ -204,6 +210,9 @@ else
if [ "$FACILITY" = "sf" ] && [ "$CACLIENT" != "matlab" ] if [ "$FACILITY" = "sf" ] && [ "$CACLIENT" != "matlab" ]
then then
CAFE_V+="-sf" CAFE_V+="-sf"
elif [ "$FACILITY" = "hipa" ] && [ "$CACLIENT" != "matlab" ]
then
CAFE_V+="-hipa"
elif [ "$FACILITY" = "sls" ] && [ "$CACLIENT" != "matlab" ] elif [ "$FACILITY" = "sls" ] && [ "$CACLIENT" != "matlab" ]
then then
CAFE_V+="-epics3" CAFE_V+="-epics3"
@@ -217,34 +226,49 @@ then
ENABLE_OPTIONS+=" --enable-python34" ENABLE_OPTIONS+=" --enable-python34"
ENABLE_OPTIONS+=" --enable-qt4py34" ENABLE_OPTIONS+=" --enable-qt4py34"
CAFE_V+="-py34" CAFE_V+="-py34"
module unload
module load gcc/7.3.0
elif [ "$CACLIENT" = "py35" ] elif [ "$CACLIENT" = "py35" ]
then then
ENABLE_OPTIONS+=" --enable-python35" ENABLE_OPTIONS+=" --enable-python35"
ENABLE_OPTIONS+=" --enable-qt4" ENABLE_OPTIONS+=" --enable-qt4"
CAFE_V+="-py35" CAFE_V+="-py35"
module unload
module load gcc/7.3.0
elif [ "$CACLIENT" = "py37" ] elif [ "$CACLIENT" = "py37" ]
then then
ENABLE_OPTIONS+=" --enable-python37" ENABLE_OPTIONS+=" --enable-python37"
ENABLE_OPTIONS+=" --enable-qt5" ENABLE_OPTIONS+=" --enable-qt5"
CAFE_V+="-py37" CAFE_V+="-py37"
module unload
module load gcc/7.5.0
elif [ "$CACLIENT" = "py38" ] elif [ "$CACLIENT" = "py38" ]
then then
ENABLE_OPTIONS+=" --enable-python38" ENABLE_OPTIONS+=" --enable-python38"
ENABLE_OPTIONS+=" --enable-qt5py38" ENABLE_OPTIONS+=" --enable-qt5py38"
CAFE_V+="-py38" CAFE_V+="-py38"
module unload
module load gcc/7.5.0
elif [ "$CACLIENT" = "py39" ] elif [ "$CACLIENT" = "py39" ]
then then
ENABLE_OPTIONS+=" --enable-python39" ENABLE_OPTIONS+=" --enable-python39"
ENABLE_OPTIONS+=" --enable-qt5py39" ENABLE_OPTIONS+=" --enable-qt5py39"
CAFE_V+="-py39" CAFE_V+="-py39"
module load gcc/7.5.0
elif [ "$CACLIENT" = "py310" ] elif [ "$CACLIENT" = "py310" ]
then then
ENABLE_OPTIONS+=" --enable-python310" ENABLE_OPTIONS+=" --enable-python310"
#ENABLE_OPTIONS+=" --enable-qt5py310" ENABLE_OPTIONS+=" --enable-qt5py310"
CAFE_V+="-py310" CAFE_V+="-py310"
module unload
module load gcc/7.5.0
elif [ "$CACLIENT" = "cpp" ] elif [ "$CACLIENT" = "cpp" ]
then then
ENABLE_OPTIONS+=" --enable-qt5" if [ "$FACILITY" != "hipa" ]
then
ENABLE_OPTIONS+=" --enable-qt5py310"
fi
fi fi
if [ "$FACILITY" = "sf" ] && [ "$CACLIENT" != "matlab" ] if [ "$FACILITY" = "sf" ] && [ "$CACLIENT" != "matlab" ]
@@ -255,6 +279,8 @@ then
ENABLE_OPTIONS+=" --enable-zeromq" ENABLE_OPTIONS+=" --enable-zeromq"
ENABLE_OPTIONS+=" --enable-curl" ENABLE_OPTIONS+=" --enable-curl"
ENABLE_OPTIONS+=" --enable-lz4" ENABLE_OPTIONS+=" --enable-lz4"
module unload
module load gcc/7.3.0
#else #else
#rm -f src/PyCafe.cpp #rm -f src/PyCafe.cpp
#ln -s PyCafe_sls.cpp src/PyCafe.cpp #ln -s PyCafe_sls.cpp src/PyCafe.cpp
@@ -309,10 +335,10 @@ echo 'ENABLE_OPTIONS============> '$ENABLE_OPTIONS
--with-qt5=/opt/gfa/python-3.7/latest \ --with-qt5=/opt/gfa/python-3.7/latest \
--with-qt4=/opt/gfa/python-3.5/latest \ --with-qt4=/opt/gfa/python-3.5/latest \
--with-qt4py34=/opt/psi/Programming/psi-python34/2.1.0 \ --with-qt4py34=/opt/psi/Programming/psi-python34/2.1.0 \
--with-json=/sf/bd/deps/zmq/json/jsoncpp-src-0.6.0-rc2 \ --with-json=/opt/gfa/cafe/deps/zmq/json/jsoncpp-src-0.6.0-rc2 \
--with-zeromq=/sf/bd/deps/zmq/zeromq-4.2.3-gcc-6.3.0 \ --with-zeromq=/opt/gfa/cafe/deps/zmq/zeromq-4.2.3-gcc-6.3.0 \
--with-curl=/sf/bd/deps/zmq/curl-7.55.1 \ --with-curl=/opt/gfa/cafe/deps/zmq/curl-7.55.1 \
--with-lz4=/sf/bd/deps/zmq/lz4/lib \ --with-lz4=/opt/gfa/cafe/deps/zmq/lz4/lib \
--with-epics7=/usr/local/epics/${EPICS_BASE} --with-epics7=/usr/local/epics/${EPICS_BASE}
unset CAFE_EPICS_V_PATCH unset CAFE_EPICS_V_PATCH
unset CAFE_EPICS_V_MINOR unset CAFE_EPICS_V_MINOR

24
cafe_version.py Normal file
View File

@@ -0,0 +1,24 @@
# Converts cafe 'major' 'minor' 'revision'
# to syntax for use in libcafe_la_LDFLAGS
# in src/makefile.am
#
import sys
if (len(sys.argv) != 4):
print('Usage: cafe_version_py major minor revision')
print('Usage: e.g. cafe_version.py 1.22.0 returns 23:0:22')
sys.exit()
print(f'input args: {sys.argv}')
print('Change the following in src/makefile.am')
major = int(sys.argv[1])
minor = int(sys.argv[2])
rev = int(sys.argv[3])
current = major+minor
revision = rev
age = minor
print(f'libcafe_la_LDFLAGS = -version-info {current}:{revision}:{age}')

667
config.log
View File

File diff suppressed because it is too large Load Diff

142
config.status
View File

@@ -380,7 +380,7 @@ exec 6>&1
# report actual input values of CONFIG_FILES etc. instead of their # report actual input values of CONFIG_FILES etc. instead of their
# values after options handling. # values after options handling.
ac_log=" ac_log="
This file was extended by CAFE $as_me 1.19.3, which was This file was extended by CAFE $as_me 1.22.0, which was
generated by GNU Autoconf 2.69. Invocation command line was generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES CONFIG_FILES = $CONFIG_FILES
@@ -427,9 +427,9 @@ $config_commands
Report bugs to <Bug reports to: jan.chrin@psi.ch>." Report bugs to <Bug reports to: jan.chrin@psi.ch>."
ac_cs_config="'--prefix=/opt/gfa/cafe/cpp/cafe-1.19.3-py310-gcc-7.5.0' '--libdir=/opt/gfa/cafe/cpp/cafe-1.19.3-py310-gcc-7.5.0/lib/RHEL8-x86_64' '--enable-boost-inc' '--enable-epics7' '--enable-python310' '--with-boost-inc=/opt/gfa/cafe/boost/boost_1_61_0/include' '--with-epics3=/usr/local/epics/base' '--with-python310=/opt/gfa/python-3.10/latest' '--with-python38=/opt/gfa/python-3.8/latest' '--with-python37=/opt/gfa/python-3.7/latest' '--with-python35=/opt/gfa/python-3.5/latest' '--with-python34=/opt/psi/Programming/psi-python34/2.1.0' '--with-qt5py310=/opt/gfa/python-3.10/latest' '--with-qt5py38=/opt/gfa/python-3.8/latest' '--with-qt5=/opt/gfa/python-3.7/latest' '--with-qt4=/opt/gfa/python-3.5/latest' '--with-qt4py34=/opt/psi/Programming/psi-python34/2.1.0' '--with-json=/sf/bd/deps/zmq/json/jsoncpp-src-0.6.0-rc2' '--with-zeromq=/sf/bd/deps/zmq/zeromq-4.2.3-gcc-6.3.0' '--with-curl=/sf/bd/deps/zmq/curl-7.55.1' '--with-lz4=/sf/bd/deps/zmq/lz4/lib' '--with-epics7=/usr/local/epics/base-7.0.7' 'CXX=/opt/psi/Programming/gcc/7.5.0/bin/g++' 'CC=/opt/psi/Programming/gcc/7.5.0/bin/gcc'" ac_cs_config="'--prefix=/opt/gfa/cafe/cpp/cafe-1.22.0-gcc-10.4.0' '--libdir=/opt/gfa/cafe/cpp/cafe-1.22.0-gcc-10.4.0/lib/RHEL8-x86_64' '--enable-boost-inc' '--enable-epics7' '--with-boost-inc=/opt/gfa/cafe/boost/boost_1_61_0/include' '--with-epics3=/usr/local/epics/base' '--with-python310=/opt/gfa/python-3.10/latest' '--with-python38=/opt/gfa/python-3.8/latest' '--with-python37=/opt/gfa/python-3.7/latest' '--with-python35=/opt/gfa/python-3.5/latest' '--with-python34=/opt/psi/Programming/psi-python34/2.1.0' '--with-qt5py310=/opt/gfa/python-3.10/latest' '--with-qt5py38=/opt/gfa/python-3.8/latest' '--with-qt5=/opt/gfa/python-3.7/latest' '--with-qt4=/opt/gfa/python-3.5/latest' '--with-qt4py34=/opt/psi/Programming/psi-python34/2.1.0' '--with-json=/opt/gfa/cafe/deps/zmq/json/jsoncpp-src-0.6.0-rc2' '--with-zeromq=/opt/gfa/cafe/deps/zmq/zeromq-4.2.3-gcc-6.3.0' '--with-curl=/opt/gfa/cafe/deps/zmq/curl-7.55.1' '--with-lz4=/opt/gfa/cafe/deps/zmq/lz4/lib' '--with-epics7=/usr/local/epics/base-7.0.9' 'CXX=/opt/psi/Programming/gcc/10.4.0/bin/g++' 'CC=/opt/psi/Programming/gcc/10.4.0/bin/gcc'"
ac_cs_version="\ ac_cs_version="\
CAFE config.status 1.19.3 CAFE config.status 1.22.0
configured by ./configure, generated by GNU Autoconf 2.69, configured by ./configure, generated by GNU Autoconf 2.69,
with options \"$ac_cs_config\" with options \"$ac_cs_config\"
@@ -437,10 +437,10 @@ Copyright (C) 2012 Free Software Foundation, Inc.
This config.status script is free software; the Free Software Foundation This config.status script is free software; the Free Software Foundation
gives unlimited permission to copy, distribute and modify it." gives unlimited permission to copy, distribute and modify it."
ac_pwd='/afs/psi.ch/project/cafe/gitlab/CAFE/cpp' ac_pwd='/afs/psi.ch/project/cafe/gitea/CAFE/cpp'
srcdir='.' srcdir='.'
INSTALL='/usr/bin/install -c' INSTALL='/bin/install -c'
MKDIR_P='/usr/bin/mkdir -p' MKDIR_P='/bin/mkdir -p'
AWK='gawk' AWK='gawk'
test -n "$AWK" || AWK=awk test -n "$AWK" || AWK=awk
# The default lists apply if the user does not specify any file. # The default lists apply if the user does not specify any file.
@@ -519,7 +519,7 @@ if $ac_cs_silent; then
fi fi
if $ac_cs_recheck; then if $ac_cs_recheck; then
set X /bin/sh './configure' '--prefix=/opt/gfa/cafe/cpp/cafe-1.19.3-py310-gcc-7.5.0' '--libdir=/opt/gfa/cafe/cpp/cafe-1.19.3-py310-gcc-7.5.0/lib/RHEL8-x86_64' '--enable-boost-inc' '--enable-epics7' '--enable-python310' '--with-boost-inc=/opt/gfa/cafe/boost/boost_1_61_0/include' '--with-epics3=/usr/local/epics/base' '--with-python310=/opt/gfa/python-3.10/latest' '--with-python38=/opt/gfa/python-3.8/latest' '--with-python37=/opt/gfa/python-3.7/latest' '--with-python35=/opt/gfa/python-3.5/latest' '--with-python34=/opt/psi/Programming/psi-python34/2.1.0' '--with-qt5py310=/opt/gfa/python-3.10/latest' '--with-qt5py38=/opt/gfa/python-3.8/latest' '--with-qt5=/opt/gfa/python-3.7/latest' '--with-qt4=/opt/gfa/python-3.5/latest' '--with-qt4py34=/opt/psi/Programming/psi-python34/2.1.0' '--with-json=/sf/bd/deps/zmq/json/jsoncpp-src-0.6.0-rc2' '--with-zeromq=/sf/bd/deps/zmq/zeromq-4.2.3-gcc-6.3.0' '--with-curl=/sf/bd/deps/zmq/curl-7.55.1' '--with-lz4=/sf/bd/deps/zmq/lz4/lib' '--with-epics7=/usr/local/epics/base-7.0.7' 'CXX=/opt/psi/Programming/gcc/7.5.0/bin/g++' 'CC=/opt/psi/Programming/gcc/7.5.0/bin/gcc' $ac_configure_extra_args --no-create --no-recursion set X /bin/sh './configure' '--prefix=/opt/gfa/cafe/cpp/cafe-1.22.0-gcc-10.4.0' '--libdir=/opt/gfa/cafe/cpp/cafe-1.22.0-gcc-10.4.0/lib/RHEL8-x86_64' '--enable-boost-inc' '--enable-epics7' '--with-boost-inc=/opt/gfa/cafe/boost/boost_1_61_0/include' '--with-epics3=/usr/local/epics/base' '--with-python310=/opt/gfa/python-3.10/latest' '--with-python38=/opt/gfa/python-3.8/latest' '--with-python37=/opt/gfa/python-3.7/latest' '--with-python35=/opt/gfa/python-3.5/latest' '--with-python34=/opt/psi/Programming/psi-python34/2.1.0' '--with-qt5py310=/opt/gfa/python-3.10/latest' '--with-qt5py38=/opt/gfa/python-3.8/latest' '--with-qt5=/opt/gfa/python-3.7/latest' '--with-qt4=/opt/gfa/python-3.5/latest' '--with-qt4py34=/opt/psi/Programming/psi-python34/2.1.0' '--with-json=/opt/gfa/cafe/deps/zmq/json/jsoncpp-src-0.6.0-rc2' '--with-zeromq=/opt/gfa/cafe/deps/zmq/zeromq-4.2.3-gcc-6.3.0' '--with-curl=/opt/gfa/cafe/deps/zmq/curl-7.55.1' '--with-lz4=/opt/gfa/cafe/deps/zmq/lz4/lib' '--with-epics7=/usr/local/epics/base-7.0.9' 'CXX=/opt/psi/Programming/gcc/10.4.0/bin/g++' 'CC=/opt/psi/Programming/gcc/10.4.0/bin/gcc' $ac_configure_extra_args --no-create --no-recursion
shift shift
$as_echo "running CONFIG_SHELL=/bin/sh $*" >&6 $as_echo "running CONFIG_SHELL=/bin/sh $*" >&6
CONFIG_SHELL='/bin/sh' CONFIG_SHELL='/bin/sh'
@@ -565,13 +565,13 @@ host_os='linux-gnu'
build_alias='' build_alias=''
build='x86_64-pc-linux-gnu' build='x86_64-pc-linux-gnu'
build_os='linux-gnu' build_os='linux-gnu'
SED='/usr/bin/sed' SED='/bin/sed'
Xsed='/usr/bin/sed -e 1s/^X//' Xsed='/bin/sed -e 1s/^X//'
GREP='/usr/bin/grep' GREP='/bin/grep'
EGREP='/usr/bin/grep -E' EGREP='/bin/grep -E'
FGREP='/usr/bin/grep -F' FGREP='/bin/grep -F'
LD='/usr/bin/ld -m elf_x86_64' LD='/bin/ld -m elf_x86_64'
NM='/usr/bin/nm -B' NM='/bin/nm -B'
LN_S='ln -s' LN_S='ln -s'
max_cmd_len='1572864' max_cmd_len='1572864'
ac_objext='o' ac_objext='o'
@@ -599,9 +599,9 @@ old_postinstall_cmds='chmod 644 $oldlib~$RANLIB $tool_oldlib'
old_postuninstall_cmds='' old_postuninstall_cmds=''
old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs~$RANLIB $tool_oldlib' old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs~$RANLIB $tool_oldlib'
lock_old_archive_extraction='no' lock_old_archive_extraction='no'
CC='/opt/psi/Programming/gcc/7.5.0/bin/gcc' CC='/opt/psi/Programming/gcc/10.4.0/bin/gcc'
CFLAGS='-g -O2' CFLAGS='-g -O2'
compiler='/opt/psi/Programming/gcc/7.5.0/bin/g++' compiler='/opt/psi/Programming/gcc/10.4.0/bin/g++'
GCC='yes' GCC='yes'
lt_cv_sys_global_symbol_pipe='sed -n -e '\''s/^.*[ ]\([ABCDGIRSTW][ABCDGIRSTW]*\)[ ][ ]*\([_A-Za-z][_A-Za-z0-9]*\)$/\1 \2 \2/p'\'' | sed '\''/ __gnu_lto/d'\''' lt_cv_sys_global_symbol_pipe='sed -n -e '\''s/^.*[ ]\([ABCDGIRSTW][ABCDGIRSTW]*\)[ ][ ]*\([_A-Za-z][_A-Za-z0-9]*\)$/\1 \2 \2/p'\'' | sed '\''/ __gnu_lto/d'\'''
lt_cv_sys_global_symbol_to_cdecl='sed -n -e '\''s/^T .* \(.*\)$/extern int \1();/p'\'' -e '\''s/^[ABCDGIRSTW][ABCDGIRSTW]* .* \(.*\)$/extern char \1;/p'\''' lt_cv_sys_global_symbol_to_cdecl='sed -n -e '\''s/^T .* \(.*\)$/extern int \1();/p'\'' -e '\''s/^[ABCDGIRSTW][ABCDGIRSTW]* .* \(.*\)$/extern char \1;/p'\'''
@@ -611,7 +611,7 @@ lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='sed -n -e '\''s/^: \(.*\)
lt_cv_nm_interface='BSD nm' lt_cv_nm_interface='BSD nm'
nm_file_list_spec='@' nm_file_list_spec='@'
lt_sysroot='' lt_sysroot=''
lt_cv_truncate_bin='/usr/bin/dd bs=4096 count=1' lt_cv_truncate_bin='/bin/dd bs=4096 count=1'
objdir='.libs' objdir='.libs'
MAGIC_CMD='file' MAGIC_CMD='file'
lt_prog_compiler_no_builtin_flag=' -fno-builtin' lt_prog_compiler_no_builtin_flag=' -fno-builtin'
@@ -678,8 +678,8 @@ postuninstall_cmds=''
finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
finish_eval='' finish_eval=''
hardcode_into_libs='yes' hardcode_into_libs='yes'
sys_lib_search_path_spec='/afs/psi.ch/sys/psi.x86_64_slp6/Programming/gcc/7.5.0/lib/gcc/x86_64-pc-linux-gnu/7.5.0 /afs/psi.ch/sys/psi.x86_64_slp6/Programming/gcc/7.5.0/lib/gcc /opt/psi/Programming/gcc/7.5.0/lib64 /afs/psi.ch/sys/psi.x86_64_slp6/Programming/gcc/7.5.0/lib64 /lib64 /usr/lib64 /opt/psi/Programming/gcc/7.5.0/lib /opt/psi/Tools/HDFView/3.1.2/lib /afs/psi.ch/sys/psi.x86_64_slp6/Programming/gcc/7.5.0/lib /lib /usr/lib ' sys_lib_search_path_spec='/afs/psi.ch/sys/psi.ra/Programming/gcc/10.4.0/lib/gcc/x86_64-pc-linux-gnu/10.4.0 /afs/psi.ch/sys/psi.ra/Programming/gcc/10.4.0/lib/gcc /opt/psi/Programming/gcc/10.4.0/lib64 /afs/psi.ch/sys/psi.ra/Programming/gcc/10.4.0/lib64 /lib64 /usr/lib64 /opt/psi/Programming/gcc/10.4.0/lib /opt/psi/Tools/HDFView/3.1.2/lib /afs/psi.ch/sys/psi.ra/Programming/gcc/10.4.0/lib /lib /usr/lib '
configure_time_dlsearch_path='/lib64 /usr/lib64 /lib /usr/lib /usr/lib64/atlas /usr/lib64/dyninst /usr/lib/oracle/19.18/client64/lib /usr/lib64/tclx8.6 /usr/lib64/wine/ ' configure_time_dlsearch_path='/lib /usr/lib /usr/lib64/atlas /usr/lib64/llvm17/lib/ /usr/lib/oracle/19.18/client64/lib /usr/lib64/tclx8.6 /usr/lib64/wine/ '
configure_time_lt_sys_library_path='' configure_time_lt_sys_library_path=''
hardcode_action='immediate' hardcode_action='immediate'
enable_dlopen='unknown' enable_dlopen='unknown'
@@ -693,11 +693,11 @@ postdep_objects=''
predeps='' predeps=''
postdeps='' postdeps=''
compiler_lib_search_path='' compiler_lib_search_path=''
LD_CXX='/usr/bin/ld -m elf_x86_64' LD_CXX='/bin/ld -m elf_x86_64'
reload_flag_CXX=' -r' reload_flag_CXX=' -r'
reload_cmds_CXX='$LD$reload_flag -o $output$reload_objs' reload_cmds_CXX='$LD$reload_flag -o $output$reload_objs'
old_archive_cmds_CXX='$AR $AR_FLAGS $oldlib$oldobjs~$RANLIB $tool_oldlib' old_archive_cmds_CXX='$AR $AR_FLAGS $oldlib$oldobjs~$RANLIB $tool_oldlib'
compiler_CXX='/opt/psi/Programming/gcc/7.5.0/bin/g++' compiler_CXX='/opt/psi/Programming/gcc/10.4.0/bin/g++'
GCC_CXX='yes' GCC_CXX='yes'
lt_prog_compiler_no_builtin_flag_CXX=' -fno-builtin' lt_prog_compiler_no_builtin_flag_CXX=' -fno-builtin'
lt_prog_compiler_pic_CXX=' -fPIC -DPIC' lt_prog_compiler_pic_CXX=' -fPIC -DPIC'
@@ -735,16 +735,16 @@ prelink_cmds_CXX=''
postlink_cmds_CXX='' postlink_cmds_CXX=''
file_list_spec_CXX='' file_list_spec_CXX=''
hardcode_action_CXX='immediate' hardcode_action_CXX='immediate'
compiler_lib_search_dirs_CXX='/afs/psi.ch/sys/psi.x86_64_slp6/Programming/gcc/7.5.0/bin/../lib/gcc/x86_64-pc-linux-gnu/7.5.0 /afs/psi.ch/sys/psi.x86_64_slp6/Programming/gcc/7.5.0/bin/../lib/gcc /opt/psi/Programming/gcc/7.5.0/lib64/../lib64 /opt/psi/Programming/gcc/7.5.0/lib/../lib64 /afs/psi.ch/sys/psi.x86_64_slp6/Programming/gcc/7.5.0/bin/../lib/gcc/x86_64-pc-linux-gnu/7.5.0/../../../../lib64 /lib/../lib64 /usr/lib/../lib64 /opt/psi/Programming/gcc/7.5.0/lib64 /opt/psi/Programming/gcc/7.5.0/lib /opt/psi/Tools/HDFView/3.1.2/lib /afs/psi.ch/sys/psi.x86_64_slp6/Programming/gcc/7.5.0/bin/../lib/gcc/x86_64-pc-linux-gnu/7.5.0/../../..' compiler_lib_search_dirs_CXX='/afs/psi.ch/sys/psi.ra/Programming/gcc/10.4.0/bin/../lib/gcc/x86_64-pc-linux-gnu/10.4.0 /afs/psi.ch/sys/psi.ra/Programming/gcc/10.4.0/bin/../lib/gcc /opt/psi/Programming/gcc/10.4.0/lib64/../lib64 /opt/psi/Programming/gcc/10.4.0/lib/../lib64 /afs/psi.ch/sys/psi.ra/Programming/gcc/10.4.0/bin/../lib/gcc/x86_64-pc-linux-gnu/10.4.0/../../../../lib64 /lib/../lib64 /usr/lib/../lib64 /opt/psi/Programming/gcc/10.4.0/lib64 /opt/psi/Programming/gcc/10.4.0/lib /opt/psi/Tools/HDFView/3.1.2/lib /afs/psi.ch/sys/psi.ra/Programming/gcc/10.4.0/bin/../lib/gcc/x86_64-pc-linux-gnu/10.4.0/../../..'
predep_objects_CXX='/lib/../lib64/crti.o /afs/psi.ch/sys/psi.x86_64_slp6/Programming/gcc/7.5.0/bin/../lib/gcc/x86_64-pc-linux-gnu/7.5.0/crtbeginS.o' predep_objects_CXX='/lib/../lib64/crti.o /afs/psi.ch/sys/psi.ra/Programming/gcc/10.4.0/bin/../lib/gcc/x86_64-pc-linux-gnu/10.4.0/crtbeginS.o'
postdep_objects_CXX='/afs/psi.ch/sys/psi.x86_64_slp6/Programming/gcc/7.5.0/bin/../lib/gcc/x86_64-pc-linux-gnu/7.5.0/crtendS.o /lib/../lib64/crtn.o' postdep_objects_CXX='/afs/psi.ch/sys/psi.ra/Programming/gcc/10.4.0/bin/../lib/gcc/x86_64-pc-linux-gnu/10.4.0/crtendS.o /lib/../lib64/crtn.o'
predeps_CXX='' predeps_CXX=''
postdeps_CXX='-lstdc++ -lm -lgcc_s -lc -lgcc_s' postdeps_CXX='-lstdc++ -lm -lgcc_s -lc -lgcc_s'
compiler_lib_search_path_CXX='-L/afs/psi.ch/sys/psi.x86_64_slp6/Programming/gcc/7.5.0/bin/../lib/gcc/x86_64-pc-linux-gnu/7.5.0 -L/afs/psi.ch/sys/psi.x86_64_slp6/Programming/gcc/7.5.0/bin/../lib/gcc -L/opt/psi/Programming/gcc/7.5.0/lib64/../lib64 -L/opt/psi/Programming/gcc/7.5.0/lib/../lib64 -L/afs/psi.ch/sys/psi.x86_64_slp6/Programming/gcc/7.5.0/bin/../lib/gcc/x86_64-pc-linux-gnu/7.5.0/../../../../lib64 -L/lib/../lib64 -L/usr/lib/../lib64 -L/opt/psi/Programming/gcc/7.5.0/lib64 -L/opt/psi/Programming/gcc/7.5.0/lib -L/opt/psi/Tools/HDFView/3.1.2/lib -L/afs/psi.ch/sys/psi.x86_64_slp6/Programming/gcc/7.5.0/bin/../lib/gcc/x86_64-pc-linux-gnu/7.5.0/../../..' compiler_lib_search_path_CXX='-L/afs/psi.ch/sys/psi.ra/Programming/gcc/10.4.0/bin/../lib/gcc/x86_64-pc-linux-gnu/10.4.0 -L/afs/psi.ch/sys/psi.ra/Programming/gcc/10.4.0/bin/../lib/gcc -L/opt/psi/Programming/gcc/10.4.0/lib64/../lib64 -L/opt/psi/Programming/gcc/10.4.0/lib/../lib64 -L/afs/psi.ch/sys/psi.ra/Programming/gcc/10.4.0/bin/../lib/gcc/x86_64-pc-linux-gnu/10.4.0/../../../../lib64 -L/lib/../lib64 -L/usr/lib/../lib64 -L/opt/psi/Programming/gcc/10.4.0/lib64 -L/opt/psi/Programming/gcc/10.4.0/lib -L/opt/psi/Tools/HDFView/3.1.2/lib -L/afs/psi.ch/sys/psi.ra/Programming/gcc/10.4.0/bin/../lib/gcc/x86_64-pc-linux-gnu/10.4.0/../../..'
LTCC='/opt/psi/Programming/gcc/7.5.0/bin/gcc' LTCC='/opt/psi/Programming/gcc/10.4.0/bin/gcc'
LTCFLAGS='-g -O2' LTCFLAGS='-g -O2'
compiler='/opt/psi/Programming/gcc/7.5.0/bin/gcc' compiler='/opt/psi/Programming/gcc/10.4.0/bin/gcc'
# A function that is used when there is no print builtin or printf. # A function that is used when there is no print builtin or printf.
func_fallback_echo () func_fallback_echo ()
@@ -788,7 +788,7 @@ fi
PACKAGE='cafe' PACKAGE='cafe'
VERSION='1.19.3' VERSION='1.22.0'
RM='rm -f' RM='rm -f'
ofile='libtool' ofile='libtool'
@@ -879,18 +879,16 @@ S["LTLIBOBJS"]=""
S["LIBOBJS"]="" S["LIBOBJS"]=""
S["HAVE_ZEROMQ__FALSE"]="" S["HAVE_ZEROMQ__FALSE"]=""
S["HAVE_ZEROMQ__TRUE"]="#" S["HAVE_ZEROMQ__TRUE"]="#"
S["HAVE_PYCAFE_EXT__FALSE"]="#" S["HAVE_PYCAFE_EXT__FALSE"]=""
S["HAVE_PYCAFE_EXT__TRUE"]="" S["HAVE_PYCAFE_EXT__TRUE"]="#"
S["HAVE_PYTHON__FALSE"]="#" S["HAVE_PYTHON__FALSE"]=""
S["HAVE_PYTHON__TRUE"]="" S["HAVE_PYTHON__TRUE"]="#"
S["AM_LDFLAGS"]=" -L/usr/local/epics/base-7.0.7/lib/RHEL8-x86_64 -Wl,-rpath,/usr/local/epics/base-7.0.7/lib/RHEL8-x86_64 -L/opt/gfa/python-3.10/latest/lib -Wl,-rpat"\ S["AM_LDFLAGS"]=" -L/usr/local/epics/base-7.0.9/lib/RHEL8-x86_64 -Wl,-rpath,/usr/local/epics/base-7.0.9/lib/RHEL8-x86_64"
"h,/opt/gfa/python-3.10/latest/lib" S["AM_CPPFLAGS"]=" -fexceptions -fPIC -std=c++1z -z nodefs -I/usr/local/epics/base-7.0.9/include/ -I/usr/local/epics/base-7.0.9/include/os/Linux -I/usr/local/epics/ba"\
S["AM_CPPFLAGS"]=" -fexceptions -fPIC -std=c++1z -I/usr/local/epics/base-7.0.7/include/ -I/usr/local/epics/base-7.0.7/include/os/Linux -I/usr/local/epics/base-7.0.7/i"\ "se-7.0.9/include/compiler/gcc -I/opt/gfa/cafe/boost/boost_1_61_0/include/boost -I/opt/gfa/cafe/boost/boost_1_61_0/include"
"nclude/compiler/gcc -I/opt/gfa/cafe/boost/boost_1_61_0/include/boost -I/opt/gfa/cafe/boost/boost_1_61_0/include -I/opt/gfa/python-3.10/latest/includ"\
"e/python3.10 -I/opt/gfa/python-3.10/latest/lib/python3.10/site-packages/numpy/core/include"
S["CAFE_CPPFLAGS"]="-I$(top_srcdir)/include " S["CAFE_CPPFLAGS"]="-I$(top_srcdir)/include "
S["CXXCPP"]="/opt/psi/Programming/gcc/7.5.0/bin/g++ -E" S["CXXCPP"]="/opt/psi/Programming/gcc/10.4.0/bin/g++ -E"
S["CPP"]="/opt/psi/Programming/gcc/7.5.0/bin/gcc -E" S["CPP"]="/opt/psi/Programming/gcc/10.4.0/bin/gcc -E"
S["LT_SYS_LIBRARY_PATH"]="" S["LT_SYS_LIBRARY_PATH"]=""
S["OTOOL64"]="" S["OTOOL64"]=""
S["OTOOL"]="" S["OTOOL"]=""
@@ -904,20 +902,20 @@ S["AR"]="ar"
S["DLLTOOL"]="false" S["DLLTOOL"]="false"
S["OBJDUMP"]="objdump" S["OBJDUMP"]="objdump"
S["LN_S"]="ln -s" S["LN_S"]="ln -s"
S["NM"]="/usr/bin/nm -B" S["NM"]="/bin/nm -B"
S["ac_ct_DUMPBIN"]="" S["ac_ct_DUMPBIN"]=""
S["DUMPBIN"]="" S["DUMPBIN"]=""
S["LD"]="/usr/bin/ld -m elf_x86_64" S["LD"]="/bin/ld -m elf_x86_64"
S["FGREP"]="/usr/bin/grep -F" S["FGREP"]="/bin/grep -F"
S["EGREP"]="/usr/bin/grep -E" S["EGREP"]="/bin/grep -E"
S["GREP"]="/usr/bin/grep" S["GREP"]="/bin/grep"
S["SED"]="/usr/bin/sed" S["SED"]="/bin/sed"
S["am__fastdepCC_FALSE"]="#" S["am__fastdepCC_FALSE"]="#"
S["am__fastdepCC_TRUE"]="" S["am__fastdepCC_TRUE"]=""
S["CCDEPMODE"]="depmode=gcc3" S["CCDEPMODE"]="depmode=gcc3"
S["ac_ct_CC"]="/opt/psi/Programming/gcc/7.5.0/bin/gcc" S["ac_ct_CC"]="/opt/psi/Programming/gcc/10.4.0/bin/gcc"
S["CFLAGS"]="-g -O2" S["CFLAGS"]="-g -O2"
S["CC"]="/opt/psi/Programming/gcc/7.5.0/bin/gcc" S["CC"]="/opt/psi/Programming/gcc/10.4.0/bin/gcc"
S["host_os"]="linux-gnu" S["host_os"]="linux-gnu"
S["host_vendor"]="pc" S["host_vendor"]="pc"
S["host_cpu"]="x86_64" S["host_cpu"]="x86_64"
@@ -939,13 +937,11 @@ S["DEPDIR"]=".deps"
S["OBJEXT"]="o" S["OBJEXT"]="o"
S["EXEEXT"]="" S["EXEEXT"]=""
S["ac_ct_CXX"]="" S["ac_ct_CXX"]=""
S["CPPFLAGS"]=" -fexceptions -fPIC -std=c++1z -I/usr/local/epics/base-7.0.7/include/ -I/usr/local/epics/base-7.0.7/include/os/Linux -I/usr/local/epics/base-7.0.7/i"\ S["CPPFLAGS"]=" -fexceptions -fPIC -std=c++1z -z nodefs -I/usr/local/epics/base-7.0.9/include/ -I/usr/local/epics/base-7.0.9/include/os/Linux -I/usr/local/epics/ba"\
"nclude/compiler/gcc -I/opt/gfa/cafe/boost/boost_1_61_0/include/boost -I/opt/gfa/cafe/boost/boost_1_61_0/include -I/opt/gfa/python-3.10/latest/includ"\ "se-7.0.9/include/compiler/gcc -I/opt/gfa/cafe/boost/boost_1_61_0/include/boost -I/opt/gfa/cafe/boost/boost_1_61_0/include"
"e/python3.10 -I/opt/gfa/python-3.10/latest/lib/python3.10/site-packages/numpy/core/include" S["LDFLAGS"]=" -L/usr/local/epics/base-7.0.9/lib/RHEL8-x86_64 -Wl,-rpath,/usr/local/epics/base-7.0.9/lib/RHEL8-x86_64"
S["LDFLAGS"]=" -L/usr/local/epics/base-7.0.7/lib/RHEL8-x86_64 -Wl,-rpath,/usr/local/epics/base-7.0.7/lib/RHEL8-x86_64 -L/opt/gfa/python-3.10/latest/lib -Wl,-rpat"\
"h,/opt/gfa/python-3.10/latest/lib"
S["CXXFLAGS"]="-g -O2" S["CXXFLAGS"]="-g -O2"
S["CXX"]="/opt/psi/Programming/gcc/7.5.0/bin/g++" S["CXX"]="/opt/psi/Programming/gcc/10.4.0/bin/g++"
S["AM_BACKSLASH"]="\\" S["AM_BACKSLASH"]="\\"
S["AM_DEFAULT_VERBOSITY"]="1" S["AM_DEFAULT_VERBOSITY"]="1"
S["AM_DEFAULT_V"]="$(AM_DEFAULT_VERBOSITY)" S["AM_DEFAULT_V"]="$(AM_DEFAULT_VERBOSITY)"
@@ -957,16 +953,16 @@ S["am__leading_dot"]="."
S["SET_MAKE"]="" S["SET_MAKE"]=""
S["AWK"]="gawk" S["AWK"]="gawk"
S["mkdir_p"]="$(MKDIR_P)" S["mkdir_p"]="$(MKDIR_P)"
S["MKDIR_P"]="/usr/bin/mkdir -p" S["MKDIR_P"]="/bin/mkdir -p"
S["INSTALL_STRIP_PROGRAM"]="$(install_sh) -c -s" S["INSTALL_STRIP_PROGRAM"]="$(install_sh) -c -s"
S["STRIP"]="strip" S["STRIP"]="strip"
S["install_sh"]="${SHELL} /afs/psi.ch/project/cafe/gitlab/CAFE/cpp/install-sh" S["install_sh"]="${SHELL} /afs/psi.ch/project/cafe/gitea/CAFE/cpp/install-sh"
S["MAKEINFO"]="${SHELL} /afs/psi.ch/project/cafe/gitlab/CAFE/cpp/missing makeinfo" S["MAKEINFO"]="${SHELL} /afs/psi.ch/project/cafe/gitea/CAFE/cpp/missing makeinfo"
S["AUTOHEADER"]="${SHELL} /afs/psi.ch/project/cafe/gitlab/CAFE/cpp/missing autoheader" S["AUTOHEADER"]="${SHELL} /afs/psi.ch/project/cafe/gitea/CAFE/cpp/missing autoheader"
S["AUTOMAKE"]="${SHELL} /afs/psi.ch/project/cafe/gitlab/CAFE/cpp/missing automake-1.16" S["AUTOMAKE"]="${SHELL} /afs/psi.ch/project/cafe/gitea/CAFE/cpp/missing automake-1.16"
S["AUTOCONF"]="${SHELL} /afs/psi.ch/project/cafe/gitlab/CAFE/cpp/missing autoconf" S["AUTOCONF"]="${SHELL} /afs/psi.ch/project/cafe/gitea/CAFE/cpp/missing autoconf"
S["ACLOCAL"]="${SHELL} /afs/psi.ch/project/cafe/gitlab/CAFE/cpp/missing aclocal-1.16" S["ACLOCAL"]="${SHELL} /afs/psi.ch/project/cafe/gitea/CAFE/cpp/missing aclocal-1.16"
S["VERSION"]="1.19.3" S["VERSION"]="1.22.0"
S["PACKAGE"]="cafe" S["PACKAGE"]="cafe"
S["CYGPATH_W"]="echo" S["CYGPATH_W"]="echo"
S["am__isrc"]="" S["am__isrc"]=""
@@ -976,14 +972,14 @@ S["INSTALL_PROGRAM"]="${INSTALL}"
S["target_alias"]="" S["target_alias"]=""
S["host_alias"]="" S["host_alias"]=""
S["build_alias"]="" S["build_alias"]=""
S["LIBS"]="-lpython3.10 " S["LIBS"]=""
S["ECHO_T"]="" S["ECHO_T"]=""
S["ECHO_N"]="-n" S["ECHO_N"]="-n"
S["ECHO_C"]="" S["ECHO_C"]=""
S["DEFS"]="-DHAVE_CONFIG_H" S["DEFS"]="-DHAVE_CONFIG_H"
S["mandir"]="${datarootdir}/man" S["mandir"]="${datarootdir}/man"
S["localedir"]="${datarootdir}/locale" S["localedir"]="${datarootdir}/locale"
S["libdir"]="/opt/gfa/cafe/cpp/cafe-1.19.3-py310-gcc-7.5.0/lib/RHEL8-x86_64" S["libdir"]="/opt/gfa/cafe/cpp/cafe-1.22.0-gcc-10.4.0/lib/RHEL8-x86_64"
S["psdir"]="${docdir}" S["psdir"]="${docdir}"
S["pdfdir"]="${docdir}" S["pdfdir"]="${docdir}"
S["dvidir"]="${docdir}" S["dvidir"]="${docdir}"
@@ -1001,12 +997,12 @@ S["libexecdir"]="${exec_prefix}/libexec"
S["sbindir"]="${exec_prefix}/sbin" S["sbindir"]="${exec_prefix}/sbin"
S["bindir"]="${exec_prefix}/bin" S["bindir"]="${exec_prefix}/bin"
S["program_transform_name"]="s,x,x," S["program_transform_name"]="s,x,x,"
S["prefix"]="/opt/gfa/cafe/cpp/cafe-1.19.3-py310-gcc-7.5.0" S["prefix"]="/opt/gfa/cafe/cpp/cafe-1.22.0-gcc-10.4.0"
S["exec_prefix"]="${prefix}" S["exec_prefix"]="${prefix}"
S["PACKAGE_URL"]="" S["PACKAGE_URL"]=""
S["PACKAGE_BUGREPORT"]="Bug reports to: jan.chrin@psi.ch" S["PACKAGE_BUGREPORT"]="Bug reports to: jan.chrin@psi.ch"
S["PACKAGE_STRING"]="CAFE 1.19.3" S["PACKAGE_STRING"]="CAFE 1.22.0"
S["PACKAGE_VERSION"]="1.19.3" S["PACKAGE_VERSION"]="1.22.0"
S["PACKAGE_TARNAME"]="cafe" S["PACKAGE_TARNAME"]="cafe"
S["PACKAGE_NAME"]="CAFE" S["PACKAGE_NAME"]="CAFE"
S["PATH_SEPARATOR"]=":" S["PATH_SEPARATOR"]=":"
@@ -1055,12 +1051,12 @@ cat >"$ac_tmp/defines.awk" <<\_ACAWK ||
BEGIN { BEGIN {
D["PACKAGE_NAME"]=" \"CAFE\"" D["PACKAGE_NAME"]=" \"CAFE\""
D["PACKAGE_TARNAME"]=" \"cafe\"" D["PACKAGE_TARNAME"]=" \"cafe\""
D["PACKAGE_VERSION"]=" \"1.19.3\"" D["PACKAGE_VERSION"]=" \"1.22.0\""
D["PACKAGE_STRING"]=" \"CAFE 1.19.3\"" D["PACKAGE_STRING"]=" \"CAFE 1.22.0\""
D["PACKAGE_BUGREPORT"]=" \"Bug reports to: jan.chrin@psi.ch\"" D["PACKAGE_BUGREPORT"]=" \"Bug reports to: jan.chrin@psi.ch\""
D["PACKAGE_URL"]=" \"\"" D["PACKAGE_URL"]=" \"\""
D["PACKAGE"]=" \"cafe\"" D["PACKAGE"]=" \"cafe\""
D["VERSION"]=" \"1.19.3\"" D["VERSION"]=" \"1.22.0\""
D["STDC_HEADERS"]=" 1" D["STDC_HEADERS"]=" 1"
D["HAVE_SYS_TYPES_H"]=" 1" D["HAVE_SYS_TYPES_H"]=" 1"
D["HAVE_SYS_STAT_H"]=" 1" D["HAVE_SYS_STAT_H"]=" 1"
@@ -1076,16 +1072,12 @@ D["LT_OBJDIR"]=" \".libs/\""
D["HAVE_LINUX"]=" 1" D["HAVE_LINUX"]=" 1"
D["HAVE_CADEF_H"]=" 1" D["HAVE_CADEF_H"]=" 1"
D["HAVE_EPICSTYPES_H"]=" 1" D["HAVE_EPICSTYPES_H"]=" 1"
D["HAVE_EPICS"]=" 7.0.7" D["HAVE_EPICS"]=" 7.0.9"
D["EPICS_MAJOR"]=" 7" D["EPICS_MAJOR"]=" 7"
D["EPICS_MINOR"]=" 0" D["EPICS_MINOR"]=" 0"
D["EPICS_PATCH"]=" 7" D["EPICS_PATCH"]=" 9"
D["HAVE_MULTI_INDEX_CONTAINER_HPP"]=" 1" D["HAVE_MULTI_INDEX_CONTAINER_HPP"]=" 1"
D["HAVE_BOOST"]=" 1" D["HAVE_BOOST"]=" 1"
D["HAVE_PYTHON_H"]=" 1"
D["HAVE_LIBPYTHON3_10"]=" 1"
D["HAVE_PYTHON"]=" 1"
D["HAVE_PYCAFE_EXT"]=" 1"
for (key in D) D_is_set[key] = 1 for (key in D) D_is_set[key] = 1
FS = "" FS = ""
} }

9
configurePSI.ac
View File

@@ -9,7 +9,7 @@
# Standard macros # Standard macros
AC_PREREQ(2.63) AC_PREREQ(2.63)
AC_COPYRIGHT([CAFE, Jan Chrin, PSI, 2010-2023]) AC_COPYRIGHT([CAFE, Jan Chrin, PSI, 2010-2023])
AC_INIT([CAFE], [1.19.3], [Bug reports to: jan.chrin@psi.ch]) AC_INIT([CAFE], [1.22.0], [Bug reports to: jan.chrin@psi.ch])
AC_CONFIG_AUX_DIR(./) AC_CONFIG_AUX_DIR(./)
@@ -38,7 +38,8 @@ AC_LANG([C++])
AC_DEFINE_UNQUOTED(HAVE_LINUX, 1, [linux dependency (sleep)]) AC_DEFINE_UNQUOTED(HAVE_LINUX, 1, [linux dependency (sleep)])
CPPFLAGS=" -fexceptions -fPIC -std=c++1z" #-z nodefs suppress unresolöved symbols
CPPFLAGS=" -fexceptions -fPIC -std=c++1z -z nodefs"
# provide include directories # provide include directories
AC_SUBST([CAFE_CPPFLAGS], '-I$(top_srcdir)/include ') AC_SUBST([CAFE_CPPFLAGS], '-I$(top_srcdir)/include ')
@@ -117,8 +118,8 @@ if test x$HAVE_EPICS_7 == xtrue ; then
EPICS_LIB_PATH=${EPICS_PREFIX}"/lib/"${RHREL}"-x86_64" EPICS_LIB_PATH=${EPICS_PREFIX}"/lib/"${RHREL}"-x86_64"
## Add epics release ## Add epics release
EPICS_MAJOR_DEFAULT="7" EPICS_MAJOR_DEFAULT="7"
EPICS_MINOR_DEFAULT="4" EPICS_MINOR_DEFAULT="0"
EPICS_PATCH_DEFAULT="1" EPICS_PATCH_DEFAULT="9"
] ]
) )
fi fi

BIN
examples/cafeTest/RHEL8-x86_64/cafeTest Executable file
View File

Binary file not shown.

BIN
examples/cafeTest/RHEL8-x86_64/monitorTest Executable file
View File

Binary file not shown.

BIN
examples/cafeTest/cafeTest
View File

Binary file not shown.

10
examples/cafeTest/makefile7
View File

@@ -8,13 +8,13 @@
#-py37- libcafe.so: undefined reference to `cy_event_handler_wrapper #-py37- libcafe.so: undefined reference to `cy_event_handler_wrapper
#CAFE version to link to #CAFE version to link to
#CAFE_VERSION=cafe-1.14.4-sls2-gcc-7.3.0 #CAFE_VERSION=cafe-1.14.4-sls2-gcc-7.3.0
CAFE_VERSION=cafe-1.19.1-gcc-7.3.0 CAFE_VERSION=cafe-1.20.1-py37-gcc-8.5.0
#CAFE_VERSION=cafe-1.15.0-gcc-10.3.0 #CAFE_VERSION=cafe-1.15.0-gcc-10.3.0
PYTHON_INCLUDE=/opt/gfa/python-3.7/latest/include/python3.7m PYTHON_INCLUDE=/opt/gfa/python-3.7/latest/include/python3.7m
PYTHON_LIB=/opt/gfa/python-3.7/latest/lib PYTHON_LIB=/opt/gfa/python-3.7/latest/lib
EPICS_BASE=${EPICS}/base-7.0.6 EPICS_BASE=${EPICS}/base-7.0.7
#CAFE project base #CAFE project base
CAFE_BASE=/opt/gfa/cafe CAFE_BASE=/opt/gfa/cafe
@@ -43,10 +43,10 @@ ${EPICS_HOST_ARCH}/monitorTest: monitorTest.cc
g++ monitorTest.cc -o ${EPICS_HOST_ARCH}/monitorTest \ g++ monitorTest.cc -o ${EPICS_HOST_ARCH}/monitorTest \
$(INCLUDE_PATH) $(LIB_DIR) $(LIBS) $(INCLUDE_PATH) $(LIB_DIR) $(LIBS)
cafeTest: cafeTest.cc callbacks.h ${EPICS_HOST_ARCH}/cafeTest: cafeTest.cc callbacks.h
g++ cafeTest.cc -o cafeTest \ g++ cafeTest.cc -o ${EPICS_HOST_ARCH}/cafeTest \
$(INCLUDE_PATH) $(LIB_DIR) $(LIBS) $(INCLUDE_PATH) $(LIB_DIR) $(LIBS)
clean: clean:
rm -f cafeTest.o cafeTest rm -f ${EPICS_HOST_ARCH}/cafeTest.o ${EPICS_HOST_ARCH}/cafeTest ${EPICS_HOST_ARCH}/monitorTest.o ${EPICS_HOST_ARCH}/monitorTest

18
include/config.h
View File

@@ -8,7 +8,7 @@
#define EPICS_MINOR 0 #define EPICS_MINOR 0
/* epics patch release */ /* epics patch release */
#define EPICS_PATCH 7 #define EPICS_PATCH 9
/* Availability of boost */ /* Availability of boost */
#define HAVE_BOOST 1 #define HAVE_BOOST 1
@@ -29,7 +29,7 @@
#define HAVE_DLFCN_H 1 #define HAVE_DLFCN_H 1
/* epics version */ /* epics version */
#define HAVE_EPICS 7.0.7 #define HAVE_EPICS 7.0.9
/* Define to 1 if you have the <epicsTypes.h> header file. */ /* Define to 1 if you have the <epicsTypes.h> header file. */
#define HAVE_EPICSTYPES_H 1 #define HAVE_EPICSTYPES_H 1
@@ -57,7 +57,7 @@
/* #undef HAVE_LIBLZ4 */ /* #undef HAVE_LIBLZ4 */
/* Define to 1 if you have the `python3.10' library (-lpython3.10). */ /* Define to 1 if you have the `python3.10' library (-lpython3.10). */
#define HAVE_LIBPYTHON3_10 1 /* #undef HAVE_LIBPYTHON3_10 */
/* Define to 1 if you have the `python3.4m' library (-lpython3.4m). */ /* Define to 1 if you have the `python3.4m' library (-lpython3.4m). */
/* #undef HAVE_LIBPYTHON3_4M */ /* #undef HAVE_LIBPYTHON3_4M */
@@ -102,13 +102,13 @@
#define HAVE_MULTI_INDEX_CONTAINER_HPP 1 #define HAVE_MULTI_INDEX_CONTAINER_HPP 1
/* pycafe extern C */ /* pycafe extern C */
#define HAVE_PYCAFE_EXT 1 /* #undef HAVE_PYCAFE_EXT */
/* Availability of python */ /* Availability of python */
#define HAVE_PYTHON 1 /* #undef HAVE_PYTHON */
/* Define to 1 if you have the <Python.h> header file. */ /* Define to 1 if you have the <Python.h> header file. */
#define HAVE_PYTHON_H 1 /* #undef HAVE_PYTHON_H */
/* Availability of Qt version 5 confirmed */ /* Availability of Qt version 5 confirmed */
/* #undef HAVE_QT */ /* #undef HAVE_QT */
@@ -156,7 +156,7 @@
#define PACKAGE_NAME "CAFE" #define PACKAGE_NAME "CAFE"
/* Define to the full name and version of this package. */ /* Define to the full name and version of this package. */
#define PACKAGE_STRING "CAFE 1.19.3" #define PACKAGE_STRING "CAFE 1.22.0"
/* Define to the one symbol short name of this package. */ /* Define to the one symbol short name of this package. */
#define PACKAGE_TARNAME "cafe" #define PACKAGE_TARNAME "cafe"
@@ -165,7 +165,7 @@
#define PACKAGE_URL "" #define PACKAGE_URL ""
/* Define to the version of this package. */ /* Define to the version of this package. */
#define PACKAGE_VERSION "1.19.3" #define PACKAGE_VERSION "1.22.0"
/* Availability of Qt version 5 confirmed */ /* Availability of Qt version 5 confirmed */
/* #undef QT_NO_VERSION_TAGGING */ /* #undef QT_NO_VERSION_TAGGING */
@@ -174,4 +174,4 @@
#define STDC_HEADERS 1 #define STDC_HEADERS 1
/* Version number of package */ /* Version number of package */
#define VERSION "1.19.3" #define VERSION "1.22.0"

7
include/connect.h
View File

@@ -694,10 +694,15 @@ public:
{ {
cafeConduit_set_by_handle & handle_index=cs.get<by_handle>(); cafeConduit_set_by_handle & handle_index=cs.get<by_handle>();
cafeConduit_set_by_handle::iterator it_handle; cafeConduit_set_by_handle::iterator it_handle;
it_handle = handle_index.find(handle); it_handle = handle_index.find(handle);
if (it_handle != handle_index.end()) if (it_handle != handle_index.end())
{ {
return (*it_handle).isConnected(); //cafeMutex.lock();
bool isConnected = (*it_handle).isConnected();
//cafeMutex.unlock();
return isConnected;
} }
else else
{ {

8
include/global.h
View File

@@ -9,14 +9,14 @@
#ifndef GLOBAL_H #ifndef GLOBAL_H
#define GLOBAL_H #define GLOBAL_H
#include <epicsTime.h> //include <epicsTime.h>
#include <epicsMutex.h> //include <epicsMutex.h>
#include <cadef.h> //#include <cadef.h>
#include <hashConduit.h> #include <hashConduit.h>
#include <hashConduitGroup.h> #include <hashConduitGroup.h>
#include <PVGroup.h> #include <PVGroup.h>
#include <deviceCollection.h> #include <deviceCollection.h>
#include <enumStrings.h> //#include <enumStrings.h>
extern bool CHECK_CONSISTENCY_CA_STATE; extern bool CHECK_CONSISTENCY_CA_STATE;
extern bool MUTEX; extern bool MUTEX;

70
include/makefile
View File

@@ -96,8 +96,8 @@ host_triplet = x86_64-pc-linux-gnu
#if HAVE_PYTHON_ #if HAVE_PYTHON_
#include_HEADERS += PyCafe_api.h #include_HEADERS += PyCafe_api.h
#endif #endif
am__append_2 = PyCafe.h #am__append_2 = PyCafe.h
#am__append_3 = PyCafe_api.h am__append_3 = PyCafe_api.h
subdir = include subdir = include
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \ am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
@@ -197,24 +197,24 @@ ETAGS = etags
CTAGS = ctags CTAGS = ctags
am__DIST_COMMON = $(srcdir)/makefile.in am__DIST_COMMON = $(srcdir)/makefile.in
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = ${SHELL} /afs/psi.ch/project/cafe/gitlab/CAFE/cpp/missing aclocal-1.16 ACLOCAL = ${SHELL} /afs/psi.ch/project/cafe/gitea/CAFE/cpp/missing aclocal-1.16
AMTAR = $${TAR-tar} AMTAR = $${TAR-tar}
AM_CPPFLAGS = -fexceptions -fPIC -std=c++1z -I/usr/local/epics/base-7.0.7/include/ -I/usr/local/epics/base-7.0.7/include/os/Linux -I/usr/local/epics/base-7.0.7/include/compiler/gcc -I/opt/gfa/cafe/boost/boost_1_61_0/include/boost -I/opt/gfa/cafe/boost/boost_1_61_0/include -I/opt/gfa/python-3.10/latest/include/python3.10 -I/opt/gfa/python-3.10/latest/lib/python3.10/site-packages/numpy/core/include AM_CPPFLAGS = -fexceptions -fPIC -std=c++1z -z nodefs -I/usr/local/epics/base-7.0.9/include/ -I/usr/local/epics/base-7.0.9/include/os/Linux -I/usr/local/epics/base-7.0.9/include/compiler/gcc -I/opt/gfa/cafe/boost/boost_1_61_0/include/boost -I/opt/gfa/cafe/boost/boost_1_61_0/include
AM_DEFAULT_VERBOSITY = 1 AM_DEFAULT_VERBOSITY = 1
AM_LDFLAGS = -L/usr/local/epics/base-7.0.7/lib/RHEL8-x86_64 -Wl,-rpath,/usr/local/epics/base-7.0.7/lib/RHEL8-x86_64 -L/opt/gfa/python-3.10/latest/lib -Wl,-rpath,/opt/gfa/python-3.10/latest/lib AM_LDFLAGS = -L/usr/local/epics/base-7.0.9/lib/RHEL8-x86_64 -Wl,-rpath,/usr/local/epics/base-7.0.9/lib/RHEL8-x86_64
AR = ar AR = ar
AUTOCONF = ${SHELL} /afs/psi.ch/project/cafe/gitlab/CAFE/cpp/missing autoconf AUTOCONF = ${SHELL} /afs/psi.ch/project/cafe/gitea/CAFE/cpp/missing autoconf
AUTOHEADER = ${SHELL} /afs/psi.ch/project/cafe/gitlab/CAFE/cpp/missing autoheader AUTOHEADER = ${SHELL} /afs/psi.ch/project/cafe/gitea/CAFE/cpp/missing autoheader
AUTOMAKE = ${SHELL} /afs/psi.ch/project/cafe/gitlab/CAFE/cpp/missing automake-1.16 AUTOMAKE = ${SHELL} /afs/psi.ch/project/cafe/gitea/CAFE/cpp/missing automake-1.16
AWK = gawk AWK = gawk
CAFE_CPPFLAGS = -I$(top_srcdir)/include CAFE_CPPFLAGS = -I$(top_srcdir)/include
CC = /opt/psi/Programming/gcc/7.5.0/bin/gcc CC = /opt/psi/Programming/gcc/10.4.0/bin/gcc
CCDEPMODE = depmode=gcc3 CCDEPMODE = depmode=gcc3
CFLAGS = -g -O2 CFLAGS = -g -O2
CPP = /opt/psi/Programming/gcc/7.5.0/bin/gcc -E CPP = /opt/psi/Programming/gcc/10.4.0/bin/gcc -E
CPPFLAGS = -fexceptions -fPIC -std=c++1z -I/usr/local/epics/base-7.0.7/include/ -I/usr/local/epics/base-7.0.7/include/os/Linux -I/usr/local/epics/base-7.0.7/include/compiler/gcc -I/opt/gfa/cafe/boost/boost_1_61_0/include/boost -I/opt/gfa/cafe/boost/boost_1_61_0/include -I/opt/gfa/python-3.10/latest/include/python3.10 -I/opt/gfa/python-3.10/latest/lib/python3.10/site-packages/numpy/core/include CPPFLAGS = -fexceptions -fPIC -std=c++1z -z nodefs -I/usr/local/epics/base-7.0.9/include/ -I/usr/local/epics/base-7.0.9/include/os/Linux -I/usr/local/epics/base-7.0.9/include/compiler/gcc -I/opt/gfa/cafe/boost/boost_1_61_0/include/boost -I/opt/gfa/cafe/boost/boost_1_61_0/include
CXX = /opt/psi/Programming/gcc/7.5.0/bin/g++ CXX = /opt/psi/Programming/gcc/10.4.0/bin/g++
CXXCPP = /opt/psi/Programming/gcc/7.5.0/bin/g++ -E CXXCPP = /opt/psi/Programming/gcc/10.4.0/bin/g++ -E
CXXDEPMODE = depmode=gcc3 CXXDEPMODE = depmode=gcc3
CXXFLAGS = -g -O2 CXXFLAGS = -g -O2
CYGPATH_W = echo CYGPATH_W = echo
@@ -226,28 +226,28 @@ DUMPBIN =
ECHO_C = ECHO_C =
ECHO_N = -n ECHO_N = -n
ECHO_T = ECHO_T =
EGREP = /usr/bin/grep -E EGREP = /bin/grep -E
EXEEXT = EXEEXT =
FGREP = /usr/bin/grep -F FGREP = /bin/grep -F
GREP = /usr/bin/grep GREP = /bin/grep
INSTALL = /usr/bin/install -c INSTALL = /bin/install -c
INSTALL_DATA = ${INSTALL} -m 644 INSTALL_DATA = ${INSTALL} -m 644
INSTALL_PROGRAM = ${INSTALL} INSTALL_PROGRAM = ${INSTALL}
INSTALL_SCRIPT = ${INSTALL} INSTALL_SCRIPT = ${INSTALL}
INSTALL_STRIP_PROGRAM = $(install_sh) -c -s INSTALL_STRIP_PROGRAM = $(install_sh) -c -s
LD = /usr/bin/ld -m elf_x86_64 LD = /bin/ld -m elf_x86_64
LDFLAGS = -L/usr/local/epics/base-7.0.7/lib/RHEL8-x86_64 -Wl,-rpath,/usr/local/epics/base-7.0.7/lib/RHEL8-x86_64 -L/opt/gfa/python-3.10/latest/lib -Wl,-rpath,/opt/gfa/python-3.10/latest/lib LDFLAGS = -L/usr/local/epics/base-7.0.9/lib/RHEL8-x86_64 -Wl,-rpath,/usr/local/epics/base-7.0.9/lib/RHEL8-x86_64
LIBOBJS = LIBOBJS =
LIBS = -lpython3.10 LIBS =
LIBTOOL = $(SHELL) $(top_builddir)/libtool LIBTOOL = $(SHELL) $(top_builddir)/libtool
LIPO = LIPO =
LN_S = ln -s LN_S = ln -s
LTLIBOBJS = LTLIBOBJS =
LT_SYS_LIBRARY_PATH = LT_SYS_LIBRARY_PATH =
MAKEINFO = ${SHELL} /afs/psi.ch/project/cafe/gitlab/CAFE/cpp/missing makeinfo MAKEINFO = ${SHELL} /afs/psi.ch/project/cafe/gitea/CAFE/cpp/missing makeinfo
MANIFEST_TOOL = : MANIFEST_TOOL = :
MKDIR_P = /usr/bin/mkdir -p MKDIR_P = /bin/mkdir -p
NM = /usr/bin/nm -B NM = /bin/nm -B
NMEDIT = NMEDIT =
OBJDUMP = objdump OBJDUMP = objdump
OBJEXT = o OBJEXT = o
@@ -256,23 +256,23 @@ OTOOL64 =
PACKAGE = cafe PACKAGE = cafe
PACKAGE_BUGREPORT = Bug reports to: jan.chrin@psi.ch PACKAGE_BUGREPORT = Bug reports to: jan.chrin@psi.ch
PACKAGE_NAME = CAFE PACKAGE_NAME = CAFE
PACKAGE_STRING = CAFE 1.19.3 PACKAGE_STRING = CAFE 1.22.0
PACKAGE_TARNAME = cafe PACKAGE_TARNAME = cafe
PACKAGE_URL = PACKAGE_URL =
PACKAGE_VERSION = 1.19.3 PACKAGE_VERSION = 1.22.0
PATH_SEPARATOR = : PATH_SEPARATOR = :
RANLIB = ranlib RANLIB = ranlib
SED = /usr/bin/sed SED = /bin/sed
SET_MAKE = SET_MAKE =
SHELL = /bin/sh SHELL = /bin/sh
STRIP = strip STRIP = strip
VERSION = 1.19.3 VERSION = 1.22.0
abs_builddir = /afs/psi.ch/project/cafe/gitlab/CAFE/cpp/include abs_builddir = /afs/psi.ch/project/cafe/gitea/CAFE/cpp/include
abs_srcdir = /afs/psi.ch/project/cafe/gitlab/CAFE/cpp/include abs_srcdir = /afs/psi.ch/project/cafe/gitea/CAFE/cpp/include
abs_top_builddir = /afs/psi.ch/project/cafe/gitlab/CAFE/cpp abs_top_builddir = /afs/psi.ch/project/cafe/gitea/CAFE/cpp
abs_top_srcdir = /afs/psi.ch/project/cafe/gitlab/CAFE/cpp abs_top_srcdir = /afs/psi.ch/project/cafe/gitea/CAFE/cpp
ac_ct_AR = ar ac_ct_AR = ar
ac_ct_CC = /opt/psi/Programming/gcc/7.5.0/bin/gcc ac_ct_CC = /opt/psi/Programming/gcc/10.4.0/bin/gcc
ac_ct_CXX = ac_ct_CXX =
ac_ct_DUMPBIN = ac_ct_DUMPBIN =
am__include = include am__include = include
@@ -300,8 +300,8 @@ host_vendor = pc
htmldir = ${docdir} htmldir = ${docdir}
includedir = ${prefix}/include includedir = ${prefix}/include
infodir = ${datarootdir}/info infodir = ${datarootdir}/info
install_sh = ${SHELL} /afs/psi.ch/project/cafe/gitlab/CAFE/cpp/install-sh install_sh = ${SHELL} /afs/psi.ch/project/cafe/gitea/CAFE/cpp/install-sh
libdir = /opt/gfa/cafe/cpp/cafe-1.19.3-py310-gcc-7.5.0/lib/RHEL8-x86_64 libdir = /opt/gfa/cafe/cpp/cafe-1.22.0-gcc-10.4.0/lib/RHEL8-x86_64
libexecdir = ${exec_prefix}/libexec libexecdir = ${exec_prefix}/libexec
localedir = ${datarootdir}/locale localedir = ${datarootdir}/locale
localstatedir = ${prefix}/var localstatedir = ${prefix}/var
@@ -309,7 +309,7 @@ mandir = ${datarootdir}/man
mkdir_p = $(MKDIR_P) mkdir_p = $(MKDIR_P)
oldincludedir = /usr/include oldincludedir = /usr/include
pdfdir = ${docdir} pdfdir = ${docdir}
prefix = /opt/gfa/cafe/cpp/cafe-1.19.3-py310-gcc-7.5.0 prefix = /opt/gfa/cafe/cpp/cafe-1.22.0-gcc-10.4.0
program_transform_name = s,x,x, program_transform_name = s,x,x,
psdir = ${docdir} psdir = ${docdir}
sbindir = ${exec_prefix}/sbin sbindir = ${exec_prefix}/sbin

69
libtool
View File

@@ -1,6 +1,6 @@
#! /bin/sh #! /bin/sh
# Generated automatically by config.status (cafe) 1.19.3 # Generated automatically by config.status (cafe) 1.22.0
# Libtool was configured on host sf-lc8.psi.ch: # Libtool was configured on host sls-lc8.psi.ch:
# NOTE: Changes made to this file will be lost: look at ltmain.sh. # NOTE: Changes made to this file will be lost: look at ltmain.sh.
# Provide generalized library-building support services. # Provide generalized library-building support services.
@@ -76,22 +76,22 @@ build=x86_64-pc-linux-gnu
build_os=linux-gnu build_os=linux-gnu
# A sed program that does not truncate output. # A sed program that does not truncate output.
SED="/usr/bin/sed" SED="/bin/sed"
# Sed that helps us avoid accidentally triggering echo(1) options like -n. # Sed that helps us avoid accidentally triggering echo(1) options like -n.
Xsed="$SED -e 1s/^X//" Xsed="$SED -e 1s/^X//"
# A grep program that handles long lines. # A grep program that handles long lines.
GREP="/usr/bin/grep" GREP="/bin/grep"
# An ERE matcher. # An ERE matcher.
EGREP="/usr/bin/grep -E" EGREP="/bin/grep -E"
# A literal string matcher. # A literal string matcher.
FGREP="/usr/bin/grep -F" FGREP="/bin/grep -F"
# A BSD- or MS-compatible name lister. # A BSD- or MS-compatible name lister.
NM="/usr/bin/nm -B" NM="/bin/nm -B"
# Whether we need soft or hard links. # Whether we need soft or hard links.
LN_S="ln -s" LN_S="ln -s"
@@ -162,7 +162,7 @@ old_postuninstall_cmds=""
lock_old_archive_extraction=no lock_old_archive_extraction=no
# A C compiler. # A C compiler.
LTCC="/opt/psi/Programming/gcc/7.5.0/bin/gcc" LTCC="/opt/psi/Programming/gcc/10.4.0/bin/gcc"
# LTCC compiler flags. # LTCC compiler flags.
LTCFLAGS="-g -O2" LTCFLAGS="-g -O2"
@@ -192,7 +192,7 @@ nm_file_list_spec="@"
lt_sysroot= lt_sysroot=
# Command to truncate a binary pipe. # Command to truncate a binary pipe.
lt_truncate_bin="/usr/bin/dd bs=4096 count=1" lt_truncate_bin="/bin/dd bs=4096 count=1"
# The name of the directory that contains temporary libtool files. # The name of the directory that contains temporary libtool files.
objdir=.libs objdir=.libs
@@ -282,10 +282,10 @@ finish_eval=""
hardcode_into_libs=yes hardcode_into_libs=yes
# Compile-time system search path for libraries. # Compile-time system search path for libraries.
sys_lib_search_path_spec="/afs/psi.ch/sys/psi.x86_64_slp6/Programming/gcc/7.5.0/lib/gcc/x86_64-pc-linux-gnu/7.5.0 /afs/psi.ch/sys/psi.x86_64_slp6/Programming/gcc/7.5.0/lib/gcc /opt/psi/Programming/gcc/7.5.0/lib64 /afs/psi.ch/sys/psi.x86_64_slp6/Programming/gcc/7.5.0/lib64 /lib64 /usr/lib64 /opt/psi/Programming/gcc/7.5.0/lib /opt/psi/Tools/HDFView/3.1.2/lib /afs/psi.ch/sys/psi.x86_64_slp6/Programming/gcc/7.5.0/lib /lib /usr/lib " sys_lib_search_path_spec="/afs/psi.ch/sys/psi.ra/Programming/gcc/10.4.0/lib/gcc/x86_64-pc-linux-gnu/10.4.0 /afs/psi.ch/sys/psi.ra/Programming/gcc/10.4.0/lib/gcc /opt/psi/Programming/gcc/10.4.0/lib64 /afs/psi.ch/sys/psi.ra/Programming/gcc/10.4.0/lib64 /lib64 /usr/lib64 /opt/psi/Programming/gcc/10.4.0/lib /opt/psi/Tools/HDFView/3.1.2/lib /afs/psi.ch/sys/psi.ra/Programming/gcc/10.4.0/lib /lib /usr/lib "
# Detected run-time system search path for libraries. # Detected run-time system search path for libraries.
sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib /usr/lib64/atlas /usr/lib64/dyninst /usr/lib/oracle/19.18/client64/lib /usr/lib64/tclx8.6 /usr/lib64/wine/ " sys_lib_dlsearch_path_spec="/lib /usr/lib /usr/lib64/atlas /usr/lib64/llvm17/lib/ /usr/lib/oracle/19.18/client64/lib /usr/lib64/tclx8.6 /usr/lib64/wine/ "
# Explicit LT_SYS_LIBRARY_PATH set during ./configure time. # Explicit LT_SYS_LIBRARY_PATH set during ./configure time.
configure_time_lt_sys_library_path="" configure_time_lt_sys_library_path=""
@@ -305,7 +305,7 @@ striplib="strip --strip-unneeded"
# The linker used to build libraries. # The linker used to build libraries.
LD="/usr/bin/ld -m elf_x86_64" LD="/bin/ld -m elf_x86_64"
# How to create reloadable object files. # How to create reloadable object files.
reload_flag=" -r" reload_flag=" -r"
@@ -315,7 +315,7 @@ reload_cmds="\$LD\$reload_flag -o \$output\$reload_objs"
old_archive_cmds="\$AR \$AR_FLAGS \$oldlib\$oldobjs~\$RANLIB \$tool_oldlib" old_archive_cmds="\$AR \$AR_FLAGS \$oldlib\$oldobjs~\$RANLIB \$tool_oldlib"
# A language specific compiler. # A language specific compiler.
CC="/opt/psi/Programming/gcc/7.5.0/bin/gcc" CC="/opt/psi/Programming/gcc/10.4.0/bin/gcc"
# Is the compiler the GNU compiler? # Is the compiler the GNU compiler?
with_gcc=yes with_gcc=yes
@@ -7732,6 +7732,11 @@ func_mode_link ()
arg=$func_stripname_result arg=$func_stripname_result
;; ;;
-Wl,--as-needed)
deplibs="$deplibs $arg"
continue
;;
-Wl,*) -Wl,*)
func_stripname '-Wl,' '' "$arg" func_stripname '-Wl,' '' "$arg"
args=$func_stripname_result args=$func_stripname_result
@@ -7784,12 +7789,10 @@ func_mode_link ()
# -tp=* Portland pgcc target processor selection # -tp=* Portland pgcc target processor selection
# --sysroot=* for sysroot support # --sysroot=* for sysroot support
# -O*, -g*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization # -O*, -g*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization
# -specs=* GCC specs files
# -stdlib=* select c++ std lib with clang # -stdlib=* select c++ std lib with clang
-64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
-t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \ -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \
-O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-stdlib=*| \ -O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-stdlib=*)
-specs=*)
func_quote_for_eval "$arg" func_quote_for_eval "$arg"
arg=$func_quote_for_eval_result arg=$func_quote_for_eval_result
func_append compile_command " $arg" func_append compile_command " $arg"
@@ -8038,6 +8041,7 @@ func_mode_link ()
case $linkmode in case $linkmode in
lib) lib)
as_needed_flag=
passes="conv dlpreopen link" passes="conv dlpreopen link"
for file in $dlfiles $dlprefiles; do for file in $dlfiles $dlprefiles; do
case $file in case $file in
@@ -8049,6 +8053,7 @@ func_mode_link ()
done done
;; ;;
prog) prog)
as_needed_flag=
compile_deplibs= compile_deplibs=
finalize_deplibs= finalize_deplibs=
alldeplibs=false alldeplibs=false
@@ -8118,6 +8123,15 @@ func_mode_link ()
lib= lib=
found=false found=false
case $deplib in case $deplib in
-Wl,--as-needed)
if test prog,link = "$linkmode,$pass" ||
test lib,link = "$linkmode,$pass"; then
as_needed_flag="$deplib "
else
deplibs="$deplib $deplibs"
fi
continue
;;
-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \ -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \
|-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*) |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*)
if test prog,link = "$linkmode,$pass"; then if test prog,link = "$linkmode,$pass"; then
@@ -10535,6 +10549,13 @@ EOF
test "X$libobjs" = "X " && libobjs= test "X$libobjs" = "X " && libobjs=
fi fi
# A bit hacky. I had wanted to add \$as_needed_flag to archive_cmds instead, but that
# comes from libtool.m4 which is part of the project being built. This should put it
# in the right place though.
if test lib,link = "$linkmode,$pass" && test -n "$as_needed_flag"; then
libobjs=$as_needed_flag$libobjs
fi
save_ifs=$IFS; IFS='~' save_ifs=$IFS; IFS='~'
for cmd in $cmds; do for cmd in $cmds; do
IFS=$sp$nl IFS=$sp$nl
@@ -10767,8 +10788,8 @@ EOF
compile_deplibs=$new_libs compile_deplibs=$new_libs
func_append compile_command " $compile_deplibs" func_append compile_command " $as_needed_flag $compile_deplibs"
func_append finalize_command " $finalize_deplibs" func_append finalize_command " $as_needed_flag $finalize_deplibs"
if test -n "$rpath$xrpath"; then if test -n "$rpath$xrpath"; then
# If the user specified any rpath flags, then add them. # If the user specified any rpath flags, then add them.
@@ -11663,7 +11684,7 @@ build_old_libs=`case $build_libtool_libs in yes) echo no;; *) echo yes;; esac`
# ### BEGIN LIBTOOL TAG CONFIG: CXX # ### BEGIN LIBTOOL TAG CONFIG: CXX
# The linker used to build libraries. # The linker used to build libraries.
LD="/usr/bin/ld -m elf_x86_64" LD="/bin/ld -m elf_x86_64"
# How to create reloadable object files. # How to create reloadable object files.
reload_flag=" -r" reload_flag=" -r"
@@ -11673,7 +11694,7 @@ reload_cmds="\$LD\$reload_flag -o \$output\$reload_objs"
old_archive_cmds="\$AR \$AR_FLAGS \$oldlib\$oldobjs~\$RANLIB \$tool_oldlib" old_archive_cmds="\$AR \$AR_FLAGS \$oldlib\$oldobjs~\$RANLIB \$tool_oldlib"
# A language specific compiler. # A language specific compiler.
CC="/opt/psi/Programming/gcc/7.5.0/bin/g++" CC="/opt/psi/Programming/gcc/10.4.0/bin/g++"
# Is the compiler the GNU compiler? # Is the compiler the GNU compiler?
with_gcc=yes with_gcc=yes
@@ -11794,17 +11815,17 @@ file_list_spec=""
hardcode_action=immediate hardcode_action=immediate
# The directories searched by this compiler when creating a shared library. # The directories searched by this compiler when creating a shared library.
compiler_lib_search_dirs="/afs/psi.ch/sys/psi.x86_64_slp6/Programming/gcc/7.5.0/bin/../lib/gcc/x86_64-pc-linux-gnu/7.5.0 /afs/psi.ch/sys/psi.x86_64_slp6/Programming/gcc/7.5.0/bin/../lib/gcc /opt/psi/Programming/gcc/7.5.0/lib64/../lib64 /opt/psi/Programming/gcc/7.5.0/lib/../lib64 /afs/psi.ch/sys/psi.x86_64_slp6/Programming/gcc/7.5.0/bin/../lib/gcc/x86_64-pc-linux-gnu/7.5.0/../../../../lib64 /lib/../lib64 /usr/lib/../lib64 /opt/psi/Programming/gcc/7.5.0/lib64 /opt/psi/Programming/gcc/7.5.0/lib /opt/psi/Tools/HDFView/3.1.2/lib /afs/psi.ch/sys/psi.x86_64_slp6/Programming/gcc/7.5.0/bin/../lib/gcc/x86_64-pc-linux-gnu/7.5.0/../../.." compiler_lib_search_dirs="/afs/psi.ch/sys/psi.ra/Programming/gcc/10.4.0/bin/../lib/gcc/x86_64-pc-linux-gnu/10.4.0 /afs/psi.ch/sys/psi.ra/Programming/gcc/10.4.0/bin/../lib/gcc /opt/psi/Programming/gcc/10.4.0/lib64/../lib64 /opt/psi/Programming/gcc/10.4.0/lib/../lib64 /afs/psi.ch/sys/psi.ra/Programming/gcc/10.4.0/bin/../lib/gcc/x86_64-pc-linux-gnu/10.4.0/../../../../lib64 /lib/../lib64 /usr/lib/../lib64 /opt/psi/Programming/gcc/10.4.0/lib64 /opt/psi/Programming/gcc/10.4.0/lib /opt/psi/Tools/HDFView/3.1.2/lib /afs/psi.ch/sys/psi.ra/Programming/gcc/10.4.0/bin/../lib/gcc/x86_64-pc-linux-gnu/10.4.0/../../.."
# Dependencies to place before and after the objects being linked to # Dependencies to place before and after the objects being linked to
# create a shared library. # create a shared library.
predep_objects="/lib/../lib64/crti.o /afs/psi.ch/sys/psi.x86_64_slp6/Programming/gcc/7.5.0/bin/../lib/gcc/x86_64-pc-linux-gnu/7.5.0/crtbeginS.o" predep_objects="/lib/../lib64/crti.o /afs/psi.ch/sys/psi.ra/Programming/gcc/10.4.0/bin/../lib/gcc/x86_64-pc-linux-gnu/10.4.0/crtbeginS.o"
postdep_objects="/afs/psi.ch/sys/psi.x86_64_slp6/Programming/gcc/7.5.0/bin/../lib/gcc/x86_64-pc-linux-gnu/7.5.0/crtendS.o /lib/../lib64/crtn.o" postdep_objects="/afs/psi.ch/sys/psi.ra/Programming/gcc/10.4.0/bin/../lib/gcc/x86_64-pc-linux-gnu/10.4.0/crtendS.o /lib/../lib64/crtn.o"
predeps="" predeps=""
postdeps="-lstdc++ -lm -lgcc_s -lc -lgcc_s" postdeps="-lstdc++ -lm -lgcc_s -lc -lgcc_s"
# The library search path used internally by the compiler when linking # The library search path used internally by the compiler when linking
# a shared library. # a shared library.
compiler_lib_search_path="-L/afs/psi.ch/sys/psi.x86_64_slp6/Programming/gcc/7.5.0/bin/../lib/gcc/x86_64-pc-linux-gnu/7.5.0 -L/afs/psi.ch/sys/psi.x86_64_slp6/Programming/gcc/7.5.0/bin/../lib/gcc -L/opt/psi/Programming/gcc/7.5.0/lib64/../lib64 -L/opt/psi/Programming/gcc/7.5.0/lib/../lib64 -L/afs/psi.ch/sys/psi.x86_64_slp6/Programming/gcc/7.5.0/bin/../lib/gcc/x86_64-pc-linux-gnu/7.5.0/../../../../lib64 -L/lib/../lib64 -L/usr/lib/../lib64 -L/opt/psi/Programming/gcc/7.5.0/lib64 -L/opt/psi/Programming/gcc/7.5.0/lib -L/opt/psi/Tools/HDFView/3.1.2/lib -L/afs/psi.ch/sys/psi.x86_64_slp6/Programming/gcc/7.5.0/bin/../lib/gcc/x86_64-pc-linux-gnu/7.5.0/../../.." compiler_lib_search_path="-L/afs/psi.ch/sys/psi.ra/Programming/gcc/10.4.0/bin/../lib/gcc/x86_64-pc-linux-gnu/10.4.0 -L/afs/psi.ch/sys/psi.ra/Programming/gcc/10.4.0/bin/../lib/gcc -L/opt/psi/Programming/gcc/10.4.0/lib64/../lib64 -L/opt/psi/Programming/gcc/10.4.0/lib/../lib64 -L/afs/psi.ch/sys/psi.ra/Programming/gcc/10.4.0/bin/../lib/gcc/x86_64-pc-linux-gnu/10.4.0/../../../../lib64 -L/lib/../lib64 -L/usr/lib/../lib64 -L/opt/psi/Programming/gcc/10.4.0/lib64 -L/opt/psi/Programming/gcc/10.4.0/lib -L/opt/psi/Tools/HDFView/3.1.2/lib -L/afs/psi.ch/sys/psi.ra/Programming/gcc/10.4.0/bin/../lib/gcc/x86_64-pc-linux-gnu/10.4.0/../../.."
# ### END LIBTOOL TAG CONFIG: CXX # ### END LIBTOOL TAG CONFIG: CXX

5
m4/libtool.m4 vendored
View File

@@ -2867,9 +2867,6 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
# before this can be enabled. # before this can be enabled.
hardcode_into_libs=yes hardcode_into_libs=yes
# Add ABI-specific directories to the system library path.
sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib"
# Ideally, we could use ldconfig to report *all* directores which are # Ideally, we could use ldconfig to report *all* directores which are
# searched for libraries, however this is still not possible. Aside from not # searched for libraries, however this is still not possible. Aside from not
# being certain /sbin/ldconfig is available, command # being certain /sbin/ldconfig is available, command
@@ -2878,7 +2875,7 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
# appending ld.so.conf contents (and includes) to the search path. # appending ld.so.conf contents (and includes) to the search path.
if test -f /etc/ld.so.conf; then if test -f /etc/ld.so.conf; then
lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '` lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra" sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
fi fi
# We used to test for /lib/ld.so.1 and disable shared libraries on # We used to test for /lib/ld.so.1 and disable shared libraries on

74
makefile
View File

@@ -194,10 +194,10 @@ am__DIST_COMMON = $(srcdir)/makefile.in $(top_srcdir)/./compile \
$(top_srcdir)/./include/config.in $(top_srcdir)/./install-sh \ $(top_srcdir)/./include/config.in $(top_srcdir)/./install-sh \
$(top_srcdir)/./ltmain.sh $(top_srcdir)/./missing .//AUTHORS \ $(top_srcdir)/./ltmain.sh $(top_srcdir)/./missing .//AUTHORS \
.//COPYING .//ChangeLog .//INSTALL .//NEWS .//README \ .//COPYING .//ChangeLog .//INSTALL .//NEWS .//README \
.//compile .//config.guess .//config.sub .//install-sh \ .//compile .//config.guess .//config.sub .//depcomp \
.//ltmain.sh .//missing AUTHORS COPYING ChangeLog INSTALL NEWS \ .//install-sh .//ltmain.sh .//missing AUTHORS COPYING \
README compile config.guess config.sub install-sh ltmain.sh \ ChangeLog INSTALL NEWS README compile config.guess config.sub \
missing depcomp install-sh ltmain.sh missing
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
distdir = $(PACKAGE)-$(VERSION) distdir = $(PACKAGE)-$(VERSION)
top_distdir = $(distdir) top_distdir = $(distdir)
@@ -240,24 +240,24 @@ distuninstallcheck_listfiles = find . -type f -print
am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \ am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
| sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$' | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$'
distcleancheck_listfiles = find . -type f -print distcleancheck_listfiles = find . -type f -print
ACLOCAL = ${SHELL} /afs/psi.ch/project/cafe/gitlab/CAFE/cpp/missing aclocal-1.16 ACLOCAL = ${SHELL} /afs/psi.ch/project/cafe/gitea/CAFE/cpp/missing aclocal-1.16
AMTAR = $${TAR-tar} AMTAR = $${TAR-tar}
AM_CPPFLAGS = -fexceptions -fPIC -std=c++1z -I/usr/local/epics/base-7.0.7/include/ -I/usr/local/epics/base-7.0.7/include/os/Linux -I/usr/local/epics/base-7.0.7/include/compiler/gcc -I/opt/gfa/cafe/boost/boost_1_61_0/include/boost -I/opt/gfa/cafe/boost/boost_1_61_0/include -I/opt/gfa/python-3.10/latest/include/python3.10 -I/opt/gfa/python-3.10/latest/lib/python3.10/site-packages/numpy/core/include -I$(top_srcdir)/include AM_CPPFLAGS = -fexceptions -fPIC -std=c++1z -z nodefs -I/usr/local/epics/base-7.0.9/include/ -I/usr/local/epics/base-7.0.9/include/os/Linux -I/usr/local/epics/base-7.0.9/include/compiler/gcc -I/opt/gfa/cafe/boost/boost_1_61_0/include/boost -I/opt/gfa/cafe/boost/boost_1_61_0/include -I$(top_srcdir)/include
AM_DEFAULT_VERBOSITY = 1 AM_DEFAULT_VERBOSITY = 1
AM_LDFLAGS = -L/usr/local/epics/base-7.0.7/lib/RHEL8-x86_64 -Wl,-rpath,/usr/local/epics/base-7.0.7/lib/RHEL8-x86_64 -L/opt/gfa/python-3.10/latest/lib -Wl,-rpath,/opt/gfa/python-3.10/latest/lib @CAFE_LIBS@ AM_LDFLAGS = -L/usr/local/epics/base-7.0.9/lib/RHEL8-x86_64 -Wl,-rpath,/usr/local/epics/base-7.0.9/lib/RHEL8-x86_64 @CAFE_LIBS@
AR = ar AR = ar
AUTOCONF = ${SHELL} /afs/psi.ch/project/cafe/gitlab/CAFE/cpp/missing autoconf AUTOCONF = ${SHELL} /afs/psi.ch/project/cafe/gitea/CAFE/cpp/missing autoconf
AUTOHEADER = ${SHELL} /afs/psi.ch/project/cafe/gitlab/CAFE/cpp/missing autoheader AUTOHEADER = ${SHELL} /afs/psi.ch/project/cafe/gitea/CAFE/cpp/missing autoheader
AUTOMAKE = ${SHELL} /afs/psi.ch/project/cafe/gitlab/CAFE/cpp/missing automake-1.16 AUTOMAKE = ${SHELL} /afs/psi.ch/project/cafe/gitea/CAFE/cpp/missing automake-1.16
AWK = gawk AWK = gawk
CAFE_CPPFLAGS = -I$(top_srcdir)/include CAFE_CPPFLAGS = -I$(top_srcdir)/include
CC = /opt/psi/Programming/gcc/7.5.0/bin/gcc CC = /opt/psi/Programming/gcc/10.4.0/bin/gcc
CCDEPMODE = depmode=gcc3 CCDEPMODE = depmode=gcc3
CFLAGS = -g -O2 CFLAGS = -g -O2
CPP = /opt/psi/Programming/gcc/7.5.0/bin/gcc -E CPP = /opt/psi/Programming/gcc/10.4.0/bin/gcc -E
CPPFLAGS = -fexceptions -fPIC -std=c++1z -I/usr/local/epics/base-7.0.7/include/ -I/usr/local/epics/base-7.0.7/include/os/Linux -I/usr/local/epics/base-7.0.7/include/compiler/gcc -I/opt/gfa/cafe/boost/boost_1_61_0/include/boost -I/opt/gfa/cafe/boost/boost_1_61_0/include -I/opt/gfa/python-3.10/latest/include/python3.10 -I/opt/gfa/python-3.10/latest/lib/python3.10/site-packages/numpy/core/include CPPFLAGS = -fexceptions -fPIC -std=c++1z -z nodefs -I/usr/local/epics/base-7.0.9/include/ -I/usr/local/epics/base-7.0.9/include/os/Linux -I/usr/local/epics/base-7.0.9/include/compiler/gcc -I/opt/gfa/cafe/boost/boost_1_61_0/include/boost -I/opt/gfa/cafe/boost/boost_1_61_0/include
CXX = /opt/psi/Programming/gcc/7.5.0/bin/g++ CXX = /opt/psi/Programming/gcc/10.4.0/bin/g++
CXXCPP = /opt/psi/Programming/gcc/7.5.0/bin/g++ -E CXXCPP = /opt/psi/Programming/gcc/10.4.0/bin/g++ -E
CXXDEPMODE = depmode=gcc3 CXXDEPMODE = depmode=gcc3
CXXFLAGS = -g -O2 CXXFLAGS = -g -O2
CYGPATH_W = echo CYGPATH_W = echo
@@ -269,28 +269,28 @@ DUMPBIN =
ECHO_C = ECHO_C =
ECHO_N = -n ECHO_N = -n
ECHO_T = ECHO_T =
EGREP = /usr/bin/grep -E EGREP = /bin/grep -E
EXEEXT = EXEEXT =
FGREP = /usr/bin/grep -F FGREP = /bin/grep -F
GREP = /usr/bin/grep GREP = /bin/grep
INSTALL = /usr/bin/install -c INSTALL = /bin/install -c
INSTALL_DATA = ${INSTALL} -m 644 INSTALL_DATA = ${INSTALL} -m 644
INSTALL_PROGRAM = ${INSTALL} INSTALL_PROGRAM = ${INSTALL}
INSTALL_SCRIPT = ${INSTALL} INSTALL_SCRIPT = ${INSTALL}
INSTALL_STRIP_PROGRAM = $(install_sh) -c -s INSTALL_STRIP_PROGRAM = $(install_sh) -c -s
LD = /usr/bin/ld -m elf_x86_64 LD = /bin/ld -m elf_x86_64
LDFLAGS = -L/usr/local/epics/base-7.0.7/lib/RHEL8-x86_64 -Wl,-rpath,/usr/local/epics/base-7.0.7/lib/RHEL8-x86_64 -L/opt/gfa/python-3.10/latest/lib -Wl,-rpath,/opt/gfa/python-3.10/latest/lib LDFLAGS = -L/usr/local/epics/base-7.0.9/lib/RHEL8-x86_64 -Wl,-rpath,/usr/local/epics/base-7.0.9/lib/RHEL8-x86_64
LIBOBJS = LIBOBJS =
LIBS = -lpython3.10 LIBS =
LIBTOOL = $(SHELL) $(top_builddir)/libtool LIBTOOL = $(SHELL) $(top_builddir)/libtool
LIPO = LIPO =
LN_S = ln -s LN_S = ln -s
LTLIBOBJS = LTLIBOBJS =
LT_SYS_LIBRARY_PATH = LT_SYS_LIBRARY_PATH =
MAKEINFO = ${SHELL} /afs/psi.ch/project/cafe/gitlab/CAFE/cpp/missing makeinfo MAKEINFO = ${SHELL} /afs/psi.ch/project/cafe/gitea/CAFE/cpp/missing makeinfo
MANIFEST_TOOL = : MANIFEST_TOOL = :
MKDIR_P = /usr/bin/mkdir -p MKDIR_P = /bin/mkdir -p
NM = /usr/bin/nm -B NM = /bin/nm -B
NMEDIT = NMEDIT =
OBJDUMP = objdump OBJDUMP = objdump
OBJEXT = o OBJEXT = o
@@ -299,23 +299,23 @@ OTOOL64 =
PACKAGE = cafe PACKAGE = cafe
PACKAGE_BUGREPORT = Bug reports to: jan.chrin@psi.ch PACKAGE_BUGREPORT = Bug reports to: jan.chrin@psi.ch
PACKAGE_NAME = CAFE PACKAGE_NAME = CAFE
PACKAGE_STRING = CAFE 1.19.3 PACKAGE_STRING = CAFE 1.22.0
PACKAGE_TARNAME = cafe PACKAGE_TARNAME = cafe
PACKAGE_URL = PACKAGE_URL =
PACKAGE_VERSION = 1.19.3 PACKAGE_VERSION = 1.22.0
PATH_SEPARATOR = : PATH_SEPARATOR = :
RANLIB = ranlib RANLIB = ranlib
SED = /usr/bin/sed SED = /bin/sed
SET_MAKE = SET_MAKE =
SHELL = /bin/sh SHELL = /bin/sh
STRIP = strip STRIP = strip
VERSION = 1.19.3 VERSION = 1.22.0
abs_builddir = /afs/psi.ch/project/cafe/gitlab/CAFE/cpp abs_builddir = /afs/psi.ch/project/cafe/gitea/CAFE/cpp
abs_srcdir = /afs/psi.ch/project/cafe/gitlab/CAFE/cpp abs_srcdir = /afs/psi.ch/project/cafe/gitea/CAFE/cpp
abs_top_builddir = /afs/psi.ch/project/cafe/gitlab/CAFE/cpp abs_top_builddir = /afs/psi.ch/project/cafe/gitea/CAFE/cpp
abs_top_srcdir = /afs/psi.ch/project/cafe/gitlab/CAFE/cpp abs_top_srcdir = /afs/psi.ch/project/cafe/gitea/CAFE/cpp
ac_ct_AR = ar ac_ct_AR = ar
ac_ct_CC = /opt/psi/Programming/gcc/7.5.0/bin/gcc ac_ct_CC = /opt/psi/Programming/gcc/10.4.0/bin/gcc
ac_ct_CXX = ac_ct_CXX =
ac_ct_DUMPBIN = ac_ct_DUMPBIN =
am__include = include am__include = include
@@ -343,8 +343,8 @@ host_vendor = pc
htmldir = ${docdir} htmldir = ${docdir}
includedir = ${prefix}/include includedir = ${prefix}/include
infodir = ${datarootdir}/info infodir = ${datarootdir}/info
install_sh = ${SHELL} /afs/psi.ch/project/cafe/gitlab/CAFE/cpp/install-sh install_sh = ${SHELL} /afs/psi.ch/project/cafe/gitea/CAFE/cpp/install-sh
libdir = /opt/gfa/cafe/cpp/cafe-1.19.3-py310-gcc-7.5.0/lib/RHEL8-x86_64 libdir = /opt/gfa/cafe/cpp/cafe-1.22.0-gcc-10.4.0/lib/RHEL8-x86_64
libexecdir = ${exec_prefix}/libexec libexecdir = ${exec_prefix}/libexec
localedir = ${datarootdir}/locale localedir = ${datarootdir}/locale
localstatedir = ${prefix}/var localstatedir = ${prefix}/var
@@ -352,7 +352,7 @@ mandir = ${datarootdir}/man
mkdir_p = $(MKDIR_P) mkdir_p = $(MKDIR_P)
oldincludedir = /usr/include oldincludedir = /usr/include
pdfdir = ${docdir} pdfdir = ${docdir}
prefix = /opt/gfa/cafe/cpp/cafe-1.19.3-py310-gcc-7.5.0 prefix = /opt/gfa/cafe/cpp/cafe-1.22.0-gcc-10.4.0
program_transform_name = s,x,x, program_transform_name = s,x,x,
psdir = ${docdir} psdir = ${docdir}
sbindir = ${exec_prefix}/sbin sbindir = ${exec_prefix}/sbin

12
src/bitshuffle/.deps/bitshuffle.Plo
View File

@@ -4,7 +4,7 @@ bitshuffle/bitshuffle.lo: bitshuffle/bitshuffle.c \
/usr/include/sys/cdefs.h /usr/include/bits/wordsize.h \ /usr/include/sys/cdefs.h /usr/include/bits/wordsize.h \
/usr/include/bits/long-double.h /usr/include/gnu/stubs.h \ /usr/include/bits/long-double.h /usr/include/gnu/stubs.h \
/usr/include/gnu/stubs-64.h \ /usr/include/gnu/stubs-64.h \
/afs/psi.ch/sys/psi.x86_64_slp6/Programming/gcc/7.3.0/lib/gcc/x86_64-pc-linux-gnu/7.3.0/include/stddef.h \ /afs/psi.ch/sys/psi.ra/Programming/gcc/7.3.0/lib/gcc/x86_64-pc-linux-gnu/7.3.0/include/stddef.h \
/usr/include/bits/waitflags.h /usr/include/bits/waitstatus.h \ /usr/include/bits/waitflags.h /usr/include/bits/waitstatus.h \
/usr/include/bits/floatn.h /usr/include/bits/floatn-common.h \ /usr/include/bits/floatn.h /usr/include/bits/floatn-common.h \
/usr/include/sys/types.h /usr/include/bits/types.h \ /usr/include/sys/types.h /usr/include/bits/types.h \
@@ -21,11 +21,11 @@ bitshuffle/bitshuffle.lo: bitshuffle/bitshuffle.c \
/usr/include/bits/pthreadtypes-arch.h /usr/include/alloca.h \ /usr/include/bits/pthreadtypes-arch.h /usr/include/alloca.h \
/usr/include/bits/stdlib-bsearch.h /usr/include/bits/stdlib-float.h \ /usr/include/bits/stdlib-bsearch.h /usr/include/bits/stdlib-float.h \
bitshuffle/bitshuffle_core.h \ bitshuffle/bitshuffle_core.h \
/afs/psi.ch/sys/psi.x86_64_slp6/Programming/gcc/7.3.0/lib/gcc/x86_64-pc-linux-gnu/7.3.0/include/stdint.h \ /afs/psi.ch/sys/psi.ra/Programming/gcc/7.3.0/lib/gcc/x86_64-pc-linux-gnu/7.3.0/include/stdint.h \
/usr/include/stdint.h /usr/include/bits/wchar.h \ /usr/include/stdint.h /usr/include/bits/wchar.h \
/usr/include/bits/stdint-uintn.h bitshuffle/bitshuffle_internals.h \ /usr/include/bits/stdint-uintn.h bitshuffle/bitshuffle_internals.h \
bitshuffle/iochain.h .././include/lz4.h /usr/include/stdio.h \ bitshuffle/iochain.h .././include/lz4.h /usr/include/stdio.h \
/afs/psi.ch/sys/psi.x86_64_slp6/Programming/gcc/7.3.0/lib/gcc/x86_64-pc-linux-gnu/7.3.0/include/stdarg.h \ /afs/psi.ch/sys/psi.ra/Programming/gcc/7.3.0/lib/gcc/x86_64-pc-linux-gnu/7.3.0/include/stdarg.h \
/usr/include/bits/types/__fpos_t.h /usr/include/bits/types/__mbstate_t.h \ /usr/include/bits/types/__fpos_t.h /usr/include/bits/types/__mbstate_t.h \
/usr/include/bits/types/__fpos64_t.h /usr/include/bits/types/__FILE.h \ /usr/include/bits/types/__fpos64_t.h /usr/include/bits/types/__FILE.h \
/usr/include/bits/types/FILE.h /usr/include/bits/types/struct_FILE.h \ /usr/include/bits/types/FILE.h /usr/include/bits/types/struct_FILE.h \
@@ -54,7 +54,7 @@ bitshuffle/bitshuffle.h:
/usr/include/gnu/stubs-64.h: /usr/include/gnu/stubs-64.h:
/afs/psi.ch/sys/psi.x86_64_slp6/Programming/gcc/7.3.0/lib/gcc/x86_64-pc-linux-gnu/7.3.0/include/stddef.h: /afs/psi.ch/sys/psi.ra/Programming/gcc/7.3.0/lib/gcc/x86_64-pc-linux-gnu/7.3.0/include/stddef.h:
/usr/include/bits/waitflags.h: /usr/include/bits/waitflags.h:
@@ -114,7 +114,7 @@ bitshuffle/bitshuffle.h:
bitshuffle/bitshuffle_core.h: bitshuffle/bitshuffle_core.h:
/afs/psi.ch/sys/psi.x86_64_slp6/Programming/gcc/7.3.0/lib/gcc/x86_64-pc-linux-gnu/7.3.0/include/stdint.h: /afs/psi.ch/sys/psi.ra/Programming/gcc/7.3.0/lib/gcc/x86_64-pc-linux-gnu/7.3.0/include/stdint.h:
/usr/include/stdint.h: /usr/include/stdint.h:
@@ -130,7 +130,7 @@ bitshuffle/iochain.h:
/usr/include/stdio.h: /usr/include/stdio.h:
/afs/psi.ch/sys/psi.x86_64_slp6/Programming/gcc/7.3.0/lib/gcc/x86_64-pc-linux-gnu/7.3.0/include/stdarg.h: /afs/psi.ch/sys/psi.ra/Programming/gcc/7.3.0/lib/gcc/x86_64-pc-linux-gnu/7.3.0/include/stdarg.h:
/usr/include/bits/types/__fpos_t.h: /usr/include/bits/types/__fpos_t.h:

28
src/bitshuffle/.deps/bitshuffle_core.Plo
View File

@@ -1,6 +1,6 @@
bitshuffle/bitshuffle_core.lo: bitshuffle/bitshuffle_core.c \ bitshuffle/bitshuffle_core.lo: bitshuffle/bitshuffle_core.c \
/usr/include/stdc-predef.h bitshuffle/bitshuffle_core.h \ /usr/include/stdc-predef.h bitshuffle/bitshuffle_core.h \
/afs/psi.ch/sys/psi.x86_64_slp6/Programming/gcc/7.3.0/lib/gcc/x86_64-pc-linux-gnu/7.3.0/include/stdint.h \ /afs/psi.ch/sys/psi.ra/Programming/gcc/7.3.0/lib/gcc/x86_64-pc-linux-gnu/7.3.0/include/stdint.h \
/usr/include/stdint.h /usr/include/bits/libc-header-start.h \ /usr/include/stdint.h /usr/include/bits/libc-header-start.h \
/usr/include/features.h /usr/include/sys/cdefs.h \ /usr/include/features.h /usr/include/sys/cdefs.h \
/usr/include/bits/wordsize.h /usr/include/bits/long-double.h \ /usr/include/bits/wordsize.h /usr/include/bits/long-double.h \
@@ -8,7 +8,7 @@ bitshuffle/bitshuffle_core.lo: bitshuffle/bitshuffle_core.c \
/usr/include/bits/types.h /usr/include/bits/typesizes.h \ /usr/include/bits/types.h /usr/include/bits/typesizes.h \
/usr/include/bits/wchar.h /usr/include/bits/stdint-intn.h \ /usr/include/bits/wchar.h /usr/include/bits/stdint-intn.h \
/usr/include/bits/stdint-uintn.h /usr/include/stdlib.h \ /usr/include/bits/stdint-uintn.h /usr/include/stdlib.h \
/afs/psi.ch/sys/psi.x86_64_slp6/Programming/gcc/7.3.0/lib/gcc/x86_64-pc-linux-gnu/7.3.0/include/stddef.h \ /afs/psi.ch/sys/psi.ra/Programming/gcc/7.3.0/lib/gcc/x86_64-pc-linux-gnu/7.3.0/include/stddef.h \
/usr/include/bits/waitflags.h /usr/include/bits/waitstatus.h \ /usr/include/bits/waitflags.h /usr/include/bits/waitstatus.h \
/usr/include/bits/floatn.h /usr/include/bits/floatn-common.h \ /usr/include/bits/floatn.h /usr/include/bits/floatn-common.h \
/usr/include/sys/types.h /usr/include/bits/types/clock_t.h \ /usr/include/sys/types.h /usr/include/bits/types/clock_t.h \
@@ -25,7 +25,7 @@ bitshuffle/bitshuffle_core.lo: bitshuffle/bitshuffle_core.c \
/usr/include/bits/stdlib-bsearch.h /usr/include/bits/stdlib-float.h \ /usr/include/bits/stdlib-bsearch.h /usr/include/bits/stdlib-float.h \
bitshuffle/bitshuffle_internals.h bitshuffle/iochain.h \ bitshuffle/bitshuffle_internals.h bitshuffle/iochain.h \
/usr/include/stdio.h \ /usr/include/stdio.h \
/afs/psi.ch/sys/psi.x86_64_slp6/Programming/gcc/7.3.0/lib/gcc/x86_64-pc-linux-gnu/7.3.0/include/stdarg.h \ /afs/psi.ch/sys/psi.ra/Programming/gcc/7.3.0/lib/gcc/x86_64-pc-linux-gnu/7.3.0/include/stdarg.h \
/usr/include/bits/types/__fpos_t.h /usr/include/bits/types/__mbstate_t.h \ /usr/include/bits/types/__fpos_t.h /usr/include/bits/types/__mbstate_t.h \
/usr/include/bits/types/__fpos64_t.h /usr/include/bits/types/__FILE.h \ /usr/include/bits/types/__fpos64_t.h /usr/include/bits/types/__FILE.h \
/usr/include/bits/types/FILE.h /usr/include/bits/types/struct_FILE.h \ /usr/include/bits/types/FILE.h /usr/include/bits/types/struct_FILE.h \
@@ -33,16 +33,16 @@ bitshuffle/bitshuffle_core.lo: bitshuffle/bitshuffle_core.c \
/usr/include/bits/stdio.h /usr/include/string.h \ /usr/include/bits/stdio.h /usr/include/string.h \
/usr/include/bits/types/locale_t.h /usr/include/bits/types/__locale_t.h \ /usr/include/bits/types/locale_t.h /usr/include/bits/types/__locale_t.h \
/usr/include/strings.h \ /usr/include/strings.h \
/afs/psi.ch/sys/psi.x86_64_slp6/Programming/gcc/7.3.0/lib/gcc/x86_64-pc-linux-gnu/7.3.0/include/emmintrin.h \ /afs/psi.ch/sys/psi.ra/Programming/gcc/7.3.0/lib/gcc/x86_64-pc-linux-gnu/7.3.0/include/emmintrin.h \
/afs/psi.ch/sys/psi.x86_64_slp6/Programming/gcc/7.3.0/lib/gcc/x86_64-pc-linux-gnu/7.3.0/include/xmmintrin.h \ /afs/psi.ch/sys/psi.ra/Programming/gcc/7.3.0/lib/gcc/x86_64-pc-linux-gnu/7.3.0/include/xmmintrin.h \
/afs/psi.ch/sys/psi.x86_64_slp6/Programming/gcc/7.3.0/lib/gcc/x86_64-pc-linux-gnu/7.3.0/include/mmintrin.h \ /afs/psi.ch/sys/psi.ra/Programming/gcc/7.3.0/lib/gcc/x86_64-pc-linux-gnu/7.3.0/include/mmintrin.h \
/afs/psi.ch/sys/psi.x86_64_slp6/Programming/gcc/7.3.0/lib/gcc/x86_64-pc-linux-gnu/7.3.0/include/mm_malloc.h /afs/psi.ch/sys/psi.ra/Programming/gcc/7.3.0/lib/gcc/x86_64-pc-linux-gnu/7.3.0/include/mm_malloc.h
/usr/include/stdc-predef.h: /usr/include/stdc-predef.h:
bitshuffle/bitshuffle_core.h: bitshuffle/bitshuffle_core.h:
/afs/psi.ch/sys/psi.x86_64_slp6/Programming/gcc/7.3.0/lib/gcc/x86_64-pc-linux-gnu/7.3.0/include/stdint.h: /afs/psi.ch/sys/psi.ra/Programming/gcc/7.3.0/lib/gcc/x86_64-pc-linux-gnu/7.3.0/include/stdint.h:
/usr/include/stdint.h: /usr/include/stdint.h:
@@ -72,7 +72,7 @@ bitshuffle/bitshuffle_core.h:
/usr/include/stdlib.h: /usr/include/stdlib.h:
/afs/psi.ch/sys/psi.x86_64_slp6/Programming/gcc/7.3.0/lib/gcc/x86_64-pc-linux-gnu/7.3.0/include/stddef.h: /afs/psi.ch/sys/psi.ra/Programming/gcc/7.3.0/lib/gcc/x86_64-pc-linux-gnu/7.3.0/include/stddef.h:
/usr/include/bits/waitflags.h: /usr/include/bits/waitflags.h:
@@ -130,7 +130,7 @@ bitshuffle/iochain.h:
/usr/include/stdio.h: /usr/include/stdio.h:
/afs/psi.ch/sys/psi.x86_64_slp6/Programming/gcc/7.3.0/lib/gcc/x86_64-pc-linux-gnu/7.3.0/include/stdarg.h: /afs/psi.ch/sys/psi.ra/Programming/gcc/7.3.0/lib/gcc/x86_64-pc-linux-gnu/7.3.0/include/stdarg.h:
/usr/include/bits/types/__fpos_t.h: /usr/include/bits/types/__fpos_t.h:
@@ -158,10 +158,10 @@ bitshuffle/iochain.h:
/usr/include/strings.h: /usr/include/strings.h:
/afs/psi.ch/sys/psi.x86_64_slp6/Programming/gcc/7.3.0/lib/gcc/x86_64-pc-linux-gnu/7.3.0/include/emmintrin.h: /afs/psi.ch/sys/psi.ra/Programming/gcc/7.3.0/lib/gcc/x86_64-pc-linux-gnu/7.3.0/include/emmintrin.h:
/afs/psi.ch/sys/psi.x86_64_slp6/Programming/gcc/7.3.0/lib/gcc/x86_64-pc-linux-gnu/7.3.0/include/xmmintrin.h: /afs/psi.ch/sys/psi.ra/Programming/gcc/7.3.0/lib/gcc/x86_64-pc-linux-gnu/7.3.0/include/xmmintrin.h:
/afs/psi.ch/sys/psi.x86_64_slp6/Programming/gcc/7.3.0/lib/gcc/x86_64-pc-linux-gnu/7.3.0/include/mmintrin.h: /afs/psi.ch/sys/psi.ra/Programming/gcc/7.3.0/lib/gcc/x86_64-pc-linux-gnu/7.3.0/include/mmintrin.h:
/afs/psi.ch/sys/psi.x86_64_slp6/Programming/gcc/7.3.0/lib/gcc/x86_64-pc-linux-gnu/7.3.0/include/mm_malloc.h: /afs/psi.ch/sys/psi.ra/Programming/gcc/7.3.0/lib/gcc/x86_64-pc-linux-gnu/7.3.0/include/mm_malloc.h:

4
src/bitshuffle/.deps/iochain.Plo
View File

@@ -3,7 +3,7 @@ bitshuffle/iochain.lo: bitshuffle/iochain.c /usr/include/stdc-predef.h \
/usr/include/features.h /usr/include/sys/cdefs.h \ /usr/include/features.h /usr/include/sys/cdefs.h \
/usr/include/bits/wordsize.h /usr/include/bits/long-double.h \ /usr/include/bits/wordsize.h /usr/include/bits/long-double.h \
/usr/include/gnu/stubs.h /usr/include/gnu/stubs-64.h \ /usr/include/gnu/stubs.h /usr/include/gnu/stubs-64.h \
/afs/psi.ch/sys/psi.x86_64_slp6/Programming/gcc/7.3.0/lib/gcc/x86_64-pc-linux-gnu/7.3.0/include/stddef.h \ /afs/psi.ch/sys/psi.ra/Programming/gcc/7.3.0/lib/gcc/x86_64-pc-linux-gnu/7.3.0/include/stddef.h \
/usr/include/bits/waitflags.h /usr/include/bits/waitstatus.h \ /usr/include/bits/waitflags.h /usr/include/bits/waitstatus.h \
/usr/include/bits/floatn.h /usr/include/bits/floatn-common.h \ /usr/include/bits/floatn.h /usr/include/bits/floatn-common.h \
/usr/include/sys/types.h /usr/include/bits/types.h \ /usr/include/sys/types.h /usr/include/bits/types.h \
@@ -39,7 +39,7 @@ bitshuffle/iochain.lo: bitshuffle/iochain.c /usr/include/stdc-predef.h \
/usr/include/gnu/stubs-64.h: /usr/include/gnu/stubs-64.h:
/afs/psi.ch/sys/psi.x86_64_slp6/Programming/gcc/7.3.0/lib/gcc/x86_64-pc-linux-gnu/7.3.0/include/stddef.h: /afs/psi.ch/sys/psi.ra/Programming/gcc/7.3.0/lib/gcc/x86_64-pc-linux-gnu/7.3.0/include/stddef.h:
/usr/include/bits/waitflags.h: /usr/include/bits/waitflags.h:

72
src/makefile
View File

@@ -88,7 +88,7 @@ PRE_UNINSTALL = :
POST_UNINSTALL = : POST_UNINSTALL = :
build_triplet = x86_64-pc-linux-gnu build_triplet = x86_64-pc-linux-gnu
host_triplet = x86_64-pc-linux-gnu host_triplet = x86_64-pc-linux-gnu
am__append_1 = PyCafe.cpp #am__append_1 = PyCafe.cpp
#am__append_2 = zbsCafeService.cpp zbsDataHolders.cpp \ #am__append_2 = zbsCafeService.cpp zbsDataHolders.cpp \
# bitshuffle/bitshuffle_core.c bitshuffle/bitshuffle.c bitshuffle/iochain.c # bitshuffle/bitshuffle_core.c bitshuffle/bitshuffle.c bitshuffle/iochain.c
@@ -146,7 +146,7 @@ am__libcafe_la_SOURCES_DIST = cafe.cpp cafeCache.cpp cafeGroup.cpp \
zbsCafeService.cpp zbsDataHolders.cpp \ zbsCafeService.cpp zbsDataHolders.cpp \
bitshuffle/bitshuffle_core.c bitshuffle/bitshuffle.c \ bitshuffle/bitshuffle_core.c bitshuffle/bitshuffle.c \
bitshuffle/iochain.c bitshuffle/iochain.c
am__objects_1 = PyCafe.lo #am__objects_1 = PyCafe.lo
am__dirstamp = $(am__leading_dot)dirstamp am__dirstamp = $(am__leading_dot)dirstamp
#am__objects_2 = zbsCafeService.lo zbsDataHolders.lo \ #am__objects_2 = zbsCafeService.lo zbsDataHolders.lo \
# bitshuffle/bitshuffle_core.lo \ # bitshuffle/bitshuffle_core.lo \
@@ -266,7 +266,7 @@ ETAGS = etags
CTAGS = ctags CTAGS = ctags
am__DIST_COMMON = $(srcdir)/makefile.in $(top_srcdir)/./depcomp am__DIST_COMMON = $(srcdir)/makefile.in $(top_srcdir)/./depcomp
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = ${SHELL} /afs/psi.ch/project/cafe/gitlab/CAFE/cpp/missing aclocal-1.16 ACLOCAL = ${SHELL} /afs/psi.ch/project/cafe/gitea/CAFE/cpp/missing aclocal-1.16
AMTAR = $${TAR-tar} AMTAR = $${TAR-tar}
#if HAVE_PYCAFE_EXT_ #if HAVE_PYCAFE_EXT_
@@ -276,22 +276,22 @@ AMTAR = $${TAR-tar}
#if HAVE_PYTHON_ #if HAVE_PYTHON_
#libcafe_la_SOURCES += pycafe/PyCafe.cpp #libcafe_la_SOURCES += pycafe/PyCafe.cpp
#endif #endif
AM_CPPFLAGS = -fexceptions -fPIC -std=c++1z -I/usr/local/epics/base-7.0.7/include/ -I/usr/local/epics/base-7.0.7/include/os/Linux -I/usr/local/epics/base-7.0.7/include/compiler/gcc -I/opt/gfa/cafe/boost/boost_1_61_0/include/boost -I/opt/gfa/cafe/boost/boost_1_61_0/include -I/opt/gfa/python-3.10/latest/include/python3.10 -I/opt/gfa/python-3.10/latest/lib/python3.10/site-packages/numpy/core/include -I$(top_srcdir)/include AM_CPPFLAGS = -fexceptions -fPIC -std=c++1z -z nodefs -I/usr/local/epics/base-7.0.9/include/ -I/usr/local/epics/base-7.0.9/include/os/Linux -I/usr/local/epics/base-7.0.9/include/compiler/gcc -I/opt/gfa/cafe/boost/boost_1_61_0/include/boost -I/opt/gfa/cafe/boost/boost_1_61_0/include -I$(top_srcdir)/include
AM_DEFAULT_VERBOSITY = 1 AM_DEFAULT_VERBOSITY = 1
AM_LDFLAGS = -L/usr/local/epics/base-7.0.7/lib/RHEL8-x86_64 -Wl,-rpath,/usr/local/epics/base-7.0.7/lib/RHEL8-x86_64 -L/opt/gfa/python-3.10/latest/lib -Wl,-rpath,/opt/gfa/python-3.10/latest/lib AM_LDFLAGS = -L/usr/local/epics/base-7.0.9/lib/RHEL8-x86_64 -Wl,-rpath,/usr/local/epics/base-7.0.9/lib/RHEL8-x86_64
AR = ar AR = ar
AUTOCONF = ${SHELL} /afs/psi.ch/project/cafe/gitlab/CAFE/cpp/missing autoconf AUTOCONF = ${SHELL} /afs/psi.ch/project/cafe/gitea/CAFE/cpp/missing autoconf
AUTOHEADER = ${SHELL} /afs/psi.ch/project/cafe/gitlab/CAFE/cpp/missing autoheader AUTOHEADER = ${SHELL} /afs/psi.ch/project/cafe/gitea/CAFE/cpp/missing autoheader
AUTOMAKE = ${SHELL} /afs/psi.ch/project/cafe/gitlab/CAFE/cpp/missing automake-1.16 AUTOMAKE = ${SHELL} /afs/psi.ch/project/cafe/gitea/CAFE/cpp/missing automake-1.16
AWK = gawk AWK = gawk
CAFE_CPPFLAGS = -I$(top_srcdir)/include CAFE_CPPFLAGS = -I$(top_srcdir)/include
CC = /opt/psi/Programming/gcc/7.5.0/bin/gcc CC = /opt/psi/Programming/gcc/10.4.0/bin/gcc
CCDEPMODE = depmode=gcc3 CCDEPMODE = depmode=gcc3
CFLAGS = -g -O2 CFLAGS = -g -O2
CPP = /opt/psi/Programming/gcc/7.5.0/bin/gcc -E CPP = /opt/psi/Programming/gcc/10.4.0/bin/gcc -E
CPPFLAGS = -fexceptions -fPIC -std=c++1z -I/usr/local/epics/base-7.0.7/include/ -I/usr/local/epics/base-7.0.7/include/os/Linux -I/usr/local/epics/base-7.0.7/include/compiler/gcc -I/opt/gfa/cafe/boost/boost_1_61_0/include/boost -I/opt/gfa/cafe/boost/boost_1_61_0/include -I/opt/gfa/python-3.10/latest/include/python3.10 -I/opt/gfa/python-3.10/latest/lib/python3.10/site-packages/numpy/core/include CPPFLAGS = -fexceptions -fPIC -std=c++1z -z nodefs -I/usr/local/epics/base-7.0.9/include/ -I/usr/local/epics/base-7.0.9/include/os/Linux -I/usr/local/epics/base-7.0.9/include/compiler/gcc -I/opt/gfa/cafe/boost/boost_1_61_0/include/boost -I/opt/gfa/cafe/boost/boost_1_61_0/include
CXX = /opt/psi/Programming/gcc/7.5.0/bin/g++ CXX = /opt/psi/Programming/gcc/10.4.0/bin/g++
CXXCPP = /opt/psi/Programming/gcc/7.5.0/bin/g++ -E CXXCPP = /opt/psi/Programming/gcc/10.4.0/bin/g++ -E
CXXDEPMODE = depmode=gcc3 CXXDEPMODE = depmode=gcc3
CXXFLAGS = -g -O2 CXXFLAGS = -g -O2
CYGPATH_W = echo CYGPATH_W = echo
@@ -303,28 +303,28 @@ DUMPBIN =
ECHO_C = ECHO_C =
ECHO_N = -n ECHO_N = -n
ECHO_T = ECHO_T =
EGREP = /usr/bin/grep -E EGREP = /bin/grep -E
EXEEXT = EXEEXT =
FGREP = /usr/bin/grep -F FGREP = /bin/grep -F
GREP = /usr/bin/grep GREP = /bin/grep
INSTALL = /usr/bin/install -c INSTALL = /bin/install -c
INSTALL_DATA = ${INSTALL} -m 644 INSTALL_DATA = ${INSTALL} -m 644
INSTALL_PROGRAM = ${INSTALL} INSTALL_PROGRAM = ${INSTALL}
INSTALL_SCRIPT = ${INSTALL} INSTALL_SCRIPT = ${INSTALL}
INSTALL_STRIP_PROGRAM = $(install_sh) -c -s INSTALL_STRIP_PROGRAM = $(install_sh) -c -s
LD = /usr/bin/ld -m elf_x86_64 LD = /bin/ld -m elf_x86_64
LDFLAGS = -L/usr/local/epics/base-7.0.7/lib/RHEL8-x86_64 -Wl,-rpath,/usr/local/epics/base-7.0.7/lib/RHEL8-x86_64 -L/opt/gfa/python-3.10/latest/lib -Wl,-rpath,/opt/gfa/python-3.10/latest/lib LDFLAGS = -L/usr/local/epics/base-7.0.9/lib/RHEL8-x86_64 -Wl,-rpath,/usr/local/epics/base-7.0.9/lib/RHEL8-x86_64
LIBOBJS = LIBOBJS =
LIBS = -lpython3.10 LIBS =
LIBTOOL = $(SHELL) $(top_builddir)/libtool LIBTOOL = $(SHELL) $(top_builddir)/libtool
LIPO = LIPO =
LN_S = ln -s LN_S = ln -s
LTLIBOBJS = LTLIBOBJS =
LT_SYS_LIBRARY_PATH = LT_SYS_LIBRARY_PATH =
MAKEINFO = ${SHELL} /afs/psi.ch/project/cafe/gitlab/CAFE/cpp/missing makeinfo MAKEINFO = ${SHELL} /afs/psi.ch/project/cafe/gitea/CAFE/cpp/missing makeinfo
MANIFEST_TOOL = : MANIFEST_TOOL = :
MKDIR_P = /usr/bin/mkdir -p MKDIR_P = /bin/mkdir -p
NM = /usr/bin/nm -B NM = /bin/nm -B
NMEDIT = NMEDIT =
OBJDUMP = objdump OBJDUMP = objdump
OBJEXT = o OBJEXT = o
@@ -333,23 +333,23 @@ OTOOL64 =
PACKAGE = cafe PACKAGE = cafe
PACKAGE_BUGREPORT = Bug reports to: jan.chrin@psi.ch PACKAGE_BUGREPORT = Bug reports to: jan.chrin@psi.ch
PACKAGE_NAME = CAFE PACKAGE_NAME = CAFE
PACKAGE_STRING = CAFE 1.19.3 PACKAGE_STRING = CAFE 1.22.0
PACKAGE_TARNAME = cafe PACKAGE_TARNAME = cafe
PACKAGE_URL = PACKAGE_URL =
PACKAGE_VERSION = 1.19.3 PACKAGE_VERSION = 1.22.0
PATH_SEPARATOR = : PATH_SEPARATOR = :
RANLIB = ranlib RANLIB = ranlib
SED = /usr/bin/sed SED = /bin/sed
SET_MAKE = SET_MAKE =
SHELL = /bin/sh SHELL = /bin/sh
STRIP = strip STRIP = strip
VERSION = 1.19.3 VERSION = 1.22.0
abs_builddir = /afs/psi.ch/project/cafe/gitlab/CAFE/cpp/src abs_builddir = /afs/psi.ch/project/cafe/gitea/CAFE/cpp/src
abs_srcdir = /afs/psi.ch/project/cafe/gitlab/CAFE/cpp/src abs_srcdir = /afs/psi.ch/project/cafe/gitea/CAFE/cpp/src
abs_top_builddir = /afs/psi.ch/project/cafe/gitlab/CAFE/cpp abs_top_builddir = /afs/psi.ch/project/cafe/gitea/CAFE/cpp
abs_top_srcdir = /afs/psi.ch/project/cafe/gitlab/CAFE/cpp abs_top_srcdir = /afs/psi.ch/project/cafe/gitea/CAFE/cpp
ac_ct_AR = ar ac_ct_AR = ar
ac_ct_CC = /opt/psi/Programming/gcc/7.5.0/bin/gcc ac_ct_CC = /opt/psi/Programming/gcc/10.4.0/bin/gcc
ac_ct_CXX = ac_ct_CXX =
ac_ct_DUMPBIN = ac_ct_DUMPBIN =
am__include = include am__include = include
@@ -377,8 +377,8 @@ host_vendor = pc
htmldir = ${docdir} htmldir = ${docdir}
includedir = ${prefix}/include includedir = ${prefix}/include
infodir = ${datarootdir}/info infodir = ${datarootdir}/info
install_sh = ${SHELL} /afs/psi.ch/project/cafe/gitlab/CAFE/cpp/install-sh install_sh = ${SHELL} /afs/psi.ch/project/cafe/gitea/CAFE/cpp/install-sh
libdir = /opt/gfa/cafe/cpp/cafe-1.19.3-py310-gcc-7.5.0/lib/RHEL8-x86_64 libdir = /opt/gfa/cafe/cpp/cafe-1.22.0-gcc-10.4.0/lib/RHEL8-x86_64
libexecdir = ${exec_prefix}/libexec libexecdir = ${exec_prefix}/libexec
localedir = ${datarootdir}/locale localedir = ${datarootdir}/locale
localstatedir = ${prefix}/var localstatedir = ${prefix}/var
@@ -386,7 +386,7 @@ mandir = ${datarootdir}/man
mkdir_p = $(MKDIR_P) mkdir_p = $(MKDIR_P)
oldincludedir = /usr/include oldincludedir = /usr/include
pdfdir = ${docdir} pdfdir = ${docdir}
prefix = /opt/gfa/cafe/cpp/cafe-1.19.3-py310-gcc-7.5.0 prefix = /opt/gfa/cafe/cpp/cafe-1.22.0-gcc-10.4.0
program_transform_name = s,x,x, program_transform_name = s,x,x,
psdir = ${docdir} psdir = ${docdir}
sbindir = ${exec_prefix}/sbin sbindir = ${exec_prefix}/sbin
@@ -406,7 +406,7 @@ lib_LTLIBRARIES = libcafe.la
#2nd: age #2nd: age
#3rd: revision #3rd: revision
#1.9.2 1.10.2 1.11.0 1.11.1 1.12.0 1.12.1 1.12.2 1.12.4 #1.9.2 1.10.2 1.11.0 1.11.1 1.12.0 1.12.1 1.12.2 1.12.4
libcafe_la_LDFLAGS = -version-info 20:3:19 libcafe_la_LDFLAGS = -version-info 23:0:22
libcafe_la_SOURCES = cafe.cpp cafeCache.cpp cafeGroup.cpp \ libcafe_la_SOURCES = cafe.cpp cafeCache.cpp cafeGroup.cpp \
cafeVectors.cpp cafeXML.cpp callbackHandlerCreate.cpp \ cafeVectors.cpp cafeXML.cpp callbackHandlerCreate.cpp \
callbackHandlerMonitor.cpp conduit.cpp connect.cpp \ callbackHandlerMonitor.cpp conduit.cpp connect.cpp \

2
src/makefile.am
View File

@@ -12,7 +12,7 @@ lib_LTLIBRARIES = libcafe.la
#2nd: age #2nd: age
#3rd: revision #3rd: revision
#1.9.2 1.10.2 1.11.0 1.11.1 1.12.0 1.12.1 1.12.2 1.12.4 #1.9.2 1.10.2 1.11.0 1.11.1 1.12.0 1.12.1 1.12.2 1.12.4
libcafe_la_LDFLAGS = -version-info 20:3:19 libcafe_la_LDFLAGS = -version-info 23:0:22
libcafe_la_SOURCES = cafe.cpp cafeCache.cpp cafeGroup.cpp cafeVectors.cpp cafeXML.cpp \ libcafe_la_SOURCES = cafe.cpp cafeCache.cpp cafeGroup.cpp cafeVectors.cpp cafeXML.cpp \
callbackHandlerCreate.cpp callbackHandlerMonitor.cpp conduit.cpp connect.cpp connectCallbacks.cpp \ callbackHandlerCreate.cpp callbackHandlerMonitor.cpp conduit.cpp connect.cpp connectCallbacks.cpp \