diff --git a/Makefile b/Makefile index 773fa5282..fefe215ee 100755 --- a/Makefile +++ b/Makefile @@ -24,9 +24,9 @@ MANAPIDIR = $(MANDIR)/manual-api TABSPACE := "\t" -INCLUDES=-I. -I$(WD)/commonFiles -I$(LIBRARYDIR)/slsDetector -I$(LIBRARYDIR)/usersFunctions -I$(LIBRARYDIR)/multiSlsDetector -I$(LIBRARYDIR)/slsReceiverInterface -I$(LIBRARYRXRDIR)/include -I$(LIBRARYDIR)/threadFiles -I$(LIBRARYDIR)/sharedMemory -I$(ASM) +INCLUDES=-I. -I$(WD)/slsSupportLib/include -I$(LIBRARYDIR)/slsDetector -I$(LIBRARYDIR)/usersFunctions -I$(LIBRARYDIR)/multiSlsDetector -I$(LIBRARYDIR)/slsReceiverInterface -I$(LIBRARYRXRDIR)/include -I$(LIBRARYDIR)/threadFiles -I$(LIBRARYDIR)/sharedMemory -I$(ASM) -INCLUDESRXR += -I. -I$(LIBRARYRXRDIR)/include -I$(WD)/commonFiles -I$(CALIBDIR) -I$(ASM) +INCLUDESRXR += -I. -I$(LIBRARYRXRDIR)/include -I$(WD)/slsSupportLib/include -I$(CALIBDIR) -I$(ASM) #LIBFLAGRXR += $(info ) diff --git a/README.md b/README.md deleted file mode 100644 index 51b764d82..000000000 --- a/README.md +++ /dev/null @@ -1,91 +0,0 @@ -### Documentation -Detailed documentation can be found on the [official site.](https://www.psi.ch/detectors/users-support) - -### Binaries -Documentation to obtain the binaries via the conda package is available for [lib](https://github.com/slsdetectorgroup/sls_detector_lib) and [gui](https://github.com/slsdetectorgroup/sls_detector_gui) - -### Source code -One can also obtain the source code from this repository and compile while realizing the setup dependencies as required. -``` -git clone https://github.com/slsdetectorgroup/slsDetectorPackage.git - -``` -#### Setup dependencies -* Gui Client
-Requirements: Qt 4.8 and Qwt 6.0 -``` - export QTDIR=/usr/local/Trolltech/ - export QWTDIR=/usr/local/qwt-6.0.1/ -``` -If either of them does not exist, the GUI client will not be built. - -* Advanced user Calibration wizards
-Requirements: ROOT -``` - export ROOTSYS=/usr/local/root-5.34 -``` - -#### Compilation - -Compiling can be done in two ways. - -**1. Compile using script cmk.sh**
- -After compiling, the libraries and executables will be found in `slsDetectorPackage/build/bin` directory
- -Usage: [-c] [-b] [-h] [-d HDF5 directory] [-j]
- * -[no option]: only make
- * -c: Clean
- * -b: Builds/Rebuilds CMake files normal mode
- * -h: Builds/Rebuilds Cmake files with HDF5 package
- * -d: HDF5 Custom Directory
- * -t: Build/Rebuilds only text client
- * -r: Build/Rebuilds only receiver
- * -g: Build/Rebuilds only gui
- * -j: Number of threads to compile through
- * -e: Debug mode - -Basic Option: -./cmk.sh -b - -For only make: -./cmk.sh - -For make clean;make: -./cmk.sh -c - -For using hdf5 without custom dir /blabla: -./cmk.sh -h -d /blabla - -For rebuilding cmake without hdf5 -./cmk.sh -b - -For using multiple cores to compile faster: -./cmk.sh -j9
- - -For rebuilding only certain sections
-./cmk.sh -tg #only text client and gui
-./cmk.sh -r #only receiver
- - -**2. Compile without script**
-Use cmake to create out-of-source builds, by creating a build folder parallel to source directory. -``` - $ cd .. - $ mkdir slsDetectorPackage-build - $ cd slsDetectorPackage-build - $ cmake ../slsDetectorPackage -DCMAKE_BUILD_TYPE=Debug -DUSE_HDF5=OFF - $ make -``` - -Use the following as an example to compile statically and using specific hdf5 folder -``` - $ HDF5_ROOT=/opt/hdf5v1.10.0 cmake ../slsDetectorPackage -DCMAKE_BUILD_TYPE=Debug -DUSE_HDF5=ON - ``` -After compiling, the libraries and executables will be found at `bin` directory -``` - $ ls bin/ - gui_client libSlsDetector.a libSlsDetector.so libSlsReceiver.a libSlsReceiver.so - sls_detector_acquire sls_detector_get slsDetectorGui sls_detector_help sls_detector_put slsReceiver slsMultiReceiver -``` diff --git a/manual/manual-api/CMakeLists.txt b/manual/manual-api/CMakeLists.txt index 00de96101..0fadc4bab 100644 --- a/manual/manual-api/CMakeLists.txt +++ b/manual/manual-api/CMakeLists.txt @@ -3,7 +3,7 @@ set(SOURCES ) include_directories( - ../../commonFiles/include + ../../slsSupportLib/include ../../slsDetectorSoftware/slsDetectorAnalysis ../../build/bin ../../slsdetectorSoftware/slsDetector diff --git a/manual/manual-api/Makefile b/manual/manual-api/Makefile index 55122f7a5..abd52fa5d 100644 --- a/manual/manual-api/Makefile +++ b/manual/manual-api/Makefile @@ -1,9 +1,9 @@ PKGDIR = ../.. LIBDIR = $(PKGDIR)/build/bin -INCLUDES = -I . -I$(PKGDIR)/commonFiles -I$(PKGDIR)/slsDetectorSoftware/slsDetectorAnalysis -I$(LIBDIR) -I$(PKGDIR)/slsDetectorSoftware/slsDetector +INCLUDES = -I . -I$(PKGDIR)/slsSupportLib/include -I$(PKGDIR)/slsDetectorSoftware/slsDetectorAnalysis -I$(LIBDIR) -I$(PKGDIR)/slsDetectorSoftware/slsDetector SRC_DET = mainClient.cpp SRC_REC = mainReceiver.cpp -ZMQLIBDIR = $(PKGDIR)/commonFiles +ZMQLIBDIR = $(PKGDIR)/slsSupportLib/include LDFLAG_DET = -I. -L$(LIBDIR) -Wl,-rpath=$(LIBDIR) -lSlsDetector -L/usr/lib64/ -pthread -lrt -L$(ZMQLIBDIR) -Wl,-rpath=$(ZMQLIBDIR) -lzmq LDFLAG_REC = -I. -L$(LIBDIR) -Wl,-rpath=$(LIBDIR) -lSlsReceiver -L/usr/lib64/ -pthread -lrt -L$(ZMQLIBDIR) -Wl,-rpath=$(ZMQLIBDIR) -lzmq DESTDIR ?= ../docs diff --git a/slsDetectorGui/CMakeLists.txt b/slsDetectorGui/CMakeLists.txt index a4b5abf5d..ef6e59880 100644 --- a/slsDetectorGui/CMakeLists.txt +++ b/slsDetectorGui/CMakeLists.txt @@ -75,7 +75,7 @@ qt4_add_resources(RESOURCES_SRCS ${RESOURCES}) include_directories( include slsDetectorPlotting/include - ../commonFiles + ../slsSupportLib/include ../slsDetectorSoftware/slsReceiverInterface ../slsDetectorSoftware/slsDetector ../slsDetectorSoftware/slsDetectorAnalysis diff --git a/slsDetectorGui/Makefile b/slsDetectorGui/Makefile index 71f330347..387e2d5d2 100644 --- a/slsDetectorGui/Makefile +++ b/slsDetectorGui/Makefile @@ -16,7 +16,7 @@ DOCDIR ?= docs LIBRARYDIR ?= ../slsDetectorSoftware LIBRARYRXRDIR ?= ../slsReceiverSoftware -INCLUDES ?= ../commonFiles -I$(LIBRARYRXRDIR)/MySocketTCP -I$(LIBRARYDIR)/slsReceiverInterface -I$(LIBRARYDIR)/slsDetector -I$(LIBRARYDIR)/slsDetectorAnalysis -I$(LIBRARYDIR)/multiSlsDetector -I$(LIBRARYDIR)/usersFunctions -I$(LIBRARYRXRDIR)/includes +INCLUDES ?= ../slsSupportLib/include -I$(LIBRARYRXRDIR)/MySocketTCP -I$(LIBRARYDIR)/slsReceiverInterface -I$(LIBRARYDIR)/slsDetector -I$(LIBRARYDIR)/slsDetectorAnalysis -I$(LIBRARYDIR)/multiSlsDetector -I$(LIBRARYDIR)/usersFunctions -I$(LIBRARYRXRDIR)/includes LDFLAGDET ?= -L$(LIBDIR) -Wl,-rpath=$(LIBDIR) -lSlsDetector diff --git a/slsDetectorGui/client/Makefile b/slsDetectorGui/client/Makefile index 2b74aba13..2ec55c328 100644 --- a/slsDetectorGui/client/Makefile +++ b/slsDetectorGui/client/Makefile @@ -5,9 +5,9 @@ LDLIBS += -lm -lstdc++ -pthread LDIR = ../../slsDetectorSoftware RDIR = ../../slsReceiverSoftware DDIR = ../../bin -INCLUDES = -I ../../commonFiles -I $(LDIR)/slsDetector -I ../include -I $(RDIR)/include +INCLUDES = -I ../../slsSupportLib/include -I $(LDIR)/slsDetector -I ../include -I $(RDIR)/include SRC_CLNT = qClient.cpp -DEPSINCLUDES= qClient.h $(RDIR)/include/MySocketTCP.h $(LDIR)/slsDetector/slsDetectorBase.h ../../commonFiles/sls_detector_defs.h +DEPSINCLUDES= qClient.h $(RDIR)/include/MySocketTCP.h $(LDIR)/slsDetector/slsDetectorBase.h ../../slsSupportLib/include/sls_detector_defs.h all: client diff --git a/slsDetectorGui/slsDetectorGui.pro b/slsDetectorGui/slsDetectorGui.pro index a814921d7..e286dde6b 100644 --- a/slsDetectorGui/slsDetectorGui.pro +++ b/slsDetectorGui/slsDetectorGui.pro @@ -145,7 +145,7 @@ HEADERS = \ include/qTabDeveloper.h\ include/qTabMessages.h\ include/gitInfoGui.h\ - ../commonFiles/sls_detector_defs.h\ + ../slsSupportLib/include/sls_detector_defs.h\ ../slsReceiverSoftware/include/sls_receiver_defs.h\ include/qServer.h diff --git a/slsDetectorSoftware/CMakeLists.txt b/slsDetectorSoftware/CMakeLists.txt index af71006d5..f145cfdb1 100644 --- a/slsDetectorSoftware/CMakeLists.txt +++ b/slsDetectorSoftware/CMakeLists.txt @@ -5,14 +5,14 @@ set(SOURCES slsDetector/slsDetectorCommand.cpp slsDetector/slsDetector.cpp slsReceiverInterface/receiverInterface.cpp - ../commonFiles/utilities.cpp + ../slsSupportLib/include/utilities.cpp ) set(HEADERS ) include_directories( -../commonFiles +../slsSupportLib/include multiSlsDetector sharedMemory slsDetector @@ -36,7 +36,7 @@ add_library(slsDetectorShared SHARED add_library(zmq STATIC IMPORTED GLOBAL) -set(ZMQ_STATIC_ARCHIVE ${CMAKE_CURRENT_SOURCE_DIR}/../commonFiles/libzmq.a) +set(ZMQ_STATIC_ARCHIVE ${CMAKE_CURRENT_SOURCE_DIR}/../slsSupportLib/include/libzmq.a) set_target_properties(zmq PROPERTIES IMPORTED_LOCATION ${ZMQ_STATIC_ARCHIVE} ) @@ -46,12 +46,12 @@ target_link_libraries(slsDetectorShared ) set(PUBLICHEADERS - ../commonFiles/sls_detector_defs.h - ../commonFiles/sls_detector_funcs.h - ../commonFiles/error_defs.h - ../commonFiles/versionAPI.h - ../commonFiles/sls_receiver_exceptions.h - ../commonFiles/utilties.h + ../slsSupportLib/include/sls_detector_defs.h + ../slsSupportLib/include/sls_detector_funcs.h + ../slsSupportLib/include/error_defs.h + ../slsSupportLib/include/versionAPI.h + ../slsSupportLib/include/sls_receiver_exceptions.h + ../slsSupportLib/include/utilties.h ../slsSupportLib/include/container_utils.h sharedMemory/SharedMemory.h slsDetector/slsDetector.h diff --git a/slsDetectorSoftware/Makefile b/slsDetectorSoftware/Makefile index 3fa02c3a8..3e21793aa 100644 --- a/slsDetectorSoftware/Makefile +++ b/slsDetectorSoftware/Makefile @@ -9,15 +9,15 @@ CFLAGS= -g -DC_ONLY -fPIC DFLAGS= -g -DDACS_INT -INCLUDES?= -I../commonFiles -IslsDetector -ImultiSlsDetector -IslsReceiverInterface -IsharedMemory -I ../slsSupportLib/include-I$(ASM) +INCLUDES?= -I../slsSupportLib/include -IslsDetector -ImultiSlsDetector -IslsReceiverInterface -IsharedMemory I$(ASM) #EPICSFLAGS=-D EPICS -I/usr/local/epics/base/include/ -I /usr/local/epics/base/include/os/Linux/ -L /usr/local/epics/base/lib/$(EPICS_HOST_ARCH) -Wl,-R/usr/local/epics/base/lib/$(EPICS_HOST_ARCH) -lca -lCom -LIBZMQDIR = ../commonFiles +LIBZMQDIR = ../slsSupportLib/include LIBZMQ = -L$(LIBZMQDIR) -Wl,-rpath=$(LIBZMQDIR) -lzmq -SRC_CLNT= slsDetector/slsDetectorCommand.cpp slsDetector/slsDetector.cpp multiSlsDetector/multiSlsDetector.cpp slsReceiverInterface/receiverInterface.cpp slsDetector/slsDetectorUsers.cpp sharedMemory/SharedMemory.cpp ../commonFiles/utilities.cpp -DEPSINCLUDES = ../commonFiles/sls_receiver_defs.h ../commonFiles/sls_receiver_funcs.h ../commonFiles/ansi.h ../commonFiles/sls_detector_defs.h ../commonFiles/sls_detector_funcs.h ../commonFiles/error_defs.h slsDetector/slsDetectorBase.h slsDetector/detectorData.h sharedMemory/SharedMemory.h ../commonFiles/sls_receiver_exceptions.h ../commonFiles/versionAPI.h ../commonFiles/utilities.h ../slsSupportLib/include/container_utils.h +SRC_CLNT= slsDetector/slsDetectorCommand.cpp slsDetector/slsDetector.cpp multiSlsDetector/multiSlsDetector.cpp slsReceiverInterface/receiverInterface.cpp slsDetector/slsDetectorUsers.cpp sharedMemory/SharedMemory.cpp ../slsSupportLib/include/utilities.cpp +DEPSINCLUDES = ../slsSupportLib/include/sls_receiver_defs.h ../slsSupportLib/include/sls_receiver_funcs.h ../slsSupportLib/include/ansi.h ../slsSupportLib/include/sls_detector_defs.h ../slsSupportLib/include/sls_detector_funcs.h ../slsSupportLib/include/error_defs.h slsDetector/slsDetectorBase.h slsDetector/detectorData.h sharedMemory/SharedMemory.h ../slsSupportLib/include/sls_receiver_exceptions.h ../slsSupportLib/include/versionAPI.h ../slsSupportLib/include/utilities.h ../slsSupportLib/include/container_utils.h diff --git a/slsDetectorSoftware/README b/slsDetectorSoftware/README deleted file mode 100644 index b1cfea7a7..000000000 --- a/slsDetectorSoftware/README +++ /dev/null @@ -1,19 +0,0 @@ -This subversion repository contains - -Common directories -Please inform Anna or Dhanya if you make modifications to these directories -- MySocketTCP : socket class -- commonFiles : header file common to server and client -- slsDetector : base class with all main detector functionalities (client side) - - -Mythen specific directories -Please inform Anna if you make modifications to these directories -- mythenDetector : mythen specific funcs (mainly files I/O and angular conversion) -- mythenDetectorServer : mythen server (for etrax compiler) -- firmware lib might be added in the future - -Other Detector specific directories -Please inform Dhanya if you make modifications to these directories - -make doc diff --git a/slsDetectorSoftware/doxy.config b/slsDetectorSoftware/doxy.config index b7546c379..cfe37d367 100644 --- a/slsDetectorSoftware/doxy.config +++ b/slsDetectorSoftware/doxy.config @@ -80,18 +80,18 @@ LATEX_HIDE_INDICES = YES PREDEFINED = __cplusplus -INPUT = ../commonfiles/communication_funcs.h \ - ../commonfiles/error_defs.h \ - ../commonfiles/sls_detector_defs.h \ - ../commonfiles/sls_detector_funcs.h \ - ../commonfiles/ansi.h \ - ../commonfiles/include/genericSocket.h \ - ../commonfiles/include/logger.h \ - ../commonfiles/include/MySocketTCP.h \ - ../commonfiles/include/sls_receiver_defs.h \ - ../commonfiles/include/sls_receiver_funcs.h \ - ../commonfiles/include/utilities.h \ - ../commonfiles/include/ZmqSocket.h \ +INPUT = ../slsSupportLib/include/communication_funcs.h \ + ../slsSupportLib/include/error_defs.h \ + ../slsSupportLib/include/sls_detector_defs.h \ + ../slsSupportLib/include/sls_detector_funcs.h \ + ../slsSupportLib/include/ansi.h \ + ../slsSupportLib/include/genericSocket.h \ + ../slsSupportLib/include/logger.h \ + ../slsSupportLib/include/MySocketTCP.h \ + ../slsSupportLib/include/sls_receiver_defs.h \ + ../slsSupportLib/include/sls_receiver_funcs.h \ + ../slsSupportLib/include/utilities.h \ + ../slsSupportLib/include/ZmqSocket.h \ multiSlsDetector/multiSlsDetectorClient.h \ multiSlsDetector/multiSlsDetectorCommand.h \ multiSlsDetector/multiSlsDetector.h \ diff --git a/slsDetectorSoftware/slsADCReader/Makefile b/slsDetectorSoftware/slsADCReader/Makefile deleted file mode 100644 index dbb0664d0..000000000 --- a/slsDetectorSoftware/slsADCReader/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -CC = g++ -#CC = bfin-uclinux- -SRC = slsADCReader.cpp -INCLUDES = -I ../../slsReceiverSoftware/include -I ../../commonFiles -CFLAGS = -Wall -lm -lstdc++ - - -all: clean slsADCReader - - -slsADCReader: $(SRC) - echo "creating adc reader" - $(CC) -o $@ $^ $(CFLAGS) $(INCLUDES) - - -clean: - echo "cleaning" - rm -rf *.o - - - diff --git a/slsDetectorSoftware/slsADCReader/slsADCReader b/slsDetectorSoftware/slsADCReader/slsADCReader deleted file mode 100755 index 3117fc8bf..000000000 Binary files a/slsDetectorSoftware/slsADCReader/slsADCReader and /dev/null differ diff --git a/slsDetectorSoftware/slsADCReader/slsADCReader.cpp b/slsDetectorSoftware/slsADCReader/slsADCReader.cpp deleted file mode 100644 index 8d9911dee..000000000 --- a/slsDetectorSoftware/slsADCReader/slsADCReader.cpp +++ /dev/null @@ -1,120 +0,0 @@ -#include "MySocketTCP.h" - -#include "sls_detector_defs.h" -#include "sls_receiver_defs.h" - -#include "sls_detector_funcs.h" - -#include -#include - -#define INVALID -999 - -enum detectorFunctions{ - F_GET_ADC=13 -}; - -void help() { - cerr << "Usage:\n" - "slsAdcReader [hostname] [adcval]" << endl; - exit(EXIT_FAILURE); -} - - -slsDetectorDefs::dacIndex getADCEnum(char* cval){ - int idac; - string cmd; - cmd.assign(cval); - - if (sscanf(cval,"adc:%d",&idac)==1) { - return (slsDetectorDefs::dacIndex)(idac+1000); - } else if (cmd=="temp_adc") - return slsDetectorDefs::TEMPERATURE_ADC; - else if (cmd=="temp_fpga") - return slsDetectorDefs::TEMPERATURE_FPGA; - else if (cmd=="temp_fpgaext") - return slsDetectorDefs::TEMPERATURE_FPGAEXT; - else if (cmd=="temp_10ge") - return slsDetectorDefs::TEMPERATURE_10GE; - else if (cmd=="temp_dcdc") - return slsDetectorDefs::TEMPERATURE_DCDC; - else if (cmd=="temp_sodl") - return slsDetectorDefs::TEMPERATURE_SODL; - else if (cmd=="temp_sodr") - return slsDetectorDefs::TEMPERATURE_SODR; - else if (cmd=="temp_fpgafl") - return slsDetectorDefs::TEMPERATURE_FPGA2; - else if (cmd=="temp_fpgafr") - return slsDetectorDefs::TEMPERATURE_FPGA3; - else if (cmd=="i_a") - return slsDetectorDefs::I_POWER_A; - else if (cmd=="i_b") - return slsDetectorDefs::I_POWER_B; - else if (cmd=="i_c") - return slsDetectorDefs::I_POWER_C; - else if (cmd=="i_d") - return slsDetectorDefs::I_POWER_D; - else if (cmd=="vm_a") - return slsDetectorDefs::V_POWER_A; - else if (cmd=="vm_b") - return slsDetectorDefs::V_POWER_B; - else if (cmd=="vm_c") - return slsDetectorDefs::V_POWER_C; - else if (cmd=="vm_d") - return slsDetectorDefs::V_POWER_D; - else if (cmd=="vm_io") - return slsDetectorDefs::V_POWER_IO; - else if (cmd=="i_io") - return slsDetectorDefs::I_POWER_IO; - else { - cerr << "cannot decode dac " << cmd << endl; - help(); - return slsDetectorDefs::I_POWER_IO; - } -}; - - - -int main(int argc, char* argv[]) -{ - if (argc < 3) - help(); - slsDetectorDefs::dacIndex idx=getADCEnum(argv[2]); - - - char mess[MAX_STR_LENGTH]=""; - detectorFunctions fnum=F_GET_ADC; - int retval=-1; - int ret=slsReceiverDefs::FAIL; - int arg[2]={idx,0}; - - MySocketTCP* mySocket = 0; - - try { - mySocket = new MySocketTCP(argv[1],1952); - } catch (...) { - cerr << "could not create socket with " << argv[1] << endl; - help(); - } - - if (mySocket->Connect()) { - mySocket->SendDataOnly(&fnum, sizeof(fnum)); - mySocket->SendDataOnly(arg,sizeof(arg)); - mySocket->ReceiveDataOnly(&ret, sizeof(ret)); - if (ret != slsReceiverDefs::FAIL) { - mySocket->ReceiveDataOnly(&retval, sizeof(retval)); - } else { - mySocket->ReceiveDataOnly(mess,sizeof(mess)); - printf("Detector returned Error: %s",mess); - } - mySocket->Disconnect(); - } else - cerr << "could not connect to " << argv[1] << endl; - - if (idx <= 100) { - printf("%.2f°C\n",(double)retval/1000.00); - }else - printf("%dmV\n",retval); - - return EXIT_SUCCESS; -} diff --git a/slsDetectorSoftware/slsDetectorClient/CMakeLists.txt b/slsDetectorSoftware/slsDetectorClient/CMakeLists.txt index 6e9de0de3..1355808d9 100644 --- a/slsDetectorSoftware/slsDetectorClient/CMakeLists.txt +++ b/slsDetectorSoftware/slsDetectorClient/CMakeLists.txt @@ -3,7 +3,7 @@ set(SOURCES ) include_directories( - ../../commonfiles + ../../slsSupportLib/include ../multiSlsDetector ../slsDetector ../slsReceiverInterface diff --git a/slsDetectorSoftware/slsDetectorClient/Makefile b/slsDetectorSoftware/slsDetectorClient/Makefile index b278fe3ad..333c55c96 100644 --- a/slsDetectorSoftware/slsDetectorClient/Makefile +++ b/slsDetectorSoftware/slsDetectorClient/Makefile @@ -4,7 +4,7 @@ CFLAGS= -DC_ONLY #FLAGS=-DVERBOSE #ASM=$(shell echo "/lib/modules/`uname -r`/build/include") -INCLUDES?= -I../../commonfiles -I../slsDetector -I../multiSlsDetector -I../slsReceiverInterface -I$(shell echo "/lib/modules/`uname -r`/build/include") +INCLUDES?= -I../../slsSupportLib/include -I../slsDetector -I../multiSlsDetector -I../slsReceiverInterface -I$(shell echo "/lib/modules/`uname -r`/build/include") DESTDIR ?= ../../bin BIN=$(DESTDIR) LIBS?= -L$(DESTDIR) -lSlsDetector diff --git a/slsDetectorSoftware/slsDetectorClient/Makefile.x04sa b/slsDetectorSoftware/slsDetectorClient/Makefile.x04sa index b5c95f9f6..bb800f7c1 100644 --- a/slsDetectorSoftware/slsDetectorClient/Makefile.x04sa +++ b/slsDetectorSoftware/slsDetectorClient/Makefile.x04sa @@ -1,6 +1,6 @@ CFLAGS= -DC_ONLY FLAGS=-DVERBOSE -INCLUDES= -I../commonFiles -I../slsDetectorSoftware/slsDetector -I ../slsDetectorSoftware/MySocketTCP -I../slsDetectorSoftware/usersFunctions -I../slsDetectorSoftware/multiSlsDetector -I../slsDetectorSoftware/slsDetectorAnalysis +INCLUDES= -I../slsSupportLib/include -I../slsDetectorSoftware/slsDetector -I ../slsDetectorSoftware/MySocketTCP -I../slsDetectorSoftware/usersFunctions -I../slsDetectorSoftware/multiSlsDetector -I../slsDetectorSoftware/slsDetectorAnalysis LIBS= -L../slsDetectorSoftware/ LDFLAG= -lSlsDetector -pthread diff --git a/slsReceiverSoftware/CMakeLists.txt b/slsReceiverSoftware/CMakeLists.txt index 07da638a5..23e82f4ee 100644 --- a/slsReceiverSoftware/CMakeLists.txt +++ b/slsReceiverSoftware/CMakeLists.txt @@ -13,7 +13,7 @@ set(SOURCES src/DataProcessor.cpp src/DataStreamer.cpp src/Fifo.cpp - ../commonFiles/utilities.cpp + ../slsSupportLib/include/utilities.cpp ) @@ -39,12 +39,12 @@ add_definitions( include_directories( include - ../commonFiles + ../slsSupportLib/include ) add_library(zmq STATIC IMPORTED GLOBAL) -set(ZMQ_STATIC_ARCHIVE ${CMAKE_CURRENT_SOURCE_DIR}/../commonFiles/libzmq.a) +set(ZMQ_STATIC_ARCHIVE ${CMAKE_CURRENT_SOURCE_DIR}/../slsSupportLib/include/libzmq.a) set_target_properties(zmq PROPERTIES IMPORTED_LOCATION ${ZMQ_STATIC_ARCHIVE} ) @@ -64,14 +64,14 @@ add_library(slsReceiverShared SHARED ) set(PUBLICHEADERS - ../commonFiles/sls_receiver_defs.h - ../commonFiles/ansi.h - ../commonFiles/sls_receiver_funcs.h - ../commonFiles/MySocketTCP.h - ../commonFiles/genericSocket.h - ../commonFiles/logger.h - ../commonFiles/sls_receiver_exceptions.h - ../commonFiles/utilities.h + ../slsSupportLib/include/sls_receiver_defs.h + ../slsSupportLib/include/ansi.h + ../slsSupportLib/include/sls_receiver_funcs.h + ../slsSupportLib/include/MySocketTCP.h + ../slsSupportLib/include/genericSocket.h + ../slsSupportLib/include/logger.h + ../slsSupportLib/include/sls_receiver_exceptions.h + ../slsSupportLib/include/utilities.h ) diff --git a/slsReceiverSoftware/Makefile b/slsReceiverSoftware/Makefile index 3f76c46c8..a0336e9c8 100644 --- a/slsReceiverSoftware/Makefile +++ b/slsReceiverSoftware/Makefile @@ -5,7 +5,7 @@ LIBDIR ?= ../bin DOCDIR ?= docs SRCDIR = src INCDIR = include -COMMONDIR = ../commonFiles +COMMONDIR = ../slsSupportLib/include TESTDIR = test BUILDDIR = build PROGS = $(DESTDIR)/slsReceiver @@ -21,7 +21,7 @@ INCLUDES?= $(INCLUDESRXR) -I $(INCDIR) -I $(COMMONDIR) ############################################################## # ZMQ specific: in this case, you need ZMQ libraries already included in this package ########################################################### -LIBZMQDIR = ../commonFiles +LIBZMQDIR = ../slsSupportLib/include LIBZMQ = -L$(LIBZMQDIR) -Wl,-rpath=$(LIBZMQDIR) -lzmq diff --git a/commonFiles/MySocketTCP.h b/slsSupportLib/include/MySocketTCP.h similarity index 100% rename from commonFiles/MySocketTCP.h rename to slsSupportLib/include/MySocketTCP.h diff --git a/commonFiles/ZmqSocket.h b/slsSupportLib/include/ZmqSocket.h similarity index 100% rename from commonFiles/ZmqSocket.h rename to slsSupportLib/include/ZmqSocket.h diff --git a/commonFiles/ansi.h b/slsSupportLib/include/ansi.h similarity index 100% rename from commonFiles/ansi.h rename to slsSupportLib/include/ansi.h diff --git a/commonFiles/communication_funcs.c b/slsSupportLib/include/communication_funcs.c similarity index 100% rename from commonFiles/communication_funcs.c rename to slsSupportLib/include/communication_funcs.c diff --git a/commonFiles/communication_funcs.h b/slsSupportLib/include/communication_funcs.h similarity index 100% rename from commonFiles/communication_funcs.h rename to slsSupportLib/include/communication_funcs.h diff --git a/commonFiles/error_defs.h b/slsSupportLib/include/error_defs.h similarity index 100% rename from commonFiles/error_defs.h rename to slsSupportLib/include/error_defs.h diff --git a/commonFiles/genericSocket.h b/slsSupportLib/include/genericSocket.h similarity index 100% rename from commonFiles/genericSocket.h rename to slsSupportLib/include/genericSocket.h diff --git a/commonFiles/libzmq.a b/slsSupportLib/include/libzmq.a similarity index 100% rename from commonFiles/libzmq.a rename to slsSupportLib/include/libzmq.a diff --git a/commonFiles/logger.h b/slsSupportLib/include/logger.h similarity index 100% rename from commonFiles/logger.h rename to slsSupportLib/include/logger.h diff --git a/commonFiles/rapidjson/allocators.h b/slsSupportLib/include/rapidjson/allocators.h similarity index 100% rename from commonFiles/rapidjson/allocators.h rename to slsSupportLib/include/rapidjson/allocators.h diff --git a/commonFiles/rapidjson/document.h b/slsSupportLib/include/rapidjson/document.h similarity index 100% rename from commonFiles/rapidjson/document.h rename to slsSupportLib/include/rapidjson/document.h diff --git a/commonFiles/rapidjson/encodedstream.h b/slsSupportLib/include/rapidjson/encodedstream.h similarity index 100% rename from commonFiles/rapidjson/encodedstream.h rename to slsSupportLib/include/rapidjson/encodedstream.h diff --git a/commonFiles/rapidjson/encodings.h b/slsSupportLib/include/rapidjson/encodings.h similarity index 100% rename from commonFiles/rapidjson/encodings.h rename to slsSupportLib/include/rapidjson/encodings.h diff --git a/commonFiles/rapidjson/error/en.h b/slsSupportLib/include/rapidjson/error/en.h similarity index 100% rename from commonFiles/rapidjson/error/en.h rename to slsSupportLib/include/rapidjson/error/en.h diff --git a/commonFiles/rapidjson/error/error.h b/slsSupportLib/include/rapidjson/error/error.h similarity index 100% rename from commonFiles/rapidjson/error/error.h rename to slsSupportLib/include/rapidjson/error/error.h diff --git a/commonFiles/rapidjson/filereadstream.h b/slsSupportLib/include/rapidjson/filereadstream.h similarity index 100% rename from commonFiles/rapidjson/filereadstream.h rename to slsSupportLib/include/rapidjson/filereadstream.h diff --git a/commonFiles/rapidjson/filewritestream.h b/slsSupportLib/include/rapidjson/filewritestream.h similarity index 100% rename from commonFiles/rapidjson/filewritestream.h rename to slsSupportLib/include/rapidjson/filewritestream.h diff --git a/commonFiles/rapidjson/fwd.h b/slsSupportLib/include/rapidjson/fwd.h similarity index 100% rename from commonFiles/rapidjson/fwd.h rename to slsSupportLib/include/rapidjson/fwd.h diff --git a/commonFiles/rapidjson/internal/biginteger.h b/slsSupportLib/include/rapidjson/internal/biginteger.h similarity index 100% rename from commonFiles/rapidjson/internal/biginteger.h rename to slsSupportLib/include/rapidjson/internal/biginteger.h diff --git a/commonFiles/rapidjson/internal/diyfp.h b/slsSupportLib/include/rapidjson/internal/diyfp.h similarity index 100% rename from commonFiles/rapidjson/internal/diyfp.h rename to slsSupportLib/include/rapidjson/internal/diyfp.h diff --git a/commonFiles/rapidjson/internal/dtoa.h b/slsSupportLib/include/rapidjson/internal/dtoa.h similarity index 100% rename from commonFiles/rapidjson/internal/dtoa.h rename to slsSupportLib/include/rapidjson/internal/dtoa.h diff --git a/commonFiles/rapidjson/internal/ieee754.h b/slsSupportLib/include/rapidjson/internal/ieee754.h similarity index 100% rename from commonFiles/rapidjson/internal/ieee754.h rename to slsSupportLib/include/rapidjson/internal/ieee754.h diff --git a/commonFiles/rapidjson/internal/itoa.h b/slsSupportLib/include/rapidjson/internal/itoa.h similarity index 100% rename from commonFiles/rapidjson/internal/itoa.h rename to slsSupportLib/include/rapidjson/internal/itoa.h diff --git a/commonFiles/rapidjson/internal/meta.h b/slsSupportLib/include/rapidjson/internal/meta.h similarity index 100% rename from commonFiles/rapidjson/internal/meta.h rename to slsSupportLib/include/rapidjson/internal/meta.h diff --git a/commonFiles/rapidjson/internal/pow10.h b/slsSupportLib/include/rapidjson/internal/pow10.h similarity index 100% rename from commonFiles/rapidjson/internal/pow10.h rename to slsSupportLib/include/rapidjson/internal/pow10.h diff --git a/commonFiles/rapidjson/internal/regex.h b/slsSupportLib/include/rapidjson/internal/regex.h similarity index 100% rename from commonFiles/rapidjson/internal/regex.h rename to slsSupportLib/include/rapidjson/internal/regex.h diff --git a/commonFiles/rapidjson/internal/stack.h b/slsSupportLib/include/rapidjson/internal/stack.h similarity index 100% rename from commonFiles/rapidjson/internal/stack.h rename to slsSupportLib/include/rapidjson/internal/stack.h diff --git a/commonFiles/rapidjson/internal/strfunc.h b/slsSupportLib/include/rapidjson/internal/strfunc.h similarity index 100% rename from commonFiles/rapidjson/internal/strfunc.h rename to slsSupportLib/include/rapidjson/internal/strfunc.h diff --git a/commonFiles/rapidjson/internal/strtod.h b/slsSupportLib/include/rapidjson/internal/strtod.h similarity index 100% rename from commonFiles/rapidjson/internal/strtod.h rename to slsSupportLib/include/rapidjson/internal/strtod.h diff --git a/commonFiles/rapidjson/internal/swap.h b/slsSupportLib/include/rapidjson/internal/swap.h similarity index 100% rename from commonFiles/rapidjson/internal/swap.h rename to slsSupportLib/include/rapidjson/internal/swap.h diff --git a/commonFiles/rapidjson/istreamwrapper.h b/slsSupportLib/include/rapidjson/istreamwrapper.h similarity index 100% rename from commonFiles/rapidjson/istreamwrapper.h rename to slsSupportLib/include/rapidjson/istreamwrapper.h diff --git a/commonFiles/rapidjson/memorybuffer.h b/slsSupportLib/include/rapidjson/memorybuffer.h similarity index 100% rename from commonFiles/rapidjson/memorybuffer.h rename to slsSupportLib/include/rapidjson/memorybuffer.h diff --git a/commonFiles/rapidjson/memorystream.h b/slsSupportLib/include/rapidjson/memorystream.h similarity index 100% rename from commonFiles/rapidjson/memorystream.h rename to slsSupportLib/include/rapidjson/memorystream.h diff --git a/commonFiles/rapidjson/msinttypes/inttypes.h b/slsSupportLib/include/rapidjson/msinttypes/inttypes.h similarity index 100% rename from commonFiles/rapidjson/msinttypes/inttypes.h rename to slsSupportLib/include/rapidjson/msinttypes/inttypes.h diff --git a/commonFiles/rapidjson/msinttypes/stdint.h b/slsSupportLib/include/rapidjson/msinttypes/stdint.h similarity index 100% rename from commonFiles/rapidjson/msinttypes/stdint.h rename to slsSupportLib/include/rapidjson/msinttypes/stdint.h diff --git a/commonFiles/rapidjson/ostreamwrapper.h b/slsSupportLib/include/rapidjson/ostreamwrapper.h similarity index 100% rename from commonFiles/rapidjson/ostreamwrapper.h rename to slsSupportLib/include/rapidjson/ostreamwrapper.h diff --git a/commonFiles/rapidjson/pointer.h b/slsSupportLib/include/rapidjson/pointer.h similarity index 100% rename from commonFiles/rapidjson/pointer.h rename to slsSupportLib/include/rapidjson/pointer.h diff --git a/commonFiles/rapidjson/prettywriter.h b/slsSupportLib/include/rapidjson/prettywriter.h similarity index 100% rename from commonFiles/rapidjson/prettywriter.h rename to slsSupportLib/include/rapidjson/prettywriter.h diff --git a/commonFiles/rapidjson/rapidjson.h b/slsSupportLib/include/rapidjson/rapidjson.h similarity index 100% rename from commonFiles/rapidjson/rapidjson.h rename to slsSupportLib/include/rapidjson/rapidjson.h diff --git a/commonFiles/rapidjson/reader.h b/slsSupportLib/include/rapidjson/reader.h similarity index 100% rename from commonFiles/rapidjson/reader.h rename to slsSupportLib/include/rapidjson/reader.h diff --git a/commonFiles/rapidjson/schema.h b/slsSupportLib/include/rapidjson/schema.h similarity index 100% rename from commonFiles/rapidjson/schema.h rename to slsSupportLib/include/rapidjson/schema.h diff --git a/commonFiles/rapidjson/stream.h b/slsSupportLib/include/rapidjson/stream.h similarity index 100% rename from commonFiles/rapidjson/stream.h rename to slsSupportLib/include/rapidjson/stream.h diff --git a/commonFiles/rapidjson/stringbuffer.h b/slsSupportLib/include/rapidjson/stringbuffer.h similarity index 100% rename from commonFiles/rapidjson/stringbuffer.h rename to slsSupportLib/include/rapidjson/stringbuffer.h diff --git a/commonFiles/rapidjson/writer.h b/slsSupportLib/include/rapidjson/writer.h similarity index 100% rename from commonFiles/rapidjson/writer.h rename to slsSupportLib/include/rapidjson/writer.h diff --git a/commonFiles/sls_detector_defs.h b/slsSupportLib/include/sls_detector_defs.h similarity index 100% rename from commonFiles/sls_detector_defs.h rename to slsSupportLib/include/sls_detector_defs.h diff --git a/commonFiles/sls_detector_funcs.h b/slsSupportLib/include/sls_detector_funcs.h similarity index 100% rename from commonFiles/sls_detector_funcs.h rename to slsSupportLib/include/sls_detector_funcs.h diff --git a/commonFiles/sls_receiver_defs.h b/slsSupportLib/include/sls_receiver_defs.h similarity index 100% rename from commonFiles/sls_receiver_defs.h rename to slsSupportLib/include/sls_receiver_defs.h diff --git a/commonFiles/sls_receiver_exceptions.h b/slsSupportLib/include/sls_receiver_exceptions.h similarity index 100% rename from commonFiles/sls_receiver_exceptions.h rename to slsSupportLib/include/sls_receiver_exceptions.h diff --git a/commonFiles/sls_receiver_funcs.h b/slsSupportLib/include/sls_receiver_funcs.h similarity index 100% rename from commonFiles/sls_receiver_funcs.h rename to slsSupportLib/include/sls_receiver_funcs.h diff --git a/commonFiles/utilities.cpp b/slsSupportLib/include/utilities.cpp similarity index 100% rename from commonFiles/utilities.cpp rename to slsSupportLib/include/utilities.cpp diff --git a/commonFiles/utilities.h b/slsSupportLib/include/utilities.h similarity index 100% rename from commonFiles/utilities.h rename to slsSupportLib/include/utilities.h diff --git a/commonFiles/versionAPI.h b/slsSupportLib/include/versionAPI.h similarity index 100% rename from commonFiles/versionAPI.h rename to slsSupportLib/include/versionAPI.h diff --git a/commonFiles/zmq.h b/slsSupportLib/include/zmq.h similarity index 100% rename from commonFiles/zmq.h rename to slsSupportLib/include/zmq.h