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

changes for Makefile dependencies

Browse Source
This commit is contained in:
Dhanya Maliakal
2017-06-28 18:52:43 +02:00
parent 3515951bb8
commit cfff7969e3
5 changed files with 28 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
slsDetectorGui/Makefile
View File

@ -29,10 +29,11 @@ INCLUDES ?= $(LIBRARYDIR)/commonFiles -I$(LIBRARYRXRDIR)/MySocketTCP -I$(LIBRA
.PHONY: all lib clean mm doc htmldoc guiclient .PHONY: all lib clean mm doc htmldoc guiclient
all: lib updateVersion $(PROG) Makefile.gui guiclient all: lib $(PROG) Makefile.gui guiclient
lib: $(DESTDIR)/libSlsDetector.so $(DESTDIR)/libSlsDetector.a
if [ ! -f $(DESTDIR)/libSlsDetector.so ]; then cd ../ && $(MAKE) lib; fi
lib:
cd ../ && $(MAKE) lib
clean: clean:
if test -e Makefile.gui; then $(MAKE) -f Makefile.gui clean; $(MAKE) -f Makefile.gui mocclean; rm Makefile.gui; else $(MAKE) Makefile.gui; $(MAKE) -f Makefile.gui clean; $(MAKE) -f Makefile.gui mocclean; fi if test -e Makefile.gui; then $(MAKE) -f Makefile.gui clean; $(MAKE) -f Makefile.gui mocclean; rm Makefile.gui; else $(MAKE) Makefile.gui; $(MAKE) -f Makefile.gui clean; $(MAKE) -f Makefile.gui mocclean; fi
@ -52,11 +53,10 @@ htmldoc:
cd manual && $(MAKE) html DESTDIR=$(DOCDIR) cd manual && $(MAKE) html DESTDIR=$(DOCDIR)
$(PROG): Makefile.gui $(DIR) $(PROG): Makefile.gui $(DIR)
./updateGitVersion.sh
$(MAKE) -f Makefile.gui SLSDETLIB=$(LIBDIR) DESTDIR=$(DESTDIR) SUBLIBS='$(LDFLAGDET)' INCLUDES='$(INCLUDES)' $(MAKE) -f Makefile.gui SLSDETLIB=$(LIBDIR) DESTDIR=$(DESTDIR) SUBLIBS='$(LDFLAGDET)' INCLUDES='$(INCLUDES)'
guiclient: guiclient:
echo $(WD) echo $(WD)
cd client && $(MAKE) DESTDIR=$(DESTDIR) cd client && $(MAKE) DESTDIR=$(DESTDIR)
updateVersion:
./updateGitVersion.sh

27
slsDetectorGui/client/Makefile
View File

@ -7,28 +7,23 @@ RDIR = ../../slsReceiverSoftware
INCLUDES = -I $(LDIR)/commonFiles -I $(LDIR)/slsDetector -I ../include -I $(RDIR)/include INCLUDES = -I $(LDIR)/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= $(RDIR)/include/MySocketTCP.h $(LDIR)/slsDetector/slsDetectorBase.h $(LDIR)/commonFiles/sls_detector_defs.h
PROGS = gui_client
DESTDIR ?= bin
INSTMODE = 0777
FINALDIR = ../../bin
OBJS = $(SRC_CLNT:.cpp=.o)
all: clean $(PROGS) all: client
client: $(OBJS) $(DESTDIR)/gui_client
OBJS = $(SRC_CLNT:%.cpp=%.o)
$(DESTDIR)/gui_client : $(SRC_CLNT) $(DEPSINCLUDES) Makefile
$(CXX) -o $@ -c $< $(INCLUDES) $(FLAGS) $(LDLIBS)
boot: $(OBJS)
$(PROGS):
echo $(OBJS)
mkdir -p $(DESTDIR)
gcc $(SRC_CLNT) $(INCLUDES) $(FLAGS) $(LDLIBS) -o $@
mv $(PROGS) $(FINALDIR)
clean: clean:
rm -rf $(DESTDIR)/$(PROGS) *.o $(FINALDIR)/$(PROGS) rm -rf $(DESTDIR)/$(PROGS) *.o

8
slsDetectorGui/gitInfo.txt
View File

@ -1,9 +1,9 @@
Path: slsDetectorsPackage/slsDetectorGui Path: slsDetectorsPackage/slsDetectorGui
URL: origin git@git.psi.ch:sls_detectors_software/sls_detector_gui.git URL: origin git@git.psi.ch:sls_detectors_software/sls_detector_gui.git
Repository Root: origin git@git.psi.ch:sls_detectors_software/sls_detector_gui.git Repository Root: origin git@git.psi.ch:sls_detectors_software/sls_detector_gui.git
Repsitory UUID: 7910e5772fc18bee7e706d6a57ccdc8b9c353d18 Repsitory UUID: 6ceaa18c5d55e94339999977a91fca1d8712578d
Revision: 393 Revision: 395
Branch: developer Branch: developer
Last Changed Author: Dhanya_Maliakal Last Changed Author: Dhanya_Maliakal
Last Changed Rev: 393 Last Changed Rev: 395
Last Changed Date: 2017-06-23 17:26:33 +0200 Last Changed Date: 2017-06-28 11:18:55 +0200

8
slsDetectorGui/include/gitInfoGui.h
View File

@ -1,11 +1,11 @@
//#define SVNPATH "" //#define SVNPATH ""
#define SVNURL "git@git.psi.ch:sls_detectors_software/sls_detector_gui.git" #define SVNURL "git@git.psi.ch:sls_detectors_software/sls_detector_gui.git"
//#define SVNREPPATH "" //#define SVNREPPATH ""
#define SVNREPUUID "7910e5772fc18bee7e706d6a57ccdc8b9c353d18" #define SVNREPUUID "6ceaa18c5d55e94339999977a91fca1d8712578d"
//#define SVNREV 0x393 //#define SVNREV 0x395
//#define SVNKIND "" //#define SVNKIND ""
//#define SVNSCHED "" //#define SVNSCHED ""
#define SVNAUTH "Dhanya_Maliakal" #define SVNAUTH "Dhanya_Maliakal"
#define SVNREV 0x393 #define SVNREV 0x395
#define SVNDATE 0x20170623 #define SVNDATE 0x20170628
// //

6
slsDetectorGui/updateGitVersion.sh
View File

@ -1,7 +1,7 @@
MAINDIR=slsDetectorsPackage MAINDIR=slsDetectorsPackage
SPECDIR=slsDetectorGui SPECDIR=slsDetectorGui
TMPFILE=gitInfoGuiTmp.h TMPFILE=include/gitInfoGuiTmp.h
INCLFILE=gitInfoGui.h INCLFILE=include/gitInfoGui.h
WD=$PWD WD=$PWD
GITREPO1='git remote -v' GITREPO1='git remote -v'
@ -28,7 +28,7 @@ REV=`eval $REV1 $REV2`
FOLDERREV=`eval $FOLDERREV1 $FOLDERREV2` FOLDERREV=`eval $FOLDERREV1 $FOLDERREV2`
RDATE=`eval $RDATE1` RDATE=`eval $RDATE1`
echo Path: ${MAINDIR}/${SPECDIR} $'\n'URL: ${GITREPO} $'\n'Repository Root: ${GITREPO} $'\n'Repsitory UUID: ${REPUID} $'\n'Revision: ${FOLDERREV} $'\n'Branch: ${BRANCH} $'\n'Last Changed Author: ${AUTH1}_${AUTH2} $'\n'Last Changed Rev: ${REV} $'\n'Last Changed Date: ${RDATE} > gitInfo.txt echo Path: ${MAINDIR}/${SPECDIR} $'\n'URL: ${GITREPO} $'\n'Repository Root: ${GITREPO} $'\n'Repsitory UUID: ${REPUID} $'\n'Revision: ${FOLDERREV} $'\n'Branch: ${BRANCH} $'\n'Last Changed Author: ${AUTH1}_${AUTH2} $'\n'Last Changed Rev: ${REV} $'\n'Last Changed Date: ${RDATE} > gitInfo.txt
cd $WD cd ..
./genVersionHeader.sh $SPECDIR/gitInfo.txt $SPECDIR/$TMPFILE $SPECDIR/$INCLFILE ./genVersionHeader.sh $SPECDIR/gitInfo.txt $SPECDIR/$TMPFILE $SPECDIR/$INCLFILE
echo "Revision Updated" echo "Revision Updated"
cd $WD cd $WD