From 5f74a469ebd9896a613b7d0b2d1d1831b40d7fde Mon Sep 17 00:00:00 2001 From: bergamaschi Date: Mon, 17 Dec 2012 15:47:36 +0000 Subject: [PATCH] svn version from svn works for text client git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@411 951219d9-93cf-4727-9268-0efd64621fa3 --- slsDetectorSoftware/Makefile | 2 +- .../branches/interfaces-to-f90/Makefile | 72 ---------------- slsDetectorSoftware/doxy.config | 86 ------------------- .../gotthardDetectorServer/svnInfoGotthard.h | 11 +++ .../svnInfoGotthardTmp.h | 11 +++ .../mythenDetectorServer/svnInfoMythen.h | 11 +++ .../mythenDetectorServer/svnInfoMythenTmp.h | 11 +++ .../slsDetector/slsDetector.cpp | 7 +- slsDetectorSoftware/slsDetector/svnInfoLib.h | 11 +++ .../slsDetector/svnInfoLibTmp.h | 11 +++ 10 files changed, 71 insertions(+), 162 deletions(-) delete mode 100644 slsDetectorSoftware/branches/interfaces-to-f90/Makefile delete mode 100644 slsDetectorSoftware/doxy.config create mode 100644 slsDetectorSoftware/gotthardDetectorServer/svnInfoGotthard.h create mode 100644 slsDetectorSoftware/gotthardDetectorServer/svnInfoGotthardTmp.h create mode 100644 slsDetectorSoftware/mythenDetectorServer/svnInfoMythen.h create mode 100644 slsDetectorSoftware/mythenDetectorServer/svnInfoMythenTmp.h create mode 100644 slsDetectorSoftware/slsDetector/svnInfoLib.h create mode 100644 slsDetectorSoftware/slsDetector/svnInfoLibTmp.h diff --git a/slsDetectorSoftware/Makefile b/slsDetectorSoftware/Makefile index 722b63a56..012d91723 100644 --- a/slsDetectorSoftware/Makefile +++ b/slsDetectorSoftware/Makefile @@ -15,7 +15,7 @@ SRC_CLNT= slsDetectorAnalysis/fileIO.cpp MySocketTCP/MySocketTCP.cpp usersFuncti OBJS = $(SRC_CLNT:.cpp=.o) -HEADERS = $(SRC_CLNT:.cpp=.h) commonFiles/sls_detector_defs.h slsDetectorAnalysis/detectorData.h slsDetector/slsDetectorBase.h multiSlsDetector/multiSlsDetectorCommand.h slsDetectorAnalysis/enCalLogClass.h slsDetectorAnalysis/angCalLogClass.h slsDetectorAnalysis/angleConversionConstant.h usersFunctions/angleFunction.h slsReceiverInterface/receiverInterface.h +HEADERS = $(SRC_CLNT:.cpp=.h) commonFiles/sls_detector_defs.h slsDetectorAnalysis/detectorData.h slsDetector/slsDetectorBase.h multiSlsDetector/multiSlsDetectorCommand.h slsDetectorAnalysis/enCalLogClass.h slsDetectorAnalysis/angCalLogClass.h slsDetectorAnalysis/angleConversionConstant.h usersFunctions/angleFunction.h slsReceiverInterface/receiverInterface.h slsDetector/svnInfoLib.h diff --git a/slsDetectorSoftware/branches/interfaces-to-f90/Makefile b/slsDetectorSoftware/branches/interfaces-to-f90/Makefile deleted file mode 100644 index d25b62725..000000000 --- a/slsDetectorSoftware/branches/interfaces-to-f90/Makefile +++ /dev/null @@ -1,72 +0,0 @@ -CFLAGS= -DC_ONLY -#FLAGS+= #-DVERBOSE -DVERYVERBOSE -DFLAGS= -DDACS_INT - -INCLUDES= -IcommonFiles -IslsDetector -IMySocketTCP -IusersFunctions -ImultiSlsDetector -IslsDetectorUtils -IslsDetectorCommand -IslsDetectorAnalysis - -#EPICSFLAGS=-D EPICS -I/usr/local/epics/base/include/ -I /usr/local/epics/base/include/os/Linux/ -L /usr/local/epics/base/lib/SL5-x86/ -Wl,-R/usr/local/epics/base/lib/SL5-x86 -lca -lCom -CC=g++ - - -SRC_CLNT= slsDetectorAnalysis/fileIO.cpp MySocketTCP/MySocketTCP.cpp usersFunctions/usersFunctions.cpp slsDetector/slsDetectorUtils.cpp slsDetector/slsDetectorCommand.cpp slsDetectorAnalysis/angularConversion.cpp slsDetectorAnalysis/energyConversion.cpp slsDetector/slsDetectorActions.cpp slsDetectorAnalysis/postProcessing.cpp slsDetector/slsDetector.cpp multiSlsDetector/multiSlsDetector.cpp - -OBJS = $(SRC_CLNT:.cpp=.o) - -HEADERS = $(SRC_CLNT:.cpp=.h) commonFiles/sls_detector_defs.h slsDetectorAnalysis/detectorData.h slsDetector/slsDetectorBase.h slsDetector/slsDetectorUsers.h multiSlsDetector/multiSlsDetectorCommand.h - - - -SRC_MYTHEN_SVC = mythenDetectorServer/server.c mythenDetectorServer/server_funcs.c mythenDetectorServer/communication_funcs.c mythenDetectorServer/firmware_funcs.c mythenDetectorServer/mcb_funcs.c mythenDetectorServer/trimming_funcs.c - -all: package $(SRC_CLNT) - echo "compiling all" - -doc: $(SRC_H) $(SRC_CLNT) - doxygen doxy.config - - - -mythenServer: $(SRC_MYTHEN_SVC) - $(CC) $(SRC_MYTHEN_SVC) $(CFLAGS) $(FLAGS) $(DFLAGS) $(INCLUDES) -ImythenDetectorServer -DVIRTUAL -lm -D MCB_FUNCS -DC_ONLY -DVERBOSE - mv a.out mythenServer - - -picassoServer: $(SRC_MYTHEN_SVC) - $(CC) $(SRC_MYTHEN_SVC) $(CFLAGS) $(FLAGS) $(DFLAGS) $(INCLUDES) -ImythenDetectorServer -D VIRTUAL -lm -DMCB_FUNCS -DPICASSOD -DC_ONLY - mv a.out picassoServer - - - - -%.o : %.cpp %.h - $(CXX) -Wall -o $@ -c $< $(INCLUDES) $(DFLAGS) $(FLAGS) $(EPICSFLAGS) - - -package: $(OBJS) - $(CXX) -shared -Wl,-soname,libSlsDetector.so -o libSlsDetector.so $(OBJS) -lc $(INCLUDES) $(DFLAGS) $(FLAGS) $(EPICSFLAGS) - ar rcs libSlsDetector.a $(OBJS) - -clean: - rm -rf libSlsDetector.a libSlsDetector.so core docs/* $(OBJS) - - -#------------------------------------------------------------------------------- -lib: package - - -# added install target, HBl -install_lib: lib - $(shell test -d $(DESTDIR) || mkdir -p $(DESTDIR)) - cp -P libSlsDetector.so $(DESTDIR) - -install_inc: - $(shell test -d $(DESTDIR) || mkdir -p $(DESTDIR)) - cp -P $(HEADERS) $(DESTDIR) - - -install_doc: doc - $(shell test -d $(DESTDIR) || mkdir -p $(DESTDIR)) - cp -Pr docs/* $(DESTDIR) - -dummy1: - echo dummy1 \ No newline at end of file diff --git a/slsDetectorSoftware/doxy.config b/slsDetectorSoftware/doxy.config deleted file mode 100644 index f2ee6d752..000000000 --- a/slsDetectorSoftware/doxy.config +++ /dev/null @@ -1,86 +0,0 @@ -# If the EXTRACT_ALL tag is set to YES doxygen will assume all entities in -# documentation are documented, even if no documentation was available. -# Private class members and static file members will be hidden unless -# the EXTRACT_PRIVATE and EXTRACT_STATIC tags are set to YES - -EXTRACT_ALL = YES - -# If the EXTRACT_PRIVATE tag is set to YES all private members of a class -# will be included in the documentation. - -EXTRACT_PRIVATE = NO - - - -# If the EXTRACT_STATIC tag is set to YES all static members of a file -# will be included in the documentation. - -EXTRACT_STATIC = YES - -# If the EXTRACT_LOCAL_CLASSES tag is set to YES classes (and structs) -# defined locally in source files will be included in the documentation. -# If set to NO only classes defined in header files are included. - -EXTRACT_LOCAL_CLASSES = YES - -# This flag is only useful for Objective-C code. When set to YES local -# methods, which are defined in the implementation section but not in -# the interface are included in the documentation. -# If set to NO (the default) only methods in the interface are included. - -EXTRACT_LOCAL_METHODS = YES - -# If this flag is set to YES, the members of anonymous namespaces will be -# extracted and appear in the documentation as a namespace called -# 'anonymous_namespace{file}', where file will be replaced with the base -# name of the file that contains the anonymous namespace. By default -# anonymous namespace are hidden. - -EXTRACT_ANON_NSPACES = NO - -# If the HIDE_UNDOC_MEMBERS tag is set to YES, Doxygen will hide all -# undocumented members of documented classes, files or namespaces. -# If set to NO (the default) these members will be included in the -# various overviews, but no documentation section is generated. -# This option has no effect if EXTRACT_ALL is enabled. - -HIDE_UNDOC_MEMBERS = NO - -# If the HIDE_UNDOC_CLASSES tag is set to YES, Doxygen will hide all -# undocumented classes that are normally visible in the class hierarchy. -# If set to NO (the default) these classes will be included in the various -# overviews. This option has no effect if EXTRACT_ALL is enabled. - -HIDE_UNDOC_CLASSES = NO - -# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, Doxygen will hide all -# friend (class|struct|union) declarations. -# If set to NO (the default) these declarations will be included in the -# documentation. - -HIDE_FRIEND_COMPOUNDS = NO - -INTERNAL_DOCS = NO - -SHOW_INCLUDE_FILES = NO - -SHOW_FILES = NO - -SHOW_NAMESPACES = NO - -COMPACT_LATEX = YES - -PAPER_TYPE = a4 - -PDF_HYPERLINKS = YES - -USE_PDFLATEX = YES - -LATEX_HIDE_INDICES = YES - -PREDEFINED = __cplusplus - -INPUT = slsDetector/slsDetectorUsers.h slsDetector/slsDetectorBase.h commonFiles/sls_detector_defs.h slsDetector/slsDetector.h MySocketTCP/MySocketTCP.h usersFunctions/usersFunctions.h multiSlsDetector/multiSlsDetector.h commonFiles/sls_detector_defs.h slsDetector/slsDetectorUtils.h slsDetector/slsDetectorBase.h slsDetector/slsDetectorCommand.h slsDetector/slsDetectorActions.h multiSlsDetector/multiSlsDetector.h slsDetectorAnalysis/detectorData.h slsDetectorAnalysis/energyConversion.h slsDetectorAnalysis/postProcessing.h slsDetectorAnalysis/angularConversion.h slsDetectorAnalysis/fileIO.h multiSlsDetector/multiSlsDetectorClient.h multiSlsDetector/multiSlsDetectorCommand.h slsDetectorAnalysis/angularConversionStatic.h slsDetectorAnalysis/angleConversionConstant.h slsDetectorAnalysis/enCalLogClass.h slsDetectorAnalysis/angCalLogClass.h slsDetectorAnalysis/badChannelCorrections.h slsDetectorAnalysis/fileIOStatic.h slsReceiverInterface/receiverInterface.h slsReceiver/slsReceiver_funcs.h slsReceiver/slsReceiverFunctionList.h slsReceiver/receiver_defs.h - -OUTPUT_DIRECTORY = docs - diff --git a/slsDetectorSoftware/gotthardDetectorServer/svnInfoGotthard.h b/slsDetectorSoftware/gotthardDetectorServer/svnInfoGotthard.h new file mode 100644 index 000000000..8e7492a6b --- /dev/null +++ b/slsDetectorSoftware/gotthardDetectorServer/svnInfoGotthard.h @@ -0,0 +1,11 @@ +//#define SVNPATH "" +#define SVNURL "file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware/gotthardDetectorServer" +//#define SVNREPPATH "" +#define SVNREPUUID "951219d9-93cf-4727-9268-0efd64621fa3" +//#define SVNREV 0x374 +//#define SVNKIND "" +//#define SVNSCHED "" +#define SVNAUTH "l_maliakal_d" +#define SVNREV 0x374 +#define SVNDATE 0x20121210 +// diff --git a/slsDetectorSoftware/gotthardDetectorServer/svnInfoGotthardTmp.h b/slsDetectorSoftware/gotthardDetectorServer/svnInfoGotthardTmp.h new file mode 100644 index 000000000..58e48f497 --- /dev/null +++ b/slsDetectorSoftware/gotthardDetectorServer/svnInfoGotthardTmp.h @@ -0,0 +1,11 @@ +//#define SVNPATH "" +#define SVNURL "" +//#define SVNREPPATH "" +#define SVNREPUUID "" +//#define SVNREV "" +//#define SVNKIND "" +//#define SVNSCHED "" +#define SVNAUTH "" +#define SVNREV "" +#define SVNDATE "" +// diff --git a/slsDetectorSoftware/mythenDetectorServer/svnInfoMythen.h b/slsDetectorSoftware/mythenDetectorServer/svnInfoMythen.h new file mode 100644 index 000000000..20202fe66 --- /dev/null +++ b/slsDetectorSoftware/mythenDetectorServer/svnInfoMythen.h @@ -0,0 +1,11 @@ +//#define SVNPATH "" +#define MYTHENSVNURL "file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware/mythenDetectorServer" +//#define SVNREPPATH "" +#define MYTHENSVNREPUUID "951219d9-93cf-4727-9268-0efd64621fa3" +//#define SVNREV 0x380 +//#define SVNKIND "" +//#define SVNSCHED "" +#define MYTHENSVNAUTH "bergamaschi" +#define MYTHENSVNREV 0x380 +#define MYTHENSVNDATE 0x20121213 +// diff --git a/slsDetectorSoftware/mythenDetectorServer/svnInfoMythenTmp.h b/slsDetectorSoftware/mythenDetectorServer/svnInfoMythenTmp.h new file mode 100644 index 000000000..7822cb97c --- /dev/null +++ b/slsDetectorSoftware/mythenDetectorServer/svnInfoMythenTmp.h @@ -0,0 +1,11 @@ +//#define SVNPATH "" +#define MYTHENSVNURL "" +//#define SVNREPPATH "" +#define MYTHENSVNREPUUID "" +//#define SVNREV "" +//#define SVNKIND "" +//#define SVNSCHED "" +#define MYTHENSVNAUTH "" +#define MYTHENSVNREV "" +#define MYTHENSVNDATE "" +// diff --git a/slsDetectorSoftware/slsDetector/slsDetector.cpp b/slsDetectorSoftware/slsDetector/slsDetector.cpp index 83de1942f..b78236bc4 100644 --- a/slsDetectorSoftware/slsDetector/slsDetector.cpp +++ b/slsDetectorSoftware/slsDetector/slsDetector.cpp @@ -8,7 +8,7 @@ #include #include #include -#include "svnInfo.h" +#include "svnInfoLib.h" int slsDetector::initSharedMemory(detectorType type, int id) { @@ -1588,8 +1588,9 @@ int64_t slsDetector::getId( idMode mode, int imod){ #endif if (mode==THIS_SOFTWARE_VERSION) { ret=OK; - svnInfo* s = new svnInfo(THIS_PATH); - retval=(thisSoftwareVersion<<32) | (s->getRevision()); + // svnInfo* s = new svnInfo(THIS_PATH); + retval=SVNREVLIB; + retval=(retval<<32) | SVNDATELIB; } else { if (thisDetector->onlineFlag==ONLINE_FLAG) { if (controlSocket) { diff --git a/slsDetectorSoftware/slsDetector/svnInfoLib.h b/slsDetectorSoftware/slsDetector/svnInfoLib.h new file mode 100644 index 000000000..acdb1ed38 --- /dev/null +++ b/slsDetectorSoftware/slsDetector/svnInfoLib.h @@ -0,0 +1,11 @@ +//#define SVNPATH "" +#define SVNURLLIB "file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware" +//#define SVNREPPATH "" +#define SVNREPUUIDLIB "951219d9-93cf-4727-9268-0efd64621fa3" +//#define SVNREV 0x410 +//#define SVNKIND "" +//#define SVNSCHED "" +#define SVNAUTHLIB "l_maliakal_d" +#define SVNREVLIB 0x410 +#define SVNDATELIB 0x20121217 +// diff --git a/slsDetectorSoftware/slsDetector/svnInfoLibTmp.h b/slsDetectorSoftware/slsDetector/svnInfoLibTmp.h new file mode 100644 index 000000000..3038b204a --- /dev/null +++ b/slsDetectorSoftware/slsDetector/svnInfoLibTmp.h @@ -0,0 +1,11 @@ +//#define SVNPATH "" +#define SVNURLLIB "/root/" +//#define SVNREPPATH "" +#define SVNREPUUIDLIB "00000-00000-00000" +//#define SVNREV "" +//#define SVNKIND "" +//#define SVNSCHED "" +#define SVNAUTHLIB "nobody" +#define SVNREVLIB 0 +#define SVNDATELIB 20000101 +//