From 4905f4910820670f12e038d6be46311c05151a63 Mon Sep 17 00:00:00 2001 From: Dhanya Maliakal Date: Wed, 28 Jun 2017 11:23:19 +0200 Subject: [PATCH] added updateversion into makefile while compiling --- slsDetectorSoftware/Makefile | 7 ++++- slsDetectorSoftware/updateGitVersion.sh | 37 +++++++++++++++++++++++++ 2 files changed, 43 insertions(+), 1 deletion(-) create mode 100755 slsDetectorSoftware/updateGitVersion.sh diff --git a/slsDetectorSoftware/Makefile b/slsDetectorSoftware/Makefile index 2f5ff4153..8552028fe 100644 --- a/slsDetectorSoftware/Makefile +++ b/slsDetectorSoftware/Makefile @@ -34,7 +34,7 @@ OBJS = $(SRC_CLNT:.cpp=.o) .PHONY: all intdoc doc htmldoc package clean -all: package $(SRC_CLNT) +all: updateVersion package $(SRC_CLNT) intdoc: $(SRC_H) $(SRC_CLNT) doxygen doxy.config @@ -87,6 +87,11 @@ $(DESTDIR)/libSlsDetector.a: $(OBJS) clean: rm -rf $(DESTDIR)/libSlsDetector.a $(DESTDIR)/libSlsDetector.so core docs/* slsDetectorUsersDocs $(OBJS) cd + + +updateVersion: + ./updateGitVersion.sh + #------------------------------------------------------------------------------- diff --git a/slsDetectorSoftware/updateGitVersion.sh b/slsDetectorSoftware/updateGitVersion.sh new file mode 100755 index 000000000..9540286b2 --- /dev/null +++ b/slsDetectorSoftware/updateGitVersion.sh @@ -0,0 +1,37 @@ +MAINDIR=slsDetectorsPackage +SPECDIR=slsDetectorSoftware +TMPFILE=gitInfoLibTmp.h +INCLFILE=gitInfoLib.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' + +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` +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 $WD +./genVersionHeader.sh $SPECDIR/gitInfo.txt $SPECDIR/$TMPFILE $SPECDIR/$INCLFILE +echo "Revision Updated" +cd $WD + + +