cafe-1.13.0

README

@@ -4,8 +4,17 @@ autogen_rel_py3_noqt.sh  ==>  generates library for use from within python and C
 autogen_rel_noqt.sh   ==>  generates library for building a mex file (remove Qt4 dependence as matlab requires Qt5)
 autogen_rel.sh        ==>  normal c++ release
 
-##
+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"
 
+##
 ## --------------------------------------------------------------------------
 ## autogen.sh
 ##
@@ -16,18 +25,21 @@ autogen_rel.sh        ==>  normal c++ release
 ##           installed 
 
 ## --with-boost: base directory for the boost header files
-## --with-epics: epics top level directory 
+## --with-epics7: epics7 top level directory
-##               Note that configure.ac assume that the architecture is
+## --with-epics3: epics3 top level directory 
-##               base/lib/${EPICS_HOST_ARCH}
+##                Note that configure.ac assume that the architecture is
-## --with-qt-inc Qt include directory (optional)
+##                base/lib/${EPICS_HOST_ARCH}
-## --with-qt-lib Qt lib directory (optional)
+
-## --with-python-inc Python include directory, if building PyCafe  
+## --with-qt5: Qt5 base directory (optional)
-## --with-python-lib Python lib directory, if bulding PyCafe
+## --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
 2) 'source autogen.sh'
-3) 'make install'  This installs cafe headers/libraries to the directories 
+3) 'make'
+4) 'make install'  This installs cafe headers/libraries to the directories 
    specified by --prefix/--libdir in the above
                 
  

autogen.sh

@@ -0,0 +1,85 @@
+### 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") 
+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 "$EB" ]
+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
+

autogen_psi.sh

@@ -0,0 +1,278 @@
+### 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/6.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.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") 
+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.4.1' #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" = "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" = "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" = "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" 
+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-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
+

configure.ac

@@ -1 +1 @@
-configureCafe.ac
+configurePSI.ac

include/makefile

@@ -38,9 +38,12 @@ host_triplet = x86_64-unknown-linux-gnu
 #                   bitshuffle/bitshuffle_core.h bitshuffle/bitshuffle.h bitshuffle/iochain.h \
 #		   bitshuffle/bitshuffle_internals.h 									
 
-#bitshuffle/bshuf_h5filter.h 
+
-#am__append_2 = PyCafe_api.h
+#if HAVE_PYTHON_
-#am__append_3 = PyCafe.h 
+#include_HEADERS += PyCafe_api.h
+#endif
+#am__append_2 = PyCafe.h 
+am__append_3 = PyCafe_api.h
 subdir = include
 DIST_COMMON = $(am__include_HEADERS_DIST) $(srcdir)/makefile.am \
 	$(srcdir)/makefile.in
@@ -72,7 +75,7 @@ am__include_HEADERS_DIST = config.h cafe.h cafeCache.h cafeConvert.h \
 	tmDateMap.h zbsread.h zbsHash.h zbsdtHelper.h zbsDataHolders.h \
 	bitshuffle/bitshuffle_core.h bitshuffle/bitshuffle.h \
 	bitshuffle/iochain.h bitshuffle/bitshuffle_internals.h \
-	PyCafe_api.h PyCafe.h
+	PyCafe.h PyCafe_api.h
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -101,8 +104,8 @@ CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = ${SHELL} /afs/psi.ch/project/cafe/gitlab/CAFE/cpp/missing --run aclocal-1.11
 AMTAR = ${SHELL} /afs/psi.ch/project/cafe/gitlab/CAFE/cpp/missing --run tar
-AM_CPPFLAGS =  -fexceptions -fPIC -std=c++1z -I/usr/local/epics/base/include/ -I/usr/local/epics/base/include/os/Linux -I/opt/gfa/cafe/boost/boost_1_61_0/include/boost -I/opt/gfa/cafe/boost/boost_1_61_0/include
+AM_CPPFLAGS =  -fexceptions -fPIC -std=c++1z -I/usr/local/epics/base/include/ -I/usr/local/epics/base/include/os/Linux -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.7/latest/include/qt  -I/opt/gfa/python-3.7/latest/include/qt/QtCore  -I/opt/gfa/python-3.7/latest/include/qt/QtXml
-AM_LDFLAGS =  -L/usr/local/epics/base/lib/SL6-x86_64 -Wl,-rpath,/usr/local/epics/base/lib/SL6-x86_64
+AM_LDFLAGS =  -L/usr/local/epics/base/lib/SL6-x86_64 -Wl,-rpath,/usr/local/epics/base/lib/SL6-x86_64 -L/opt/gfa/python-3.7/latest/lib   -Wl,-rpath,/opt/gfa/python-3.7/latest/lib 
 AR = ar
 AUTOCONF = ${SHELL} /afs/psi.ch/project/cafe/gitlab/CAFE/cpp/missing --run autoconf
 AUTOHEADER = ${SHELL} /afs/psi.ch/project/cafe/gitlab/CAFE/cpp/missing --run autoheader
@@ -113,7 +116,7 @@ CC = /opt/psi/Programming/gcc/6.3.0/bin/gcc
 CCDEPMODE = depmode=gcc3
 CFLAGS = -g -O2
 CPP = /opt/psi/Programming/gcc/6.3.0/bin/gcc -E
-CPPFLAGS =  -fexceptions -fPIC -std=c++1z -I/usr/local/epics/base/include/ -I/usr/local/epics/base/include/os/Linux -I/opt/gfa/cafe/boost/boost_1_61_0/include/boost -I/opt/gfa/cafe/boost/boost_1_61_0/include
+CPPFLAGS =  -fexceptions -fPIC -std=c++1z -I/usr/local/epics/base/include/ -I/usr/local/epics/base/include/os/Linux -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.7/latest/include/qt  -I/opt/gfa/python-3.7/latest/include/qt/QtCore  -I/opt/gfa/python-3.7/latest/include/qt/QtXml
 CXX = /opt/psi/Programming/gcc/6.3.0/bin/g++
 CXXCPP = /opt/psi/Programming/gcc/6.3.0/bin/g++ -E
 CXXDEPMODE = depmode=gcc3
@@ -137,9 +140,9 @@ INSTALL_PROGRAM = ${INSTALL}
 INSTALL_SCRIPT = ${INSTALL}
 INSTALL_STRIP_PROGRAM = $(install_sh) -c -s
 LD = /usr/bin/ld -m elf_x86_64
-LDFLAGS =  -L/usr/local/epics/base/lib/SL6-x86_64 -Wl,-rpath,/usr/local/epics/base/lib/SL6-x86_64
+LDFLAGS =  -L/usr/local/epics/base/lib/SL6-x86_64 -Wl,-rpath,/usr/local/epics/base/lib/SL6-x86_64 -L/opt/gfa/python-3.7/latest/lib   -Wl,-rpath,/opt/gfa/python-3.7/latest/lib 
 LIBOBJS = 
-LIBS = 
+LIBS = -lQt5Xml 
 LIBTOOL = $(SHELL) $(top_builddir)/libtool
 LIPO = 
 LN_S = ln -s
@@ -157,16 +160,16 @@ OTOOL64 =
 PACKAGE = cafe
 PACKAGE_BUGREPORT = Bug reports to: jan.chrin@psi.ch
 PACKAGE_NAME = CAFE
-PACKAGE_STRING = CAFE 1.12.5
+PACKAGE_STRING = CAFE 1.13.0
 PACKAGE_TARNAME = cafe
-PACKAGE_VERSION = 1.12.5
+PACKAGE_VERSION = 1.13.0
 PATH_SEPARATOR = :
 RANLIB = ranlib
 SED = /bin/sed
 SET_MAKE = 
 SHELL = /bin/sh
 STRIP = strip
-VERSION = 1.12.5
+VERSION = 1.13.0
 abs_builddir = /afs/psi.ch/project/cafe/gitlab/CAFE/cpp/include
 abs_srcdir = /afs/psi.ch/project/cafe/gitlab/CAFE/cpp/include
 abs_top_builddir = /afs/psi.ch/project/cafe/gitlab/CAFE/cpp
@@ -201,7 +204,7 @@ htmldir = ${docdir}
 includedir = ${prefix}/include
 infodir = ${datarootdir}/info
 install_sh = ${SHELL} /afs/psi.ch/project/cafe/gitlab/CAFE/cpp/install-sh
-libdir = /opt/gfa/cafe/cpp/cafe-noqt-1.12.5-gcc-6.3.0/lib
+libdir = /opt/gfa/cafe/cpp/cafe-1.13.0-gcc-6.3.0/lib/SL6-x86_64
 libexecdir = ${exec_prefix}/libexec
 localedir = ${datarootdir}/locale
 localstatedir = ${prefix}/var
@@ -209,7 +212,7 @@ mandir = ${datarootdir}/man
 mkdir_p = /bin/mkdir -p
 oldincludedir = /usr/include
 pdfdir = ${docdir}
-prefix = /opt/gfa/cafe/cpp/cafe-noqt-1.12.5-gcc-6.3.0
+prefix = /opt/gfa/cafe/cpp/cafe-1.13.0-gcc-6.3.0
 program_transform_name = s,x,x,
 psdir = ${docdir}
 sbindir = ${exec_prefix}/sbin

include/makefile.am

@@ -18,12 +18,13 @@ include_HEADERS += zbsread.h zbsHash.h zbsdtHelper.h zbsDataHolders.h \
                    bitshuffle/bitshuffle_core.h bitshuffle/bitshuffle.h bitshuffle/iochain.h \
 		   bitshuffle/bitshuffle_internals.h 									
 endif
-#bitshuffle/bshuf_h5filter.h 
 
-if HAVE_PYTHON_
+#if HAVE_PYTHON_
-include_HEADERS += PyCafe_api.h
+#include_HEADERS += PyCafe_api.h
-endif
+#endif
 
 if HAVE_PYCAFE_EXT_
 include_HEADERS += PyCafe.h 
+else
+include_HEADERS += PyCafe_api.h
 endif

libtool

@@ -1,5 +1,5 @@
 #! /bin/sh
-# Generated automatically by config.status (cafe) 1.12.5
+# Generated automatically by config.status (cafe) 1.13.0
 # Libtool was configured on host gfa-lc6-64:
 # NOTE: Changes made to this file will be lost: look at ltmain.sh.
 

makefile

@@ -134,8 +134,8 @@ distuninstallcheck_listfiles = find . -type f -print
 distcleancheck_listfiles = find . -type f -print
 ACLOCAL = ${SHELL} /afs/psi.ch/project/cafe/gitlab/CAFE/cpp/missing --run aclocal-1.11
 AMTAR = ${SHELL} /afs/psi.ch/project/cafe/gitlab/CAFE/cpp/missing --run tar
-AM_CPPFLAGS =  -fexceptions -fPIC -std=c++1z -I/usr/local/epics/base/include/ -I/usr/local/epics/base/include/os/Linux -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_CPPFLAGS =  -fexceptions -fPIC -std=c++1z -I/usr/local/epics/base/include/ -I/usr/local/epics/base/include/os/Linux -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.7/latest/include/qt  -I/opt/gfa/python-3.7/latest/include/qt/QtCore  -I/opt/gfa/python-3.7/latest/include/qt/QtXml -I$(top_srcdir)/include 
-AM_LDFLAGS =  -L/usr/local/epics/base/lib/SL6-x86_64 -Wl,-rpath,/usr/local/epics/base/lib/SL6-x86_64 @CAFE_LIBS@
+AM_LDFLAGS =  -L/usr/local/epics/base/lib/SL6-x86_64 -Wl,-rpath,/usr/local/epics/base/lib/SL6-x86_64 -L/opt/gfa/python-3.7/latest/lib   -Wl,-rpath,/opt/gfa/python-3.7/latest/lib  @CAFE_LIBS@
 AR = ar
 AUTOCONF = ${SHELL} /afs/psi.ch/project/cafe/gitlab/CAFE/cpp/missing --run autoconf
 AUTOHEADER = ${SHELL} /afs/psi.ch/project/cafe/gitlab/CAFE/cpp/missing --run autoheader
@@ -146,7 +146,7 @@ CC = /opt/psi/Programming/gcc/6.3.0/bin/gcc
 CCDEPMODE = depmode=gcc3
 CFLAGS = -g -O2
 CPP = /opt/psi/Programming/gcc/6.3.0/bin/gcc -E
-CPPFLAGS =  -fexceptions -fPIC -std=c++1z -I/usr/local/epics/base/include/ -I/usr/local/epics/base/include/os/Linux -I/opt/gfa/cafe/boost/boost_1_61_0/include/boost -I/opt/gfa/cafe/boost/boost_1_61_0/include
+CPPFLAGS =  -fexceptions -fPIC -std=c++1z -I/usr/local/epics/base/include/ -I/usr/local/epics/base/include/os/Linux -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.7/latest/include/qt  -I/opt/gfa/python-3.7/latest/include/qt/QtCore  -I/opt/gfa/python-3.7/latest/include/qt/QtXml
 CXX = /opt/psi/Programming/gcc/6.3.0/bin/g++
 CXXCPP = /opt/psi/Programming/gcc/6.3.0/bin/g++ -E
 CXXDEPMODE = depmode=gcc3
@@ -170,9 +170,9 @@ INSTALL_PROGRAM = ${INSTALL}
 INSTALL_SCRIPT = ${INSTALL}
 INSTALL_STRIP_PROGRAM = $(install_sh) -c -s
 LD = /usr/bin/ld -m elf_x86_64
-LDFLAGS =  -L/usr/local/epics/base/lib/SL6-x86_64 -Wl,-rpath,/usr/local/epics/base/lib/SL6-x86_64
+LDFLAGS =  -L/usr/local/epics/base/lib/SL6-x86_64 -Wl,-rpath,/usr/local/epics/base/lib/SL6-x86_64 -L/opt/gfa/python-3.7/latest/lib   -Wl,-rpath,/opt/gfa/python-3.7/latest/lib 
 LIBOBJS = 
-LIBS = 
+LIBS = -lQt5Xml 
 LIBTOOL = $(SHELL) $(top_builddir)/libtool
 LIPO = 
 LN_S = ln -s
@@ -190,16 +190,16 @@ OTOOL64 =
 PACKAGE = cafe
 PACKAGE_BUGREPORT = Bug reports to: jan.chrin@psi.ch
 PACKAGE_NAME = CAFE
-PACKAGE_STRING = CAFE 1.12.5
+PACKAGE_STRING = CAFE 1.13.0
 PACKAGE_TARNAME = cafe
-PACKAGE_VERSION = 1.12.5
+PACKAGE_VERSION = 1.13.0
 PATH_SEPARATOR = :
 RANLIB = ranlib
 SED = /bin/sed
 SET_MAKE = 
 SHELL = /bin/sh
 STRIP = strip
-VERSION = 1.12.5
+VERSION = 1.13.0
 abs_builddir = /afs/psi.ch/project/cafe/gitlab/CAFE/cpp
 abs_srcdir = /afs/psi.ch/project/cafe/gitlab/CAFE/cpp
 abs_top_builddir = /afs/psi.ch/project/cafe/gitlab/CAFE/cpp
@@ -234,7 +234,7 @@ htmldir = ${docdir}
 includedir = ${prefix}/include
 infodir = ${datarootdir}/info
 install_sh = ${SHELL} /afs/psi.ch/project/cafe/gitlab/CAFE/cpp/install-sh
-libdir = /opt/gfa/cafe/cpp/cafe-noqt-1.12.5-gcc-6.3.0/lib
+libdir = /opt/gfa/cafe/cpp/cafe-1.13.0-gcc-6.3.0/lib/SL6-x86_64
 libexecdir = ${exec_prefix}/libexec
 localedir = ${datarootdir}/locale
 localstatedir = ${prefix}/var
@@ -242,7 +242,7 @@ mandir = ${datarootdir}/man
 mkdir_p = /bin/mkdir -p
 oldincludedir = /usr/include
 pdfdir = ${docdir}
-prefix = /opt/gfa/cafe/cpp/cafe-noqt-1.12.5-gcc-6.3.0
+prefix = /opt/gfa/cafe/cpp/cafe-1.13.0-gcc-6.3.0
 program_transform_name = s,x,x,
 psdir = ${docdir}
 sbindir = ${exec_prefix}/sbin

src/PyCafe.cpp

@@ -1 +1 @@
-PyCafe3.cpp
+PyCafe_sls.cpp

src/makefile

@@ -34,10 +34,15 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = x86_64-unknown-linux-gnu
 host_triplet = x86_64-unknown-linux-gnu
-#am__append_1 = PyCafe.cpp
+
-#am__append_2 = zbsCafeService.cpp zbsDataHolders.cpp \
+#if HAVE_PYCAFE_EXT_
+#libcafe_la_SOURCES += PyCafe.cpp
+#endif
+#am__append_1 = zbsCafeService.cpp zbsDataHolders.cpp \
 #		bitshuffle/bitshuffle_core.c bitshuffle/bitshuffle.c bitshuffle/iochain.c
 
+##am__append_2 = pycafe/PyCafe_sf.cpp
+#am__append_3 = pycafe/PyCafe.cpp
 subdir = src
 DIST_COMMON = $(srcdir)/makefile.am $(srcdir)/makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -82,13 +87,15 @@ am__libcafe_la_SOURCES_DIST = cafe.cpp cafeCache.cpp cafeGroup.cpp \
 	handleHelper.cpp loadCollectionXMLParser.cpp \
 	loadGroupXMLParser.cpp methodCallbacks.cpp helper.cpp \
 	policyHelper.cpp conduitGroup.cpp connectGroup.cpp \
-	transpose.cpp restorePVGroupXMLParser.cpp PyCafe.cpp \
+	transpose.cpp restorePVGroupXMLParser.cpp zbsCafeService.cpp \
-	zbsCafeService.cpp zbsDataHolders.cpp \
+	zbsDataHolders.cpp bitshuffle/bitshuffle_core.c \
-	bitshuffle/bitshuffle_core.c bitshuffle/bitshuffle.c \
+	bitshuffle/bitshuffle.c bitshuffle/iochain.c \
-	bitshuffle/iochain.c
+	pycafe/PyCafe_sf.cpp pycafe/PyCafe.cpp
-#am__objects_1 = PyCafe.lo
+#am__objects_1 = zbsCafeService.lo zbsDataHolders.lo \
-#am__objects_2 = zbsCafeService.lo zbsDataHolders.lo \
 #	bitshuffle_core.lo bitshuffle.lo iochain.lo
+##am__objects_2 =  \
+##	PyCafe_sf.lo
+#am__objects_3 = PyCafe.lo
 am_libcafe_la_OBJECTS = cafe.lo cafeCache.lo cafeGroup.lo \
 	cafeVectors.lo cafeXML.lo callbackHandlerCreate.lo \
 	callbackHandlerMonitor.lo conduit.lo connect.lo \
@@ -96,7 +103,8 @@ am_libcafe_la_OBJECTS = cafe.lo cafeCache.lo cafeGroup.lo \
 	handleHelper.lo loadCollectionXMLParser.lo \
 	loadGroupXMLParser.lo methodCallbacks.lo helper.lo \
 	policyHelper.lo conduitGroup.lo connectGroup.lo transpose.lo \
-	restorePVGroupXMLParser.lo $(am__objects_1) $(am__objects_2)
+	restorePVGroupXMLParser.lo $(am__objects_1) $(am__objects_2) \
+	$(am__objects_3)
 libcafe_la_OBJECTS = $(am_libcafe_la_OBJECTS)
 libcafe_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
@@ -130,8 +138,8 @@ CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = ${SHELL} /afs/psi.ch/project/cafe/gitlab/CAFE/cpp/missing --run aclocal-1.11
 AMTAR = ${SHELL} /afs/psi.ch/project/cafe/gitlab/CAFE/cpp/missing --run tar
-AM_CPPFLAGS =  -fexceptions -fPIC -std=c++1z -I/usr/local/epics/base/include/ -I/usr/local/epics/base/include/os/Linux -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_CPPFLAGS =  -fexceptions -fPIC -std=c++1z -I/usr/local/epics/base/include/ -I/usr/local/epics/base/include/os/Linux -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.7/latest/include/qt  -I/opt/gfa/python-3.7/latest/include/qt/QtCore  -I/opt/gfa/python-3.7/latest/include/qt/QtXml -I$(top_srcdir)/include 
-AM_LDFLAGS =  -L/usr/local/epics/base/lib/SL6-x86_64 -Wl,-rpath,/usr/local/epics/base/lib/SL6-x86_64
+AM_LDFLAGS =  -L/usr/local/epics/base/lib/SL6-x86_64 -Wl,-rpath,/usr/local/epics/base/lib/SL6-x86_64 -L/opt/gfa/python-3.7/latest/lib   -Wl,-rpath,/opt/gfa/python-3.7/latest/lib 
 AR = ar
 AUTOCONF = ${SHELL} /afs/psi.ch/project/cafe/gitlab/CAFE/cpp/missing --run autoconf
 AUTOHEADER = ${SHELL} /afs/psi.ch/project/cafe/gitlab/CAFE/cpp/missing --run autoheader
@@ -142,7 +150,7 @@ CC = /opt/psi/Programming/gcc/6.3.0/bin/gcc
 CCDEPMODE = depmode=gcc3
 CFLAGS = -g -O2
 CPP = /opt/psi/Programming/gcc/6.3.0/bin/gcc -E
-CPPFLAGS =  -fexceptions -fPIC -std=c++1z -I/usr/local/epics/base/include/ -I/usr/local/epics/base/include/os/Linux -I/opt/gfa/cafe/boost/boost_1_61_0/include/boost -I/opt/gfa/cafe/boost/boost_1_61_0/include
+CPPFLAGS =  -fexceptions -fPIC -std=c++1z -I/usr/local/epics/base/include/ -I/usr/local/epics/base/include/os/Linux -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.7/latest/include/qt  -I/opt/gfa/python-3.7/latest/include/qt/QtCore  -I/opt/gfa/python-3.7/latest/include/qt/QtXml
 CXX = /opt/psi/Programming/gcc/6.3.0/bin/g++
 CXXCPP = /opt/psi/Programming/gcc/6.3.0/bin/g++ -E
 CXXDEPMODE = depmode=gcc3
@@ -166,9 +174,9 @@ INSTALL_PROGRAM = ${INSTALL}
 INSTALL_SCRIPT = ${INSTALL}
 INSTALL_STRIP_PROGRAM = $(install_sh) -c -s
 LD = /usr/bin/ld -m elf_x86_64
-LDFLAGS =  -L/usr/local/epics/base/lib/SL6-x86_64 -Wl,-rpath,/usr/local/epics/base/lib/SL6-x86_64
+LDFLAGS =  -L/usr/local/epics/base/lib/SL6-x86_64 -Wl,-rpath,/usr/local/epics/base/lib/SL6-x86_64 -L/opt/gfa/python-3.7/latest/lib   -Wl,-rpath,/opt/gfa/python-3.7/latest/lib 
 LIBOBJS = 
-LIBS = 
+LIBS = -lQt5Xml 
 LIBTOOL = $(SHELL) $(top_builddir)/libtool
 LIPO = 
 LN_S = ln -s
@@ -186,16 +194,16 @@ OTOOL64 =
 PACKAGE = cafe
 PACKAGE_BUGREPORT = Bug reports to: jan.chrin@psi.ch
 PACKAGE_NAME = CAFE
-PACKAGE_STRING = CAFE 1.12.5
+PACKAGE_STRING = CAFE 1.13.0
 PACKAGE_TARNAME = cafe
-PACKAGE_VERSION = 1.12.5
+PACKAGE_VERSION = 1.13.0
 PATH_SEPARATOR = :
 RANLIB = ranlib
 SED = /bin/sed
 SET_MAKE = 
 SHELL = /bin/sh
 STRIP = strip
-VERSION = 1.12.5
+VERSION = 1.13.0
 abs_builddir = /afs/psi.ch/project/cafe/gitlab/CAFE/cpp/src
 abs_srcdir = /afs/psi.ch/project/cafe/gitlab/CAFE/cpp/src
 abs_top_builddir = /afs/psi.ch/project/cafe/gitlab/CAFE/cpp
@@ -230,7 +238,7 @@ htmldir = ${docdir}
 includedir = ${prefix}/include
 infodir = ${datarootdir}/info
 install_sh = ${SHELL} /afs/psi.ch/project/cafe/gitlab/CAFE/cpp/install-sh
-libdir = /opt/gfa/cafe/cpp/cafe-noqt-1.12.5-gcc-6.3.0/lib
+libdir = /opt/gfa/cafe/cpp/cafe-1.13.0-gcc-6.3.0/lib/SL6-x86_64
 libexecdir = ${exec_prefix}/libexec
 localedir = ${datarootdir}/locale
 localstatedir = ${prefix}/var
@@ -238,7 +246,7 @@ mandir = ${datarootdir}/man
 mkdir_p = /bin/mkdir -p
 oldincludedir = /usr/include
 pdfdir = ${docdir}
-prefix = /opt/gfa/cafe/cpp/cafe-noqt-1.12.5-gcc-6.3.0
+prefix = /opt/gfa/cafe/cpp/cafe-1.13.0-gcc-6.3.0
 program_transform_name = s,x,x,
 psdir = ${docdir}
 sbindir = ${exec_prefix}/sbin
@@ -258,7 +266,7 @@ lib_LTLIBRARIES = libcafe.la
 #2nd: age
 #3rd: revision
 #1.9.1   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 13:4:12
+libcafe_la_LDFLAGS = -version-info 14:0:13
 libcafe_la_SOURCES = cafe.cpp cafeCache.cpp cafeGroup.cpp \
 	cafeVectors.cpp cafeXML.cpp callbackHandlerCreate.cpp \
 	callbackHandlerMonitor.cpp conduit.cpp connect.cpp \
@@ -267,7 +275,7 @@ libcafe_la_SOURCES = cafe.cpp cafeCache.cpp cafeGroup.cpp \
 	loadGroupXMLParser.cpp methodCallbacks.cpp helper.cpp \
 	policyHelper.cpp conduitGroup.cpp connectGroup.cpp \
 	transpose.cpp restorePVGroupXMLParser.cpp $(am__append_1) \
-	$(am__append_2)
+	$(am__append_2) $(am__append_3)
 all: all-am
 
 .SUFFIXES:
@@ -343,6 +351,7 @@ distclean-compile:
 	-rm -f *.tab.c
 
 include ./$(DEPDIR)/PyCafe.Plo
+include ./$(DEPDIR)/PyCafe_sf.Plo
 include ./$(DEPDIR)/bitshuffle.Plo
 include ./$(DEPDIR)/bitshuffle_core.Plo
 include ./$(DEPDIR)/cafe.Plo
@@ -434,6 +443,20 @@ iochain.lo: bitshuffle/iochain.c
 #	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) \
 #	$(LTCXXCOMPILE) -c -o $@ $<
 
+PyCafe_sf.lo: pycafe/PyCafe_sf.cpp
+	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT PyCafe_sf.lo -MD -MP -MF $(DEPDIR)/PyCafe_sf.Tpo -c -o PyCafe_sf.lo `test -f 'pycafe/PyCafe_sf.cpp' || echo '$(srcdir)/'`pycafe/PyCafe_sf.cpp
+	$(am__mv) $(DEPDIR)/PyCafe_sf.Tpo $(DEPDIR)/PyCafe_sf.Plo
+#	source='pycafe/PyCafe_sf.cpp' object='PyCafe_sf.lo' libtool=yes \
+#	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) \
+#	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o PyCafe_sf.lo `test -f 'pycafe/PyCafe_sf.cpp' || echo '$(srcdir)/'`pycafe/PyCafe_sf.cpp
+
+PyCafe.lo: pycafe/PyCafe.cpp
+	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT PyCafe.lo -MD -MP -MF $(DEPDIR)/PyCafe.Tpo -c -o PyCafe.lo `test -f 'pycafe/PyCafe.cpp' || echo '$(srcdir)/'`pycafe/PyCafe.cpp
+	$(am__mv) $(DEPDIR)/PyCafe.Tpo $(DEPDIR)/PyCafe.Plo
+#	source='pycafe/PyCafe.cpp' object='PyCafe.lo' libtool=yes \
+#	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) \
+#	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o PyCafe.lo `test -f 'pycafe/PyCafe.cpp' || echo '$(srcdir)/'`pycafe/PyCafe.cpp
+
 mostlyclean-libtool:
 	-rm -f *.lo
 

src/makefile.am

@@ -12,7 +12,7 @@ lib_LTLIBRARIES = libcafe.la
 #2nd: age
 #3rd: revision
 #1.9.1   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 13:4:12
+libcafe_la_LDFLAGS = -version-info 14:0:13
 
 libcafe_la_SOURCES = cafe.cpp cafeCache.cpp cafeGroup.cpp cafeVectors.cpp cafeXML.cpp \
 		callbackHandlerCreate.cpp callbackHandlerMonitor.cpp conduit.cpp connect.cpp connectCallbacks.cpp \
@@ -21,15 +21,22 @@ libcafe_la_SOURCES = cafe.cpp cafeCache.cpp cafeGroup.cpp cafeVectors.cpp cafeXM
 		conduitGroup.cpp connectGroup.cpp transpose.cpp restorePVGroupXMLParser.cpp
 
 
-if HAVE_PYCAFE_EXT_
+#if HAVE_PYCAFE_EXT_
-libcafe_la_SOURCES += PyCafe.cpp
+#libcafe_la_SOURCES += PyCafe.cpp
-endif
+#endif
 
 if HAVE_ZEROMQ_
 libcafe_la_SOURCES += zbsCafeService.cpp zbsDataHolders.cpp \
 		bitshuffle/bitshuffle_core.c bitshuffle/bitshuffle.c bitshuffle/iochain.c
+
+if HAVE_PYCAFE_EXT_
+libcafe_la_SOURCES += pycafe/PyCafe_sf.cpp
+endif
+else
+if HAVE_PYTHON_
+libcafe_la_SOURCES += pycafe/PyCafe.cpp
+endif
 endif
-##bitshuffle/bshuf_h5filter.c bitshuffle/bshuf_h5plugin.c  bitshuffle/lzf_h5plugin.c
 
 AM_CPPFLAGS = @AM_CPPFLAGS@ @CAFE_CPPFLAGS@
 AM_LDFLAGS= @AM_LDFLAGS@