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

makefiles and versioning update complete

Browse Source
This commit is contained in:
Dhanya Maliakal 2017-06-29 17:10:28 +02:00
parent 6bfbb075c8
commit 4b9a8c1dad
3 changed files with 20 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
slsReceiverSoftware/Makefile
View File

@ -1,7 +1,6 @@
include ../Makefile.include include ../Makefile.include
DESTDIR ?= ../bin DESTDIR ?= ../bin
LIBDIR ?= $(DESTDIR)
DOCDIR ?= docs DOCDIR ?= docs
SRCDIR = src SRCDIR = src
INCDIR = include INCDIR = include
@ -45,7 +44,7 @@ OBJS=$(SRC_CLNT:%.cpp=$(BUILDDIR)/%.o)
$(info ) $(info )
$(info #######################################) $(info #######################################)
$(info # Compiling slsReceiverSoftware #) $(info # In slsReceiverSoftware Makefile #)
$(info #######################################) $(info #######################################)
$(info ) $(info )
@ -74,7 +73,10 @@ receiver: $(DESTDIR)/slsReceiver
$(DESTDIR)/libSlsReceiver.so: $(OBJS) $(DESTDIR)/libSlsReceiver.so: $(OBJS)
./updateGitVersion.sh $(call colorecho,"#######################################")
$(call colorecho,"# Compiling slsReceiver Library #")
$(call colorecho,"#######################################")
$(call colorecho,`./updateGitVersion.sh`)
$(CXX) -shared -Wl,-soname,libSlsReceiver.so -o libSlsReceiver.so $(OBJS) -lc $(INCLUDES) $(DFLAGS) $(FLAGS) $(EPICSFLAGS) -L/usr/lib64 -pthread $(LIBZMQ) -lrt $(CXX) -shared -Wl,-soname,libSlsReceiver.so -o libSlsReceiver.so $(OBJS) -lc $(INCLUDES) $(DFLAGS) $(FLAGS) $(EPICSFLAGS) -L/usr/lib64 -pthread $(LIBZMQ) -lrt
$(shell test -d $(DESTDIR) || mkdir -p $(DESTDIR)) $(shell test -d $(DESTDIR) || mkdir -p $(DESTDIR))
mv libSlsReceiver.so $(DESTDIR) mv libSlsReceiver.so $(DESTDIR)
@ -85,11 +87,17 @@ $(DESTDIR)/libSlsReceiver.a: $(OBJS)
$(DESTDIR)/slsReceiver: $(SRCDIR)/$(MAIN_SRC) $(DESTDIR)/libSlsReceiver.so $(DESTDIR)/libSlsReceiver.a $(DESTDIR)/slsReceiver: $(SRCDIR)/$(MAIN_SRC) $(DESTDIR)/libSlsReceiver.so $(DESTDIR)/libSlsReceiver.a
$(call colorecho,"#######################################")
$(call colorecho,"# Compiling slsReceiver #")
$(call colorecho,"#######################################")
$(CXX) -o $@ $(SRCDIR)/$(MAIN_SRC) $(FLAGS) $(INCLUDES) $(CLAGS) $(LIBS) $(LDFLAGRXR) -fPIC $(LIBZMQ) -lrt $(CXX) -o $@ $(SRCDIR)/$(MAIN_SRC) $(FLAGS) $(INCLUDES) $(CLAGS) $(LIBS) $(LDFLAGRXR) -fPIC $(LIBZMQ) -lrt
#$(EIGERFLAGS) #$(EIGERFLAGS)
$(DESTDIR)/dummyReceiver: $(SRCDIR)/$(DUMMY_MAIN_SRC) $(DESTDIR)/libSlsReceiver.so $(DESTDIR)/libSlsReceiver.a $(DESTDIR)/dummyReceiver: $(SRCDIR)/$(DUMMY_MAIN_SRC) $(DESTDIR)/libSlsReceiver.so $(DESTDIR)/libSlsReceiver.a
$(call colorecho,"#######################################")
$(call colorecho,"# Compiling Dummy slsReceiver #")
$(call colorecho,"#######################################")
$(CXX) -o $@ $(SRCDIR)/$(DUMMY_MAIN_SRC) $(FLAGS) $(INCLUDES) $(CLAGS) $(LIBS) $(LDFLAGRXR) -fPIC $(LIBZMQ) -lrt $(CXX) -o $@ $(SRCDIR)/$(DUMMY_MAIN_SRC) $(FLAGS) $(INCLUDES) $(CLAGS) $(LIBS) $(LDFLAGRXR) -fPIC $(LIBZMQ) -lrt
#$(EIGERFLAGS) #$(EIGERFLAGS)
@ -108,7 +116,8 @@ clean: buildclean
if test -e $(PROGS); then rm $(PROGS);fi if test -e $(PROGS); then rm $(PROGS);fi
builddir: builddir:
if [ ! -d $(BUILDDIR) ]; then mkdir $(BUILDDIR); fi mkdir -p $(BUILDDIR)
# if [ ! -d $(BUILDDIR) ]; then mkdir $(BUILDDIR); fi
buildclean: buildclean:
rm -rf $(OBJS) rm -rf $(OBJS)

8
slsReceiverSoftware/gitInfo.txt
View File

@ -1,9 +1,9 @@
Path: slsDetectorsPackage/slsReceiverSoftware Path: slsDetectorsPackage/slsReceiverSoftware
URL: origin git@git.psi.ch:sls_detectors_software/sls_receiver_software.git URL: origin git@git.psi.ch:sls_detectors_software/sls_receiver_software.git
Repository Root: origin git@git.psi.ch:sls_detectors_software/sls_receiver_software.git Repository Root: origin git@git.psi.ch:sls_detectors_software/sls_receiver_software.git
Repsitory UUID: 36fc5833daba78a6e4daf7c3fca3199a4eb75e1c Repsitory UUID: 7d45ac53d7d92a4817002e7aed7297d5ddfd0f73
Revision: 595 Revision: 596
Branch: developer Branch: developer
Last Changed Author: Dhanya_Maliakal Last Changed Author: Dhanya_Maliakal
Last Changed Rev: 600 Last Changed Rev: 601
Last Changed Date: 2017-06-28 16:53:01 +0200 Last Changed Date: 2017-06-28 18:18:30 +0200

6
slsReceiverSoftware/include/gitInfoReceiver.h
View File

@ -1,11 +1,11 @@
//#define SVNPATH "" //#define SVNPATH ""
#define SVNURL "git@git.psi.ch:sls_detectors_software/sls_receiver_software.git" #define SVNURL "git@git.psi.ch:sls_detectors_software/sls_receiver_software.git"
//#define SVNREPPATH "" //#define SVNREPPATH ""
#define SVNREPUUID "36fc5833daba78a6e4daf7c3fca3199a4eb75e1c" #define SVNREPUUID "7d45ac53d7d92a4817002e7aed7297d5ddfd0f73"
//#define SVNREV 0x600 //#define SVNREV 0x601
//#define SVNKIND "" //#define SVNKIND ""
//#define SVNSCHED "" //#define SVNSCHED ""
#define SVNAUTH "Dhanya_Maliakal" #define SVNAUTH "Dhanya_Maliakal"
#define SVNREV 0x600 #define SVNREV 0x601
#define SVNDATE 0x20170628 #define SVNDATE 0x20170628
// //