From 672c42a20ee18095737a26cd9017b7f657d020a4 Mon Sep 17 00:00:00 2001 From: Dhanya Maliakal Date: Mon, 10 Jul 2017 11:20:26 +0200 Subject: [PATCH] some more changes to make file for automatic versioning --- slsReceiverSoftware/Makefile | 9 ++-- slsReceiverSoftware/gitInfo.txt | 8 ++-- slsReceiverSoftware/include/gitInfoReceiver.h | 8 ++-- slsReceiverSoftware/src/Listener.cpp | 2 +- slsReceiverSoftware/updateGitVersion.sh | 45 ++++++++----------- 5 files changed, 33 insertions(+), 39 deletions(-) diff --git a/slsReceiverSoftware/Makefile b/slsReceiverSoftware/Makefile index f7a30909c..cccc77a6a 100644 --- a/slsReceiverSoftware/Makefile +++ b/slsReceiverSoftware/Makefile @@ -63,20 +63,21 @@ $(BUILDDIR)/%.o : $(SRCDIR)/%.cpp $(INCDIR)/%.h $(DEPSINCLUDES) Makefile ifeq ($(ROOTSLS),yes) $(CXX) -DROOTSLS -o $@ -c $< $(INCLUDES) $(DFLAGS) $(ROOTFLAGS) -fPIC $(EPICSFLAGS) $(LDFLAGRXR) -L/usr/lib64/ $(FLAGS) else +# $(call colorecho,`./updateGitVersion.sh`) $(CXX) -o $@ -c $< $(INCLUDES) $(DFLAGS) -fPIC $(EPICSFLAGS) $(LDFLAGRXR) -pthread $(FLAGS) $(LIBZMQ) -lrt endif -lib: $(OBJS) $(DESTDIR)/libSlsReceiver.so $(DESTDIR)/libSlsReceiver.a +versioning: + $(call colorecho,`./updateGitVersion.sh`) + +lib: versioning $(OBJS) $(DESTDIR)/libSlsReceiver.so $(DESTDIR)/libSlsReceiver.a receiver: $(DESTDIR)/slsReceiver - - $(DESTDIR)/libSlsReceiver.so: $(OBJS) $(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 $(shell test -d $(DESTDIR) || mkdir -p $(DESTDIR)) mv libSlsReceiver.so $(DESTDIR) diff --git a/slsReceiverSoftware/gitInfo.txt b/slsReceiverSoftware/gitInfo.txt index 05da01629..5abceff21 100644 --- a/slsReceiverSoftware/gitInfo.txt +++ b/slsReceiverSoftware/gitInfo.txt @@ -1,9 +1,9 @@ Path: slsDetectorsPackage/slsReceiverSoftware 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 -Repsitory UUID: 95d1843ad9c5f8e6b73d305d43d102c823d564f3 -Revision: 602 +Repsitory UUID: 52fc057d7620c0ca08583675c53c8e8f3a317277 +Revision: 603 Branch: developer Last Changed Author: Dhanya_Maliakal -Last Changed Rev: 607 -Last Changed Date: 2017-07-03 17:37:31 +0200 +Last Changed Rev: 608 +Last Changed Date: 2017-07-07 13:47:10.000000002 +0200 ./Makefile diff --git a/slsReceiverSoftware/include/gitInfoReceiver.h b/slsReceiverSoftware/include/gitInfoReceiver.h index 563ecfb70..5a607e3da 100644 --- a/slsReceiverSoftware/include/gitInfoReceiver.h +++ b/slsReceiverSoftware/include/gitInfoReceiver.h @@ -1,11 +1,11 @@ //#define SVNPATH "" #define SVNURL "git@git.psi.ch:sls_detectors_software/sls_receiver_software.git" //#define SVNREPPATH "" -#define SVNREPUUID "95d1843ad9c5f8e6b73d305d43d102c823d564f3" -//#define SVNREV 0x607 +#define SVNREPUUID "52fc057d7620c0ca08583675c53c8e8f3a317277" +//#define SVNREV 0x608 //#define SVNKIND "" //#define SVNSCHED "" #define SVNAUTH "Dhanya_Maliakal" -#define SVNREV 0x607 -#define SVNDATE 0x20170703 +#define SVNREV 0x608 +#define SVNDATE 0x20170707 // diff --git a/slsReceiverSoftware/src/Listener.cpp b/slsReceiverSoftware/src/Listener.cpp index 7d267d2dd..4fcf54581 100644 --- a/slsReceiverSoftware/src/Listener.cpp +++ b/slsReceiverSoftware/src/Listener.cpp @@ -148,7 +148,7 @@ void Listener::ResetParametersforNewAcquisition() { } -void Listener::ResetParametersforNewMeasurement(){ +void Listener::ResetParametersforNewMeasurement() { measurementStartedFlag = false; numPacketsCaught = 0; firstMeasurementIndex = 0; diff --git a/slsReceiverSoftware/updateGitVersion.sh b/slsReceiverSoftware/updateGitVersion.sh index 7c6af8bb6..c602e9815 100755 --- a/slsReceiverSoftware/updateGitVersion.sh +++ b/slsReceiverSoftware/updateGitVersion.sh @@ -4,32 +4,25 @@ TMPFILE=include/gitInfoReceiverTmp.h INCLFILE=include/gitInfoReceiver.h WD=$PWD -GITREPO1='git remote -v' -GITREPO2=" | grep \"fetch\" | cut -d' ' -f1" -BRANCH1='git branch -v' -BRANCH2=" | grep '*' | cut -d' ' -f2" -REPUID1='git log --pretty=format:"%H" -1' -AUTH1_1='git log --pretty=format:"%cn" -1' -AUTH1_2=" | cut -d' ' -f1" -AUTH2_1='git log --pretty=format:"%cn" -1' -AUTH2_2=" | cut -d' ' -f2" -FOLDERREV1='git log --oneline . ' #used for all the individual server folders -FOLDERREV2=" | wc -l" #used for all the individual server folders -REV1='git log --oneline ' -REV2=" | wc -l" -RDATE1='git log --pretty=format:"%ci" -1' +#evaluate the variables +EVALFILE=../evalVersionVariables.sh +source $EVALFILE -GITREPO=`eval $GITREPO1 $GITREPO2` -BRANCH=`eval $BRANCH1 $BRANCH2` -REPUID=`eval $REPUID1` -AUTH1=`eval $AUTH1_1 $AUTH1_2` -AUTH2=`eval $AUTH2_1 $AUTH2_2` -REV=`eval $REV1 $REV2` -FOLDERREV=`eval $FOLDERREV1 $FOLDERREV2` +#get modified date +#RDATE1='git log --pretty=format:"%ci" -1' +RDATE1="find . -type f -exec stat --format '%Y :%y %n' '{}' \; | sort -nr | cut -d: -f2- | egrep -v 'gitInfo|build|.git|updateGitVersion' | head -n 1" 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 -cd .. -./genVersionHeader.sh $SPECDIR/gitInfo.txt $SPECDIR/$TMPFILE $SPECDIR/$INCLFILE -echo "Revision Updated" -cd $WD +NEWDATE=$(sed "s/-//g" <<< $RDATE | awk '{print $1;}') +NEWDATE=${NEWDATE/#/0x} + +#get old date from INCLFILE +OLDDATE=$(more $INCLFILE | grep '#define SVNDATE' | awk '{print $3}') + +#update INCLFILE if changes +if [ "$OLDDATE" != "$NEWDATE" ]; then + 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 .. + ./genVersionHeader.sh $SPECDIR/gitInfo.txt $SPECDIR/$TMPFILE $SPECDIR/$INCLFILE + cd $WD +fi