detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-04-23 23:10:02 +02:00
Code Issues Actions Packages Releases Activity

moved common files outside slsDetectorSoftware

Browse Source
This commit is contained in:
maliakal_d 2018-10-02 16:07:53 +02:00
parent 97934e323c
commit 757bc89d05
19 changed files with 21 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -24,7 +24,7 @@ MANAPIDIR = $(MANDIR)/manual-api
TABSPACE := "\t" TABSPACE := "\t"
INCLUDES=-I. -I$(LIBRARYDIR)/commonFiles -I$(LIBRARYDIR)/slsDetector -I$(LIBRARYDIR)/usersFunctions -I$(LIBRARYDIR)/multiSlsDetector -I$(LIBRARYDIR)/slsDetectorUtils -I$(LIBRARYDIR)/slsDetectorCommand -I$(LIBRARYDIR)/slsDetectorAnalysis -I$(LIBRARYDIR)/slsReceiverInterface -I$(LIBRARYRXRDIR)/include -I$(LIBRARYDIR)/threadFiles -I$(LIBRARYDIR)/sharedMemory -I$(ASM) INCLUDES=-I. -I$(WD)/commonFiles -I$(LIBRARYDIR)/slsDetector -I$(LIBRARYDIR)/usersFunctions -I$(LIBRARYDIR)/multiSlsDetector -I$(LIBRARYDIR)/slsDetectorUtils -I$(LIBRARYDIR)/slsDetectorCommand -I$(LIBRARYDIR)/slsDetectorAnalysis -I$(LIBRARYDIR)/slsReceiverInterface -I$(LIBRARYRXRDIR)/include -I$(LIBRARYDIR)/threadFiles -I$(LIBRARYDIR)/sharedMemory -I$(ASM)
INCLUDESRXR += -I. -I$(LIBRARYRXRDIR)/include -I$(CALIBDIR) -I$(ASM) INCLUDESRXR += -I. -I$(LIBRARYRXRDIR)/include -I$(CALIBDIR) -I$(ASM)
#LIBFLAGRXR += #LIBFLAGRXR +=

0
slsDetectorSoftware/commonFiles/communication_funcs.c → commonFiles/communication_funcs.c
View File

0
slsDetectorSoftware/commonFiles/communication_funcs.h → commonFiles/communication_funcs.h
View File

0
slsDetectorSoftware/commonFiles/error_defs.h → commonFiles/error_defs.h
View File

0
slsDetectorSoftware/commonFiles/sls_detector_defs.h → commonFiles/sls_detector_defs.h
View File

0
slsDetectorSoftware/commonFiles/sls_detector_funcs.h → commonFiles/sls_detector_funcs.h
View File

0
slsDetectorSoftware/commonFiles/versionAPI.h → commonFiles/versionAPI.h
View File

2
slsDetectorGui/CMakeLists.txt
View File

@ -75,7 +75,7 @@ qt4_add_resources(RESOURCES_SRCS ${RESOURCES})
include_directories( include_directories(
include include
slsDetectorPlotting/include slsDetectorPlotting/include
../slsDetectorSoftware/commonFiles ../commonFiles
../slsDetectorSoftware/slsReceiverInterface ../slsDetectorSoftware/slsReceiverInterface
../slsDetectorSoftware/slsDetector ../slsDetectorSoftware/slsDetector
../slsDetectorSoftware/slsDetectorAnalysis ../slsDetectorSoftware/slsDetectorAnalysis

2
slsDetectorGui/Makefile
View File

@ -16,7 +16,7 @@ DOCDIR ?= docs
LIBRARYDIR ?= ../slsDetectorSoftware LIBRARYDIR ?= ../slsDetectorSoftware
LIBRARYRXRDIR ?= ../slsReceiverSoftware LIBRARYRXRDIR ?= ../slsReceiverSoftware
INCLUDES ?= $(LIBRARYDIR)/commonFiles -I$(LIBRARYRXRDIR)/MySocketTCP -I$(LIBRARYDIR)/slsReceiverInterface -I$(LIBRARYDIR)/slsDetector -I$(LIBRARYDIR)/slsDetectorAnalysis -I$(LIBRARYDIR)/multiSlsDetector -I$(LIBRARYDIR)/usersFunctions -I$(LIBRARYRXRDIR)/includes INCLUDES ?= ../commonFiles -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 LDFLAGDET ?= -L$(LIBDIR) -Wl,-rpath=$(LIBDIR) -lSlsDetector

4
slsDetectorGui/client/Makefile
View File

@ -5,9 +5,9 @@ LDLIBS += -lm -lstdc++ -pthread
LDIR = ../../slsDetectorSoftware LDIR = ../../slsDetectorSoftware
RDIR = ../../slsReceiverSoftware RDIR = ../../slsReceiverSoftware
DDIR = ../../bin DDIR = ../../bin
INCLUDES = -I $(LDIR)/commonFiles -I $(LDIR)/slsDetector -I ../include -I $(RDIR)/include INCLUDES = -I ../../commonFiles -I $(LDIR)/slsDetector -I ../include -I $(RDIR)/include
SRC_CLNT = qClient.cpp $(RDIR)/src/MySocketTCP.cpp SRC_CLNT = qClient.cpp $(RDIR)/src/MySocketTCP.cpp
DEPSINCLUDES= qClient.h $(RDIR)/include/MySocketTCP.h $(LDIR)/slsDetector/slsDetectorBase.h $(LDIR)/commonFiles/sls_detector_defs.h DEPSINCLUDES= qClient.h $(RDIR)/include/MySocketTCP.h $(LDIR)/slsDetector/slsDetectorBase.h ../../commonFiles/sls_detector_defs.h
all: client all: client

2
slsDetectorGui/slsDetectorGui.pro
View File

@ -145,7 +145,7 @@ HEADERS = \
include/qTabDeveloper.h\ include/qTabDeveloper.h\
include/qTabMessages.h\ include/qTabMessages.h\
include/gitInfoGui.h\ include/gitInfoGui.h\
../slsDetectorSoftware/commonFiles/sls_detector_defs.h\ ../commonFiles/sls_detector_defs.h\
../slsReceiverSoftware/include/sls_receiver_defs.h\ ../slsReceiverSoftware/include/sls_receiver_defs.h\
include/qServer.h include/qServer.h

10
slsDetectorSoftware/CMakeLists.txt
View File

@ -16,7 +16,7 @@ set(HEADERS
) )
include_directories( include_directories(
commonFiles ../commonFiles
multiSlsDetector multiSlsDetector
sharedMemory sharedMemory
slsDetector slsDetector
@ -59,10 +59,10 @@ target_link_libraries(slsDetectorShared
) )
set(PUBLICHEADERS set(PUBLICHEADERS
commonFiles/sls_detector_defs.h ../commonFiles/sls_detector_defs.h
commonFiles/sls_detector_funcs.h ../commonFiles/sls_detector_funcs.h
commonFiles/error_defs.h ../commonFiles/error_defs.h
commonFiles/versionAPI.h ../commonFiles/versionAPI.h
sharedMemory/SharedMemory.h sharedMemory/SharedMemory.h
slsDetector/slsDetectorUtils.h slsDetector/slsDetectorUtils.h
slsDetector/slsDetector.h slsDetector/slsDetector.h

4
slsDetectorSoftware/Makefile
View File

@ -9,7 +9,7 @@ CFLAGS= -g -DC_ONLY -fPIC
DFLAGS= -g -DDACS_INT DFLAGS= -g -DDACS_INT
INCLUDES?= -IcommonFiles -IslsDetector -I../slsReceiverSoftware/MySocketTCP -ImultiSlsDetector -IslsDetectorUtils -IslsDetectorCommand -IslsDetectorAnalysis -IslsReceiverInterface -I../slsReceiverSoftware/include -IthreadFiles -IsharedMemory -I$(ASM) INCLUDES?= -I../commonFiles -IslsDetector -I../slsReceiverSoftware/MySocketTCP -ImultiSlsDetector -IslsDetectorUtils -IslsDetectorCommand -IslsDetectorAnalysis -IslsReceiverInterface -I../slsReceiverSoftware/include -IthreadFiles -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 #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
@ -17,7 +17,7 @@ LIBZMQDIR = ../slsReceiverSoftware/include
LIBZMQ = -L$(LIBZMQDIR) -Wl,-rpath=$(LIBZMQDIR) -lzmq LIBZMQ = -L$(LIBZMQDIR) -Wl,-rpath=$(LIBZMQDIR) -lzmq
SRC_CLNT= slsDetector/slsDetectorUtils.cpp slsDetector/slsDetectorCommand.cpp slsDetectorAnalysis/postProcessing.cpp slsDetector/slsDetector.cpp multiSlsDetector/multiSlsDetector.cpp slsReceiverInterface/receiverInterface.cpp slsDetector/slsDetectorUsers.cpp threadFiles/CondVar.cpp threadFiles/Mutex.cpp threadFiles/ThreadPool.cpp sharedMemory/SharedMemory.cpp #../slsReceiverSoftware/MySocketTCP/MySocketTCP.cpp SRC_CLNT= slsDetector/slsDetectorUtils.cpp slsDetector/slsDetectorCommand.cpp slsDetectorAnalysis/postProcessing.cpp slsDetector/slsDetector.cpp multiSlsDetector/multiSlsDetector.cpp slsReceiverInterface/receiverInterface.cpp slsDetector/slsDetectorUsers.cpp threadFiles/CondVar.cpp threadFiles/Mutex.cpp threadFiles/ThreadPool.cpp sharedMemory/SharedMemory.cpp #../slsReceiverSoftware/MySocketTCP/MySocketTCP.cpp
DEPSINCLUDES = $(LIBZMQDIR)/sls_receiver_defs.h $(LIBZMQDIR)/sls_receiver_funcs.h $(LIBZMQDIR)/ansi.h commonFiles/sls_detector_defs.h commonFiles/sls_detector_funcs.h commonFiles/error_defs.h slsDetector/slsDetectorBase.h slsDetectorAnalysis/detectorData.h threadFiles/Global.h threadFiles/Task.h sharedMemory/SharedMemory.h $(LIBZMQDIR)/sls_receiver_exceptions.h commonFiles/versionAPI.h DEPSINCLUDES = $(LIBZMQDIR)/sls_receiver_defs.h $(LIBZMQDIR)/sls_receiver_funcs.h $(LIBZMQDIR)/ansi.h ../commonFiles/sls_detector_defs.h ../commonFiles/sls_detector_funcs.h ../commonFiles/error_defs.h slsDetector/slsDetectorBase.h slsDetectorAnalysis/detectorData.h threadFiles/Global.h threadFiles/Task.h sharedMemory/SharedMemory.h $(LIBZMQDIR)/sls_receiver_exceptions.h ../commonFiles/versionAPI.h

8
slsDetectorSoftware/doxy.config
View File

@ -80,10 +80,10 @@ LATEX_HIDE_INDICES = YES
PREDEFINED = __cplusplus PREDEFINED = __cplusplus
INPUT = commonFiles/communication_funcs.h \ INPUT = ../commonfiles/communication_funcs.h \
commonFiles/error_defs.h \ ../commonfiles/error_defs.h \
commonFiles/sls_detector_defs.h \ ../commonfiles/sls_detector_defs.h \
commonFiles/sls_detector_funcs.h \ ../commonfiles/sls_detector_funcs.h \
multiSlsDetector/multiSlsDetectorClient.h \ multiSlsDetector/multiSlsDetectorClient.h \
multiSlsDetector/multiSlsDetectorCommand.h \ multiSlsDetector/multiSlsDetectorCommand.h \
multiSlsDetector/multiSlsDetector.h \ multiSlsDetector/multiSlsDetector.h \

2
slsDetectorSoftware/slsADCReader/Makefile
View File

@ -1,7 +1,7 @@
CC = g++ CC = g++
#CC = bfin-uclinux- #CC = bfin-uclinux-
SRC = slsADCReader.cpp SRC = slsADCReader.cpp
INCLUDES = -I ../../slsReceiverSoftware/include -I ../commonFiles INCLUDES = -I ../../slsReceiverSoftware/include -I ../../commonFiles
CFLAGS = -Wall -lm -lstdc++ CFLAGS = -Wall -lm -lstdc++

2
slsDetectorSoftware/slsDetector/slsDetectorUtils.h
View File

@ -1037,8 +1037,6 @@ public:
protected: protected:
static const int64_t thisSoftwareVersion=0x20141013;
int *stoppedFlag; int *stoppedFlag;
int64_t *timerValue; int64_t *timerValue;
detectorSettings *currentSettings; detectorSettings *currentSettings;

2
slsDetectorSoftware/slsDetectorClient/CMakeLists.txt
View File

@ -3,7 +3,7 @@ set(SOURCES
) )
include_directories( include_directories(
../commonFiles ../../commonfiles
../multiSlsDetector ../multiSlsDetector
../slsDetector ../slsDetector
../slsDetectorAnalysis ../slsDetectorAnalysis

2
slsDetectorSoftware/slsDetectorClient/Makefile
View File

@ -4,7 +4,7 @@ CFLAGS= -DC_ONLY
#FLAGS=-DVERBOSE #FLAGS=-DVERBOSE
#ASM=$(shell echo "/lib/modules/`uname -r`/build/include") #ASM=$(shell echo "/lib/modules/`uname -r`/build/include")
INCLUDES?= -I../commonFiles -I../slsDetector -I ../MySocketTCP -I../usersFunctions -I../multiSlsDetector -I../slsDetectorAnalysis -I../slsReceiverInterface -I ../../slsReceiverSoftware/include -I$(shell echo "/lib/modules/`uname -r`/build/include") INCLUDES?= -I../../commonfiles -I../slsDetector -I ../MySocketTCP -I../usersFunctions -I../multiSlsDetector -I../slsDetectorAnalysis -I../slsReceiverInterface -I ../../slsReceiverSoftware/include -I$(shell echo "/lib/modules/`uname -r`/build/include")
DESTDIR ?= ../../bin DESTDIR ?= ../../bin
BIN=$(DESTDIR) BIN=$(DESTDIR)
LIBS?= -L$(DESTDIR) -lSlsDetector LIBS?= -L$(DESTDIR) -lSlsDetector

2
slsDetectorSoftware/slsDetectorClient/Makefile.x04sa
View File

@ -1,6 +1,6 @@
CFLAGS= -DC_ONLY CFLAGS= -DC_ONLY
FLAGS=-DVERBOSE FLAGS=-DVERBOSE
INCLUDES= -I../slsDetectorSoftware/commonFiles -I../slsDetectorSoftware/slsDetector -I ../slsDetectorSoftware/MySocketTCP -I../slsDetectorSoftware/usersFunctions -I../slsDetectorSoftware/multiSlsDetector -I../slsDetectorSoftware/slsDetectorAnalysis INCLUDES= -I../commonFiles -I../slsDetectorSoftware/slsDetector -I ../slsDetectorSoftware/MySocketTCP -I../slsDetectorSoftware/usersFunctions -I../slsDetectorSoftware/multiSlsDetector -I../slsDetectorSoftware/slsDetectorAnalysis
LIBS= -L../slsDetectorSoftware/ LIBS= -L../slsDetectorSoftware/
LDFLAG= -lSlsDetector -pthread LDFLAG= -lSlsDetector -pthread