changes from Nov. 2023
This commit is contained in:
+16
-16
@@ -5,10 +5,10 @@
|
||||
#define EPICS_MAJOR 7
|
||||
|
||||
/* epics minor release */
|
||||
#define EPICS_MINOR 4
|
||||
#define EPICS_MINOR 0
|
||||
|
||||
/* epics patch release */
|
||||
#define EPICS_PATCH 1
|
||||
#define EPICS_PATCH 7
|
||||
|
||||
/* Availability of boost */
|
||||
#define HAVE_BOOST 1
|
||||
@@ -29,7 +29,7 @@
|
||||
#define HAVE_DLFCN_H 1
|
||||
|
||||
/* epics version */
|
||||
#define HAVE_EPICS 7.4.1
|
||||
#define HAVE_EPICS 7.0.7
|
||||
|
||||
/* Define to 1 if you have the <epicsTypes.h> header file. */
|
||||
#define HAVE_EPICSTYPES_H 1
|
||||
@@ -57,7 +57,7 @@
|
||||
/* #undef HAVE_LIBLZ4 */
|
||||
|
||||
/* Define to 1 if you have the `python3.10' library (-lpython3.10). */
|
||||
/* #undef HAVE_LIBPYTHON3_10 */
|
||||
#define HAVE_LIBPYTHON3_10 1
|
||||
|
||||
/* Define to 1 if you have the `python3.4m' library (-lpython3.4m). */
|
||||
/* #undef HAVE_LIBPYTHON3_4M */
|
||||
@@ -72,16 +72,16 @@
|
||||
/* #undef HAVE_LIBPYTHON3_8 */
|
||||
|
||||
/* Define to 1 if you have the `Qt5Core' library (-lQt5Core). */
|
||||
#define HAVE_LIBQT5CORE 1
|
||||
/* #undef HAVE_LIBQT5CORE */
|
||||
|
||||
/* Define to 1 if you have the `Qt5Xml' library (-lQt5Xml). */
|
||||
#define HAVE_LIBQT5XML 1
|
||||
/* #undef HAVE_LIBQT5XML */
|
||||
|
||||
/* Define to 1 if you have the `QtCore' library (-lQtCore). */
|
||||
/* #undef HAVE_LIBQTCORE */
|
||||
|
||||
/* Availability of Qt version 5 confirmed */
|
||||
#define HAVE_LIBQTXML 1
|
||||
/* #undef HAVE_LIBQTXML */
|
||||
|
||||
/* Define to 1 if you have the `zmq' library (-lzmq). */
|
||||
/* #undef HAVE_LIBZMQ */
|
||||
@@ -102,19 +102,19 @@
|
||||
#define HAVE_MULTI_INDEX_CONTAINER_HPP 1
|
||||
|
||||
/* pycafe extern C */
|
||||
/* #undef HAVE_PYCAFE_EXT */
|
||||
#define HAVE_PYCAFE_EXT 1
|
||||
|
||||
/* Availability of python */
|
||||
/* #undef HAVE_PYTHON */
|
||||
#define HAVE_PYTHON 1
|
||||
|
||||
/* Define to 1 if you have the <Python.h> header file. */
|
||||
/* #undef HAVE_PYTHON_H */
|
||||
#define HAVE_PYTHON_H 1
|
||||
|
||||
/* Availability of Qt version 5 confirmed */
|
||||
#define HAVE_QT 1
|
||||
/* #undef HAVE_QT */
|
||||
|
||||
/* Define to 1 if you have the <qxml.h> header file. */
|
||||
#define HAVE_QXML_H 1
|
||||
/* #undef HAVE_QXML_H */
|
||||
|
||||
/* Define to 1 if you have the <stdint.h> header file. */
|
||||
#define HAVE_STDINT_H 1
|
||||
@@ -156,7 +156,7 @@
|
||||
#define PACKAGE_NAME "CAFE"
|
||||
|
||||
/* Define to the full name and version of this package. */
|
||||
#define PACKAGE_STRING "CAFE 1.19.1"
|
||||
#define PACKAGE_STRING "CAFE 1.19.3"
|
||||
|
||||
/* Define to the one symbol short name of this package. */
|
||||
#define PACKAGE_TARNAME "cafe"
|
||||
@@ -165,13 +165,13 @@
|
||||
#define PACKAGE_URL ""
|
||||
|
||||
/* Define to the version of this package. */
|
||||
#define PACKAGE_VERSION "1.19.1"
|
||||
#define PACKAGE_VERSION "1.19.3"
|
||||
|
||||
/* Availability of Qt version 5 confirmed */
|
||||
#define QT_NO_VERSION_TAGGING 1
|
||||
/* #undef QT_NO_VERSION_TAGGING */
|
||||
|
||||
/* Define to 1 if you have the ANSI C header files. */
|
||||
#define STDC_HEADERS 1
|
||||
|
||||
/* Version number of package */
|
||||
#define VERSION "1.19.1"
|
||||
#define VERSION "1.19.3"
|
||||
|
||||
+3
-5
@@ -33,6 +33,8 @@
|
||||
#endif
|
||||
|
||||
#include <epicsVersion.h>
|
||||
//include <epicsMutex.h>
|
||||
|
||||
|
||||
class Connect
|
||||
{
|
||||
@@ -44,16 +46,12 @@ protected:
|
||||
CAFEGlobalAlarmSeverity epicsAlarmSeverity;
|
||||
CAFEGlobalAlarmCondition epicsAlarmStatus;
|
||||
|
||||
|
||||
cafeConduit_set::iterator itcs;
|
||||
cafeGroup_set::iterator itgs;
|
||||
|
||||
CAFEDataTypeCode cafeDataTypeCode;
|
||||
|
||||
ExceptionsHelper exceptionsHelper;
|
||||
|
||||
|
||||
|
||||
PolicyHelper policyHelper;
|
||||
HandleHelper handleHelper;
|
||||
Helper helper;
|
||||
@@ -65,7 +63,7 @@ protected:
|
||||
//connectCallbacks.cc
|
||||
static void callbackHandlerAccessRights(struct access_rights_handler_args args);
|
||||
|
||||
static void callbackHandlerException (struct exception_handler_args args);
|
||||
static void callbackHandlerException (struct exception_handler_args args);
|
||||
|
||||
//connect.cpp
|
||||
//int createHandle(const char * pv, ca_client_context * ccc, ChannelRequestPolicy channelRequestPolicyPut, unsigned int &handle)
|
||||
|
||||
@@ -9,6 +9,7 @@
|
||||
|
||||
#ifndef GLOBAL_H
|
||||
#define GLOBAL_H
|
||||
#include <epicsTime.h>
|
||||
#include <epicsMutex.h>
|
||||
#include <cadef.h>
|
||||
#include <hashConduit.h>
|
||||
|
||||
+2
-1
@@ -14,6 +14,7 @@
|
||||
//include <policyHelper.h>
|
||||
|
||||
//extern cafeConduit_set cs;
|
||||
#include <epicsMutex.h>
|
||||
|
||||
template <class CTYPE> class Instant
|
||||
{
|
||||
@@ -27,7 +28,7 @@ private:
|
||||
Transpose<dbr_long_t> renderLong; // 5
|
||||
Transpose<dbr_double_t> renderDouble; // 6
|
||||
|
||||
CAFEStatus cafeStatus;
|
||||
CAFEStatus cafeStatus;
|
||||
Granules cafeGranules;
|
||||
|
||||
PolicyHelper policyHelper;
|
||||
|
||||
+49
-34
@@ -1,7 +1,7 @@
|
||||
# makefile.in generated by automake 1.13.4 from makefile.am.
|
||||
# makefile.in generated by automake 1.16.1 from makefile.am.
|
||||
# include/makefile. Generated from makefile.in by configure.
|
||||
|
||||
# Copyright (C) 1994-2013 Free Software Foundation, Inc.
|
||||
# Copyright (C) 1994-2018 Free Software Foundation, Inc.
|
||||
|
||||
# This Makefile.in is free software; the Free Software Foundation
|
||||
# gives unlimited permission to copy and/or distribute it,
|
||||
@@ -15,7 +15,17 @@
|
||||
|
||||
|
||||
|
||||
am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
|
||||
am__is_gnu_make = { \
|
||||
if test -z '$(MAKELEVEL)'; then \
|
||||
false; \
|
||||
elif test -n '$(MAKE_HOST)'; then \
|
||||
true; \
|
||||
elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
|
||||
true; \
|
||||
else \
|
||||
false; \
|
||||
fi; \
|
||||
}
|
||||
am__make_running_with_option = \
|
||||
case $${target_option-} in \
|
||||
?) ;; \
|
||||
@@ -76,8 +86,8 @@ POST_INSTALL = :
|
||||
NORMAL_UNINSTALL = :
|
||||
PRE_UNINSTALL = :
|
||||
POST_UNINSTALL = :
|
||||
build_triplet = x86_64-unknown-linux-gnu
|
||||
host_triplet = x86_64-unknown-linux-gnu
|
||||
build_triplet = x86_64-pc-linux-gnu
|
||||
host_triplet = x86_64-pc-linux-gnu
|
||||
#am__append_1 = zbsread.h zbsHash.h zbsdtHelper.h zbsDataHolders.h \
|
||||
# bitshuffle/bitshuffle_core.h bitshuffle/bitshuffle.h bitshuffle/iochain.h \
|
||||
# bitshuffle/bitshuffle_internals.h
|
||||
@@ -86,11 +96,9 @@ host_triplet = x86_64-unknown-linux-gnu
|
||||
#if HAVE_PYTHON_
|
||||
#include_HEADERS += PyCafe_api.h
|
||||
#endif
|
||||
#am__append_2 = PyCafe.h
|
||||
am__append_3 = PyCafe_api.h
|
||||
am__append_2 = PyCafe.h
|
||||
#am__append_3 = PyCafe_api.h
|
||||
subdir = include
|
||||
DIST_COMMON = $(srcdir)/makefile.in $(srcdir)/makefile.am \
|
||||
$(am__include_HEADERS_DIST)
|
||||
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
|
||||
am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
|
||||
$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
|
||||
@@ -98,6 +106,8 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
|
||||
$(top_srcdir)/configure.ac
|
||||
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
|
||||
$(ACLOCAL_M4)
|
||||
DIST_COMMON = $(srcdir)/makefile.am $(am__include_HEADERS_DIST) \
|
||||
$(am__DIST_COMMON)
|
||||
mkinstalldirs = $(install_sh) -d
|
||||
CONFIG_HEADER = $(top_builddir)/./include/config.h
|
||||
CONFIG_CLEAN_FILES =
|
||||
@@ -185,25 +195,26 @@ am__define_uniq_tagged_files = \
|
||||
done | $(am__uniquify_input)`
|
||||
ETAGS = etags
|
||||
CTAGS = ctags
|
||||
am__DIST_COMMON = $(srcdir)/makefile.in
|
||||
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
|
||||
ACLOCAL = ${SHELL} /afs/psi.ch/project/cafe/gitlab/CAFE/cpp/missing aclocal-1.13
|
||||
ACLOCAL = ${SHELL} /afs/psi.ch/project/cafe/gitlab/CAFE/cpp/missing aclocal-1.16
|
||||
AMTAR = $${TAR-tar}
|
||||
AM_CPPFLAGS = -fexceptions -fPIC -std=c++1z -I/usr/local/epics/base-7.0.6/include/ -I/usr/local/epics/base-7.0.6/include/os/Linux -I/usr/local/epics/base-7.0.6/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.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_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_DEFAULT_VERBOSITY = 1
|
||||
AM_LDFLAGS = -L/usr/local/epics/base-7.0.6/lib/RHEL7-x86_64 -Wl,-rpath,/usr/local/epics/base-7.0.6/lib/RHEL7-x86_64 -L/opt/gfa/python-3.7/latest/lib -Wl,-rpath,/opt/gfa/python-3.7/latest/lib
|
||||
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
|
||||
AR = ar
|
||||
AUTOCONF = ${SHELL} /afs/psi.ch/project/cafe/gitlab/CAFE/cpp/missing autoconf
|
||||
AUTOHEADER = ${SHELL} /afs/psi.ch/project/cafe/gitlab/CAFE/cpp/missing autoheader
|
||||
AUTOMAKE = ${SHELL} /afs/psi.ch/project/cafe/gitlab/CAFE/cpp/missing automake-1.13
|
||||
AUTOMAKE = ${SHELL} /afs/psi.ch/project/cafe/gitlab/CAFE/cpp/missing automake-1.16
|
||||
AWK = gawk
|
||||
CAFE_CPPFLAGS = -I$(top_srcdir)/include
|
||||
CC = /opt/psi/Programming/gcc/7.3.0/bin/gcc
|
||||
CC = /opt/psi/Programming/gcc/7.5.0/bin/gcc
|
||||
CCDEPMODE = depmode=gcc3
|
||||
CFLAGS = -g -O2
|
||||
CPP = /opt/psi/Programming/gcc/7.3.0/bin/gcc -E
|
||||
CPPFLAGS = -fexceptions -fPIC -std=c++1z -I/usr/local/epics/base-7.0.6/include/ -I/usr/local/epics/base-7.0.6/include/os/Linux -I/usr/local/epics/base-7.0.6/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.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/7.3.0/bin/g++
|
||||
CXXCPP = /opt/psi/Programming/gcc/7.3.0/bin/g++ -E
|
||||
CPP = /opt/psi/Programming/gcc/7.5.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
|
||||
CXX = /opt/psi/Programming/gcc/7.5.0/bin/g++
|
||||
CXXCPP = /opt/psi/Programming/gcc/7.5.0/bin/g++ -E
|
||||
CXXDEPMODE = depmode=gcc3
|
||||
CXXFLAGS = -g -O2
|
||||
CYGPATH_W = echo
|
||||
@@ -225,9 +236,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-7.0.6/lib/RHEL7-x86_64 -Wl,-rpath,/usr/local/epics/base-7.0.6/lib/RHEL7-x86_64 -L/opt/gfa/python-3.7/latest/lib -Wl,-rpath,/opt/gfa/python-3.7/latest/lib
|
||||
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
|
||||
LIBOBJS =
|
||||
LIBS = -lQt5Xml -lQt5Core
|
||||
LIBS = -lpython3.10
|
||||
LIBTOOL = $(SHELL) $(top_builddir)/libtool
|
||||
LIPO =
|
||||
LN_S = ln -s
|
||||
@@ -245,23 +256,23 @@ OTOOL64 =
|
||||
PACKAGE = cafe
|
||||
PACKAGE_BUGREPORT = Bug reports to: jan.chrin@psi.ch
|
||||
PACKAGE_NAME = CAFE
|
||||
PACKAGE_STRING = CAFE 1.19.1
|
||||
PACKAGE_STRING = CAFE 1.19.3
|
||||
PACKAGE_TARNAME = cafe
|
||||
PACKAGE_URL =
|
||||
PACKAGE_VERSION = 1.19.1
|
||||
PACKAGE_VERSION = 1.19.3
|
||||
PATH_SEPARATOR = :
|
||||
RANLIB = ranlib
|
||||
SED = /usr/bin/sed
|
||||
SET_MAKE =
|
||||
SHELL = /bin/sh
|
||||
STRIP = strip
|
||||
VERSION = 1.19.1
|
||||
VERSION = 1.19.3
|
||||
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
|
||||
abs_top_srcdir = /afs/psi.ch/project/cafe/gitlab/CAFE/cpp
|
||||
ac_ct_AR = ar
|
||||
ac_ct_CC = /opt/psi/Programming/gcc/7.3.0/bin/gcc
|
||||
ac_ct_CC = /opt/psi/Programming/gcc/7.5.0/bin/gcc
|
||||
ac_ct_CXX =
|
||||
ac_ct_DUMPBIN =
|
||||
am__include = include
|
||||
@@ -270,27 +281,27 @@ am__quote =
|
||||
am__tar = $${TAR-tar} chof - "$$tardir"
|
||||
am__untar = $${TAR-tar} xf -
|
||||
bindir = ${exec_prefix}/bin
|
||||
build = x86_64-unknown-linux-gnu
|
||||
build = x86_64-pc-linux-gnu
|
||||
build_alias =
|
||||
build_cpu = x86_64
|
||||
build_os = linux-gnu
|
||||
build_vendor = unknown
|
||||
build_vendor = pc
|
||||
builddir = .
|
||||
datadir = ${datarootdir}
|
||||
datarootdir = ${prefix}/share
|
||||
docdir = ${datarootdir}/doc/${PACKAGE_TARNAME}
|
||||
dvidir = ${docdir}
|
||||
exec_prefix = ${prefix}
|
||||
host = x86_64-unknown-linux-gnu
|
||||
host = x86_64-pc-linux-gnu
|
||||
host_alias =
|
||||
host_cpu = x86_64
|
||||
host_os = linux-gnu
|
||||
host_vendor = unknown
|
||||
host_vendor = pc
|
||||
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-1.19.1-gcc-7.3.0/lib/RHEL7-x86_64
|
||||
libdir = /opt/gfa/cafe/cpp/cafe-1.19.3-py310-gcc-7.5.0/lib/RHEL8-x86_64
|
||||
libexecdir = ${exec_prefix}/libexec
|
||||
localedir = ${datarootdir}/locale
|
||||
localstatedir = ${prefix}/var
|
||||
@@ -298,7 +309,7 @@ mandir = ${datarootdir}/man
|
||||
mkdir_p = $(MKDIR_P)
|
||||
oldincludedir = /usr/include
|
||||
pdfdir = ${docdir}
|
||||
prefix = /opt/gfa/cafe/cpp/cafe-1.19.1-gcc-7.3.0
|
||||
prefix = /opt/gfa/cafe/cpp/cafe-1.19.3-py310-gcc-7.5.0
|
||||
program_transform_name = s,x,x,
|
||||
psdir = ${docdir}
|
||||
sbindir = ${exec_prefix}/sbin
|
||||
@@ -337,14 +348,13 @@ $(srcdir)/makefile.in: $(srcdir)/makefile.am $(am__configure_deps)
|
||||
echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu include/makefile'; \
|
||||
$(am__cd) $(top_srcdir) && \
|
||||
$(AUTOMAKE) --gnu include/makefile
|
||||
.PRECIOUS: makefile
|
||||
makefile: $(srcdir)/makefile.in $(top_builddir)/config.status
|
||||
@case '$?' in \
|
||||
*config.status*) \
|
||||
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
|
||||
*) \
|
||||
echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
|
||||
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
|
||||
echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
|
||||
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
|
||||
esac;
|
||||
|
||||
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
|
||||
@@ -435,7 +445,10 @@ cscopelist-am: $(am__tagged_files)
|
||||
distclean-tags:
|
||||
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
|
||||
|
||||
distdir: $(DISTFILES)
|
||||
distdir: $(BUILT_SOURCES)
|
||||
$(MAKE) $(AM_MAKEFLAGS) distdir-am
|
||||
|
||||
distdir-am: $(DISTFILES)
|
||||
@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
|
||||
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
|
||||
list='$(DISTFILES)'; \
|
||||
@@ -584,6 +597,8 @@ uninstall-am: uninstall-includeHEADERS
|
||||
ps ps-am tags tags-am uninstall uninstall-am \
|
||||
uninstall-includeHEADERS
|
||||
|
||||
.PRECIOUS: makefile
|
||||
|
||||
|
||||
# Tell versions [3.59,3.63) of GNU make to not export all variables.
|
||||
# Otherwise a system limit (for SysV at least) may be exceeded.
|
||||
|
||||
Reference in New Issue
Block a user