diff --git a/slsDetectorSoftware/Makefile b/slsDetectorSoftware/Makefile index 85aadb3f0..7c8f501ad 100644 --- a/slsDetectorSoftware/Makefile +++ b/slsDetectorSoftware/Makefile @@ -72,15 +72,15 @@ gotthardVirtualServer: $(SRC_MYTHEN_SVC) $(CXX) -o $@ -c $< $(INCLUDES) $(DFLAGS) -fPIC $(EPICSFLAGS) -pthread -lrt $(LIBZMQ) $(FLAGS) -package: $(OBJS) $(DESTDIR)/libSlsDetector.so $(DESTDIR)/libSlsDetector.a - +package: versioning $(OBJS) $(DESTDIR)/libSlsDetector.so $(DESTDIR)/libSlsDetector.a +versioning: + $(call colorecho,`./updateGitVersion.sh`) $(DESTDIR)/libSlsDetector.so: $(OBJS) $(call colorecho,"#######################################") $(call colorecho,"# Compiling slsDetector Library #") $(call colorecho,"#######################################") - $(call colorecho,`./updateGitVersion.sh`) $(CXX) -shared -Wl,-soname,libSlsDetector.so -o libSlsDetector.so $(OBJS) -lc $(INCLUDES) $(DFLAGS) $(FLAGS) $(EPICSFLAGS) -L/usr/lib64 -pthread -lrt $(LIBZMQ) $(shell test -d $(DESTDIR) || mkdir -p $(DESTDIR)) mv libSlsDetector.so $(DESTDIR) diff --git a/slsDetectorSoftware/eigerDetectorServer/FebControl.c b/slsDetectorSoftware/eigerDetectorServer/FebControl.c index 52244f1a0..77e4dd60c 100644 --- a/slsDetectorSoftware/eigerDetectorServer/FebControl.c +++ b/slsDetectorSoftware/eigerDetectorServer/FebControl.c @@ -24,8 +24,7 @@ //GetDAQStatusRegister(512,current_mode_bits_from_fpga)){ unsigned int Module_ndacs = 16; -char Module_dac_names[16][10]= {"SvP","Vtr","Vrf","Vrs","SvN","Vtgstv","Vcmp_ll","Vcmp_lr","cal","Vcmp_rl","rxb_rb","rxb_lb","Vcmp_rr","Vcp","Vcn","Vis"};; - +char Module_dac_names[16][10]={"SvP","Vtr","Vrf","Vrs","SvN","Vtgstv","Vcmp_ll","Vcmp_lr","cal","Vcmp_rl","rxb_rb","rxb_lb","Vcmp_rr","Vcp","Vcn","Vis"};; diff --git a/slsDetectorSoftware/eigerDetectorServer/Makefile b/slsDetectorSoftware/eigerDetectorServer/Makefile index 646d9ba2d..9942dd3ef 100755 --- a/slsDetectorSoftware/eigerDetectorServer/Makefile +++ b/slsDetectorSoftware/eigerDetectorServer/Makefile @@ -12,14 +12,16 @@ SRC_CLNT = communication_funcs.c slsDetectorServer.c slsDetectorServer_funcs.c OBJS = $(SRC_CLNT:.c=.o) -all: clean $(PROGS) #hv9m_blackfin_server +all: clean versioning $(PROGS) #hv9m_blackfin_server boot: $(OBJS) +versioning: + @echo `tput setaf 6; ./updateGitVersion.sh; tput sgr0;` + $(PROGS): $(OBJS) # echo $(OBJS) - @echo `tput setaf 6; ./updateGitVersion.sh; tput sgr0;` mkdir -p $(DESTDIR) $(CC) -o $@ $(SRC_CLNT) $(CFLAGS) $(LDLIBS) mv $(PROGS) $(DESTDIR) diff --git a/slsDetectorSoftware/eigerDetectorServer/gitInfo.txt b/slsDetectorSoftware/eigerDetectorServer/gitInfo.txt index f363766ff..bb91a6be1 100644 --- a/slsDetectorSoftware/eigerDetectorServer/gitInfo.txt +++ b/slsDetectorSoftware/eigerDetectorServer/gitInfo.txt @@ -1,9 +1,9 @@ Path: slsDetectorsPackage/slsDetectorSoftware/eigerDetectorServer -URL: origin git@git.psi.ch:sls_detectors_software/sls_detector_software.git/eigerDetectorServer +URL: origin git@git.psi.ch:sls_detectors_software/sls_detector_software.git Repository Root: origin git@git.psi.ch:sls_detectors_software/sls_detector_software.git -Repsitory UUID: d4b0bef367ef407a3267619196da01dc1636865d -Revision: 293 +Repsitory UUID: 9f1b82c18ab0893d65bfadeb646b8ea244614632 +Revision: 294 Branch: developer Last Changed Author: Dhanya_Maliakal -Last Changed Rev: 1435 -Last Changed Date: 2017-06-28 18:16:55 +0200 +Last Changed Rev: 1443 +Last Changed Date: 2017-07-10 10:50:39.000000002 +0200 ./Makefile diff --git a/slsDetectorSoftware/eigerDetectorServer/gitInfoEiger.h b/slsDetectorSoftware/eigerDetectorServer/gitInfoEiger.h index a9d805730..3f01d08bf 100644 --- a/slsDetectorSoftware/eigerDetectorServer/gitInfoEiger.h +++ b/slsDetectorSoftware/eigerDetectorServer/gitInfoEiger.h @@ -1,11 +1,11 @@ //#define SVNPATH "" -#define SVNURL "git@git.psi.ch:sls_detectors_software/sls_detector_software.git/eigerDetectorServer" +#define SVNURL "git@git.psi.ch:sls_detectors_software/sls_detector_software.git" //#define SVNREPPATH "" -#define SVNREPUUID "d4b0bef367ef407a3267619196da01dc1636865d" -//#define SVNREV 0x1435 +#define SVNREPUUID "9f1b82c18ab0893d65bfadeb646b8ea244614632" +//#define SVNREV 0x1443 //#define SVNKIND "" //#define SVNSCHED "" #define SVNAUTH "Dhanya_Maliakal" -#define SVNREV 0x1435 -#define SVNDATE 0x20170628 +#define SVNREV 0x1443 +#define SVNDATE 0x20170710 // diff --git a/slsDetectorSoftware/eigerDetectorServer/updateGitVersion.sh b/slsDetectorSoftware/eigerDetectorServer/updateGitVersion.sh index 65c2ce6f8..7c7a89269 100755 --- a/slsDetectorSoftware/eigerDetectorServer/updateGitVersion.sh +++ b/slsDetectorSoftware/eigerDetectorServer/updateGitVersion.sh @@ -1,37 +1,32 @@ SERVER=eigerDetectorServer +MAINDIR=slsDetectorsPackage +SPECDIR=slsDetectorSoftware/$SERVER TMPFILE=gitInfoEigerTmp.h INCLFILE=gitInfoEiger.h -WD=slsDetectorSoftware/$SERVER +#evaluate the variables +EVALFILE=../../evalVersionVariables.sh +source $EVALFILE -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` +#get modified date +#RDATE1='git log --pretty=format:"%ci" -1' +RDATE1="find ../slsDetectorServer . -type f -exec stat --format '%Y :%y %n' '{}' \; | sort -nr | cut -d: -f2- | egrep -v 'gitInfo|bin|.git|updateGitVersion|.o' | head -n 1" RDATE=`eval $RDATE1` -echo Path: slsDetectorsPackage/$WD $'\n'URL: ${GITREPO}/$SERVER $'\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 $WD/gitInfo.txt $WD/$TMPFILE $WD/$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 + diff --git a/slsDetectorSoftware/gitInfo.txt b/slsDetectorSoftware/gitInfo.txt index 03c0f5622..33a141e1f 100644 --- a/slsDetectorSoftware/gitInfo.txt +++ b/slsDetectorSoftware/gitInfo.txt @@ -1,9 +1,9 @@ Path: slsDetectorsPackage/slsDetectorSoftware URL: origin git@git.psi.ch:sls_detectors_software/sls_detector_software.git Repository Root: origin git@git.psi.ch:sls_detectors_software/sls_detector_software.git -Repsitory UUID: 79271ea7e3f5ac7113582e694b30b71a64d18844 -Revision: 1436 +Repsitory UUID: 9f1b82c18ab0893d65bfadeb646b8ea244614632 +Revision: 1438 Branch: developer Last Changed Author: Dhanya_Maliakal -Last Changed Rev: 1441 -Last Changed Date: 2017-07-03 17:42:06 +0200 +Last Changed Rev: 1443 +Last Changed Date: 2017-07-10 11:06:07.000000002 +0200 ./eigerDetectorServer/Feb.o diff --git a/slsDetectorSoftware/gotthardDetectorServer/Makefile b/slsDetectorSoftware/gotthardDetectorServer/Makefile index 38e779c18..28284e7c5 100755 --- a/slsDetectorSoftware/gotthardDetectorServer/Makefile +++ b/slsDetectorSoftware/gotthardDetectorServer/Makefile @@ -21,13 +21,15 @@ OBJS = $(SRCS:%.c=%.o) -all: clean $(PROGS) +all: clean versioning $(PROGS) boot: $(OBJS) -$(PROGS): $(OBJS) - echo $(OBJS) +versioning: @echo `tput setaf 6; ./updateGitVersion.sh; tput sgr0;` + +$(PROGS): $(OBJS) +# echo $(OBJS) $(CC) $(CFLAGS) -o $@ $^ $(LDLIBS_$@) $(LDFLAGS_$@) diff --git a/slsDetectorSoftware/gotthardDetectorServer/gitInfo.txt b/slsDetectorSoftware/gotthardDetectorServer/gitInfo.txt index 48cd8d11c..f6b85a0a0 100644 --- a/slsDetectorSoftware/gotthardDetectorServer/gitInfo.txt +++ b/slsDetectorSoftware/gotthardDetectorServer/gitInfo.txt @@ -1,9 +1,9 @@ Path: slsDetectorsPackage/slsDetectorSoftware/gotthardDetectorServer -URL: origin git@git.psi.ch:sls_detectors_software/sls_detector_software.git/gotthardDetectorServer +URL: origin git@git.psi.ch:sls_detectors_software/sls_detector_software.git Repository Root: origin git@git.psi.ch:sls_detectors_software/sls_detector_software.git -Repsitory UUID: 8aceb5d4b0ca6bd95a11b53e7a799b463b92d51b -Revision: 197 +Repsitory UUID: 9f1b82c18ab0893d65bfadeb646b8ea244614632 +Revision: 203 Branch: developer Last Changed Author: Dhanya_Maliakal -Last Changed Rev: 334 -Last Changed Date: 2016-08-12 11:08:03 +0200 +Last Changed Rev: 1443 +Last Changed Date: 2017-07-10 10:54:26.000000002 +0200 ./Makefile diff --git a/slsDetectorSoftware/gotthardDetectorServer/gitInfoGotthard.h b/slsDetectorSoftware/gotthardDetectorServer/gitInfoGotthard.h index b7bf78fa2..3f01d08bf 100644 --- a/slsDetectorSoftware/gotthardDetectorServer/gitInfoGotthard.h +++ b/slsDetectorSoftware/gotthardDetectorServer/gitInfoGotthard.h @@ -1,11 +1,11 @@ //#define SVNPATH "" -#define SVNURL "git@git.psi.ch:sls_detectors_software/sls_detector_software.git/gotthardDetectorServer" +#define SVNURL "git@git.psi.ch:sls_detectors_software/sls_detector_software.git" //#define SVNREPPATH "" -#define SVNREPUUID "8aceb5d4b0ca6bd95a11b53e7a799b463b92d51b" -//#define SVNREV 0x334 +#define SVNREPUUID "9f1b82c18ab0893d65bfadeb646b8ea244614632" +//#define SVNREV 0x1443 //#define SVNKIND "" //#define SVNSCHED "" #define SVNAUTH "Dhanya_Maliakal" -#define SVNREV 0x334 -#define SVNDATE 0x20160812 +#define SVNREV 0x1443 +#define SVNDATE 0x20170710 // diff --git a/slsDetectorSoftware/gotthardDetectorServer/updateGitVersion.sh b/slsDetectorSoftware/gotthardDetectorServer/updateGitVersion.sh index 54e56e537..8bf93bb85 100755 --- a/slsDetectorSoftware/gotthardDetectorServer/updateGitVersion.sh +++ b/slsDetectorSoftware/gotthardDetectorServer/updateGitVersion.sh @@ -1,35 +1,30 @@ SERVER=gotthardDetectorServer +MAINDIR=slsDetectorsPackage +SPECDIR=slsDetectorSoftware/$SERVER TMPFILE=gitInfoGotthardTmp.h INCLFILE=gitInfoGotthard.h -WD=slsDetectorSoftware/$SERVER +#evaluate the variables +EVALFILE=../../evalVersionVariables.sh +source $EVALFILE -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` +#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|.git|updateGitVersion|.o' | head -n 1" RDATE=`eval $RDATE1` -echo Path: slsDetectorsPackage/$WD $'\n'URL: ${GITREPO}/$SERVER $'\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 $WD/gitInfo.txt $WD/$TMPFILE $WD/$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 \ No newline at end of file diff --git a/slsDetectorSoftware/jctbDetectorServer/Makefile.ctb b/slsDetectorSoftware/jctbDetectorServer/Makefile.ctb index 60def850f..788977390 100644 --- a/slsDetectorSoftware/jctbDetectorServer/Makefile.ctb +++ b/slsDetectorSoftware/jctbDetectorServer/Makefile.ctb @@ -22,26 +22,26 @@ OBJS = $(SRCS:%.c=%.o) -all: clean $(PROGS) +all: clean versioning $(PROGS) test: clean jungfrauADCTEst boot: $(OBJS) +versioning: + @echo `tput setaf 6; ./updateGitVersion.sh; tput sgr0;` + jungfrauDetectorServerTest: $(OBJS) echo $(OBJS) - @echo `tput setaf 6; ./updateGitVersion.sh; tput sgr0;` $(CC) $(CFLAGS) -o $@ $^ $(LDLIBS_$@) $(LDFLAGS_$@) jungfrauDetectorServer: $(OBJS) echo $(OBJS) - @echo `tput setaf 6; ./updateGitVersion.sh; tput sgr0;` $(CC) $(CFLAGS) -o $@ $^ $(LDLIBS_$@) $(LDFLAGS_$@) jungfrauADCTEst: $(OBJS) echo $(OBJS) - @echo `tput setaf 6; ./updateGitVersion.sh; tput sgr0;` $(CC) $(CFLAGS) -o $@ $^ $(LDLIBS_$@) $(LDFLAGS_$@) -DTESTADC diff --git a/slsDetectorSoftware/jctbDetectorServer/updateGitVersion.sh b/slsDetectorSoftware/jctbDetectorServer/updateGitVersion.sh index 57d015ca3..476546726 100755 --- a/slsDetectorSoftware/jctbDetectorServer/updateGitVersion.sh +++ b/slsDetectorSoftware/jctbDetectorServer/updateGitVersion.sh @@ -1,37 +1,31 @@ SERVER=jctbDetectorServer +MAINDIR=slsDetectorsPackage +SPECDIR=slsDetectorSoftware/$SERVER TMPFILE=gitInfoMoenchTmp.h INCLFILE=gitInfoMoench.h -WD=slsDetectorSoftware/$SERVER -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|.git|updateGitVersion|.o' | head -n 1" RDATE=`eval $RDATE1` -echo Path: slsDetectorsPackage/$WD $'\n'URL: ${GITREPO}/$SERVER $'\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 $WD/gitInfo.txt $WD/$TMPFILE $WD/$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 \ No newline at end of file diff --git a/slsDetectorSoftware/jungfrauDetectorServer/Makefile b/slsDetectorSoftware/jungfrauDetectorServer/Makefile index a811cfa9a..a1c89973e 100755 --- a/slsDetectorSoftware/jungfrauDetectorServer/Makefile +++ b/slsDetectorSoftware/jungfrauDetectorServer/Makefile @@ -10,14 +10,15 @@ INSTMODE = 0777 SRC_CLNT = communication_funcs.c slsDetectorServer.c slsDetectorServer_funcs.c slsDetectorFunctionList.c OBJS = $(SRC_CLNT:.c=.o) -all: clean $(PROGS) +all: clean versioning $(PROGS) boot: $(OBJS) +versioning: + @echo `tput setaf 6; ./updateGitVersion.sh; tput sgr0;` + $(PROGS): $(OBJS) # echo $(OBJS) - @echo `tput setaf 6; ./updateGitVersion.sh; tput sgr0;` - $(CC) $(CFLAGS) -c -o slsDetectorFunctionList.o slsDetectorFunctionList.c mkdir -p $(DESTDIR) $(CC) -o $@ $^ $(CFLAGS) $(LDLIBS) mv $(PROGS) $(DESTDIR) diff --git a/slsDetectorSoftware/jungfrauDetectorServer/gitInfo.txt b/slsDetectorSoftware/jungfrauDetectorServer/gitInfo.txt index f21bb21ae..24e407864 100644 --- a/slsDetectorSoftware/jungfrauDetectorServer/gitInfo.txt +++ b/slsDetectorSoftware/jungfrauDetectorServer/gitInfo.txt @@ -1,9 +1,9 @@ Path: slsDetectorsPackage/slsDetectorSoftware/jungfrauDetectorServer -URL: origin git@git.psi.ch:sls_detectors_software/sls_detector_software.git/jungfrauDetectorServer +URL: origin git@git.psi.ch:sls_detectors_software/sls_detector_software.git Repository Root: origin git@git.psi.ch:sls_detectors_software/sls_detector_software.git -Repsitory UUID: ac8afb3a4dc53ac14f7034d281acc8f0a700ca8d -Revision: 87 +Repsitory UUID: 9f1b82c18ab0893d65bfadeb646b8ea244614632 +Revision: 88 Branch: developer Last Changed Author: Dhanya_Maliakal -Last Changed Rev: 1442 -Last Changed Date: 2017-07-03 17:44:52 +0200 +Last Changed Rev: 1443 +Last Changed Date: 2017-07-10 10:40:23.000000002 +0200 ./Makefile diff --git a/slsDetectorSoftware/jungfrauDetectorServer/gitInfoJungfrau.h b/slsDetectorSoftware/jungfrauDetectorServer/gitInfoJungfrau.h index 749297fc9..3f01d08bf 100644 --- a/slsDetectorSoftware/jungfrauDetectorServer/gitInfoJungfrau.h +++ b/slsDetectorSoftware/jungfrauDetectorServer/gitInfoJungfrau.h @@ -1,11 +1,11 @@ //#define SVNPATH "" -#define SVNURL "git@git.psi.ch:sls_detectors_software/sls_detector_software.git/jungfrauDetectorServer" +#define SVNURL "git@git.psi.ch:sls_detectors_software/sls_detector_software.git" //#define SVNREPPATH "" -#define SVNREPUUID "ac8afb3a4dc53ac14f7034d281acc8f0a700ca8d" -//#define SVNREV 0x1442 +#define SVNREPUUID "9f1b82c18ab0893d65bfadeb646b8ea244614632" +//#define SVNREV 0x1443 //#define SVNKIND "" //#define SVNSCHED "" #define SVNAUTH "Dhanya_Maliakal" -#define SVNREV 0x1442 -#define SVNDATE 0x20170703 +#define SVNREV 0x1443 +#define SVNDATE 0x20170710 // diff --git a/slsDetectorSoftware/jungfrauDetectorServer/slsDetectorFunctionList.c b/slsDetectorSoftware/jungfrauDetectorServer/slsDetectorFunctionList.c index b9a69cb79..839a86e63 100644 --- a/slsDetectorSoftware/jungfrauDetectorServer/slsDetectorFunctionList.c +++ b/slsDetectorSoftware/jungfrauDetectorServer/slsDetectorFunctionList.c @@ -25,11 +25,11 @@ int32_t clkPhase[2] = {0, 0}; /* basic tests */ -void checkFirmwareCompatibility(){ +void checkFirmwareCompatibility() { defineGPIOpins(); resetFPGA(); - if ((mapCSP0() == FAIL) || (checkType() == FAIL) || (testFpga() == FAIL) || (testBus() == FAIL) ) { + if ((mapCSP0() == FAIL) || (checkType() == FAIL) || (testFpga() == FAIL) || (testBus() == FAIL)) { cprintf(BG_RED, "Dangerous to continue. Goodbye!\n"); exit(EXIT_FAILURE); } diff --git a/slsDetectorSoftware/jungfrauDetectorServer/updateGitVersion.sh b/slsDetectorSoftware/jungfrauDetectorServer/updateGitVersion.sh index 7af48db8a..238c47eb6 100755 --- a/slsDetectorSoftware/jungfrauDetectorServer/updateGitVersion.sh +++ b/slsDetectorSoftware/jungfrauDetectorServer/updateGitVersion.sh @@ -1,34 +1,31 @@ SERVER=jungfrauDetectorServer +MAINDIR=slsDetectorsPackage +SPECDIR=slsDetectorSoftware/$SERVER TMPFILE=gitInfoJungfrauTmp.h INCLFILE=gitInfoJungfrau.h -WD=slsDetectorSoftware/$SERVER -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 ../slsDetectorServer . -type f -exec stat --format '%Y :%y %n' '{}' \; | sort -nr | cut -d: -f2- | egrep -v 'gitInfo|bin|.git|updateGitVersion|.o' | head -n 1" RDATE=`eval $RDATE1` -echo Path: slsDetectorsPackage/$WD $'\n'URL: ${GITREPO}/$SERVER $'\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 $WD/gitInfo.txt $WD/$TMPFILE $WD/$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 \ No newline at end of file diff --git a/slsDetectorSoftware/moenchDetectorServer/Makefile b/slsDetectorSoftware/moenchDetectorServer/Makefile index a38c7f521..490d4761b 100755 --- a/slsDetectorSoftware/moenchDetectorServer/Makefile +++ b/slsDetectorSoftware/moenchDetectorServer/Makefile @@ -21,13 +21,15 @@ OBJS = $(SRCS:%.c=%.o) -all: clean $(PROGS) +all: clean versioning $(PROGS) boot: $(OBJS) +versioning: + @echo `tput setaf 6; ./updateGitVersion.sh; tput sgr0;` + $(PROGS): $(OBJS) echo $(OBJS) - @echo `tput setaf 6; ./updateGitVersion.sh; tput sgr0;` $(CC) $(CFLAGS) -o $@ $^ $(LDLIBS_$@) $(LDFLAGS_$@) diff --git a/slsDetectorSoftware/moenchDetectorServer/gitInfo.txt b/slsDetectorSoftware/moenchDetectorServer/gitInfo.txt index 2fc4e3520..178eb0fa1 100644 --- a/slsDetectorSoftware/moenchDetectorServer/gitInfo.txt +++ b/slsDetectorSoftware/moenchDetectorServer/gitInfo.txt @@ -1,9 +1,9 @@ Path: slsDetectorsPackage/slsDetectorSoftware/moenchDetectorServer -URL: origin git@git.psi.ch:sls_detectors_software/sls_detector_software.git/moenchDetectorServer +URL: origin git@git.psi.ch:sls_detectors_software/sls_detector_software.git Repository Root: origin git@git.psi.ch:sls_detectors_software/sls_detector_software.git -Repsitory UUID: 8aceb5d4b0ca6bd95a11b53e7a799b463b92d51b -Revision: 80 +Repsitory UUID: 9f1b82c18ab0893d65bfadeb646b8ea244614632 +Revision: 83 Branch: developer Last Changed Author: Dhanya_Maliakal -Last Changed Rev: 334 -Last Changed Date: 2016-08-12 11:08:03 +0200 +Last Changed Rev: 1443 +Last Changed Date: 2017-07-10 11:03:27.000000002 +0200 ./Makefile diff --git a/slsDetectorSoftware/moenchDetectorServer/gitInfoMoench.h b/slsDetectorSoftware/moenchDetectorServer/gitInfoMoench.h index 13579414d..3f01d08bf 100644 --- a/slsDetectorSoftware/moenchDetectorServer/gitInfoMoench.h +++ b/slsDetectorSoftware/moenchDetectorServer/gitInfoMoench.h @@ -1,11 +1,11 @@ //#define SVNPATH "" -#define SVNURL "git@git.psi.ch:sls_detectors_software/sls_detector_software.git/moenchDetectorServer" +#define SVNURL "git@git.psi.ch:sls_detectors_software/sls_detector_software.git" //#define SVNREPPATH "" -#define SVNREPUUID "8aceb5d4b0ca6bd95a11b53e7a799b463b92d51b" -//#define SVNREV 0x334 +#define SVNREPUUID "9f1b82c18ab0893d65bfadeb646b8ea244614632" +//#define SVNREV 0x1443 //#define SVNKIND "" //#define SVNSCHED "" #define SVNAUTH "Dhanya_Maliakal" -#define SVNREV 0x334 -#define SVNDATE 0x20160812 +#define SVNREV 0x1443 +#define SVNDATE 0x20170710 // diff --git a/slsDetectorSoftware/moenchDetectorServer/updateGitVersion.sh b/slsDetectorSoftware/moenchDetectorServer/updateGitVersion.sh index 379ebf785..3ad0a2b06 100755 --- a/slsDetectorSoftware/moenchDetectorServer/updateGitVersion.sh +++ b/slsDetectorSoftware/moenchDetectorServer/updateGitVersion.sh @@ -1,34 +1,31 @@ SERVER=moenchDetectorServer +MAINDIR=slsDetectorsPackage +SPECDIR=slsDetectorSoftware/$SERVER TMPFILE=gitInfoMoenchTmp.h INCLFILE=gitInfoMoench.h -WD=slsDetectorSoftware/$SERVER -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|.git|updateGitVersion|.o' | head -n 1" RDATE=`eval $RDATE1` -echo Path: slsDetectorsPackage/$WD $'\n'URL: ${GITREPO}/$SERVER $'\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 $WD/gitInfo.txt $WD/$TMPFILE $WD/$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 \ No newline at end of file diff --git a/slsDetectorSoftware/mythenDetectorServer/Makefile b/slsDetectorSoftware/mythenDetectorServer/Makefile index a4eed6cdc..da0c0f291 100755 --- a/slsDetectorSoftware/mythenDetectorServer/Makefile +++ b/slsDetectorSoftware/mythenDetectorServer/Makefile @@ -21,11 +21,15 @@ CFLAGS+= -Wall -DC_ONLY -DMCB_FUNCS -DDACS_INT $(VFLAGS) LDLIBS+= -lm -mythen: clean $(PROGS) -all: updateVersion $(PROGS) +mythen: clean versioning $(PROGS) +all: versioning $(PROGS) boot: $(OBJS) +versioning: + @echo `tput setaf 6; ./updateGitVersion.sh; tput sgr0;` + + $(PROGS): $(OBJS) echo $(OBJS) $(CC) $(LDFLAGS) $^ $(LDLIBS) $(CFLAGS) -o $@ @@ -39,7 +43,4 @@ clean: depend: makedepend -Y -- $(CFLAGS) -- $(SRCS) 2>/dev/null - -updateVersion: - ./updateGitVersion.sh \ No newline at end of file diff --git a/slsDetectorSoftware/mythenDetectorServer/Makefile.dum b/slsDetectorSoftware/mythenDetectorServer/Makefile.dum index bd74d1e2e..4656a39bf 100644 --- a/slsDetectorSoftware/mythenDetectorServer/Makefile.dum +++ b/slsDetectorSoftware/mythenDetectorServer/Makefile.dum @@ -18,7 +18,7 @@ CFLAGS+= -Wall -DC_ONLY -DVERBOSE LDLIBS+= -lm -all: updateVersion $(PROGS) +all: versioning $(PROGS) boot: $(OBJS) @@ -36,6 +36,5 @@ clean: depend: makedepend -Y -- $(CFLAGS) -- $(SRCS) 2>/dev/null -updateVersion: - ./updateGitVersion.sh - \ No newline at end of file +versioning: + @echo `tput setaf 6; ./updateGitVersion.sh; tput sgr0;` \ No newline at end of file diff --git a/slsDetectorSoftware/mythenDetectorServer/Makefile.picasso b/slsDetectorSoftware/mythenDetectorServer/Makefile.picasso index 11e3645fd..48d204135 100644 --- a/slsDetectorSoftware/mythenDetectorServer/Makefile.picasso +++ b/slsDetectorSoftware/mythenDetectorServer/Makefile.picasso @@ -21,8 +21,8 @@ CFLAGS+= -Wall -DC_ONLY -DMCB_FUNCS -DVERBOSE -DVERYVERBOSE -DPICASSOD LDLIBS+= -lm picasso: $(PICASSO) -mythen: $(PROGS) -all: $(PROGS) $(PICASSO) +mythen: versioning $(PROGS) +all: versioning $(PROGS) $(PICASSO) boot: $(OBJS) @@ -44,3 +44,6 @@ clean: depend: makedepend -Y -- $(CFLAGS) -- $(SRCS) 2>/dev/null + +versioning: + @echo `tput setaf 6; ./updateGitVersion.sh; tput sgr0;` \ No newline at end of file diff --git a/slsDetectorSoftware/mythenDetectorServer/updateGitVersion.sh b/slsDetectorSoftware/mythenDetectorServer/updateGitVersion.sh index 3fd1bdb1c..6889e628d 100755 --- a/slsDetectorSoftware/mythenDetectorServer/updateGitVersion.sh +++ b/slsDetectorSoftware/mythenDetectorServer/updateGitVersion.sh @@ -1,37 +1,31 @@ SERVER=mythenDetectorServer +MAINDIR=slsDetectorsPackage +SPECDIR=slsDetectorSoftware/$SERVER TMPFILE=gitInfoMythenTmp.h INCLFILE=gitInfoMythen.h -WD=slsDetectorSoftware/$SERVER -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 ../slsDetectorServer . -type f -exec stat --format '%Y :%y %n' '{}' \; | sort -nr | cut -d: -f2- | egrep -v 'gitInfo|bin|.git|updateGitVersion|.o' | head -n 1" RDATE=`eval $RDATE1` -echo Path: slsDetectorsPackage/$WD $'\n'URL: ${GITREPO}/$SERVER $'\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 $WD/gitInfo.txt $WD/$TMPFILE $WD/$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 \ No newline at end of file diff --git a/slsDetectorSoftware/slsDetector/gitInfoLib.h b/slsDetectorSoftware/slsDetector/gitInfoLib.h index c134bfad7..f7474c5df 100644 --- a/slsDetectorSoftware/slsDetector/gitInfoLib.h +++ b/slsDetectorSoftware/slsDetector/gitInfoLib.h @@ -1,11 +1,11 @@ //#define SVNPATH "" #define SVNURLLIB "git@git.psi.ch:sls_detectors_software/sls_detector_software.git" //#define SVNREPPATH "" -#define SVNREPUUIDLIB "79271ea7e3f5ac7113582e694b30b71a64d18844" -//#define SVNREV 0x1441 +#define SVNREPUUIDLIB "9f1b82c18ab0893d65bfadeb646b8ea244614632" +//#define SVNREV 0x1443 //#define SVNKIND "" //#define SVNSCHED "" #define SVNAUTHLIB "Dhanya_Maliakal" -#define SVNREVLIB 0x1441 -#define SVNDATELIB 0x20170703 +#define SVNREVLIB 0x1443 +#define SVNDATELIB 0x20170710 // diff --git a/slsDetectorSoftware/slsDetectorServer/slsDetectorServer_funcs.c b/slsDetectorSoftware/slsDetectorServer/slsDetectorServer_funcs.c index 2b1894494..7b076878d 100755 --- a/slsDetectorSoftware/slsDetectorServer/slsDetectorServer_funcs.c +++ b/slsDetectorSoftware/slsDetectorServer/slsDetectorServer_funcs.c @@ -11,7 +11,6 @@ // Global variables - extern int lockStatus; extern char lastClientIP[INET_ADDRSTRLEN]; extern char thisClientIP[INET_ADDRSTRLEN]; diff --git a/slsDetectorSoftware/updateGitVersion.sh b/slsDetectorSoftware/updateGitVersion.sh index 021211764..a8f638fab 100755 --- a/slsDetectorSoftware/updateGitVersion.sh +++ b/slsDetectorSoftware/updateGitVersion.sh @@ -4,34 +4,25 @@ TMPFILE=slsDetector/gitInfoLibTmp.h INCLFILE=slsDetector/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' +#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 \ No newline at end of file