From 68b1959a8557f418e867ca8d17006d9b5c459861 Mon Sep 17 00:00:00 2001 From: Dhanya Maliakal Date: Tue, 11 Jul 2017 11:16:37 +0200 Subject: [PATCH] excluding detector server directories in makefile --- slsDetectorSoftware/gitInfo.txt | 8 ++++---- slsDetectorSoftware/slsDetector/gitInfoLib.h | 8 ++++---- slsDetectorSoftware/updateGitVersion.sh | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/slsDetectorSoftware/gitInfo.txt b/slsDetectorSoftware/gitInfo.txt index 33a141e1f..ae6bbd4ea 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: 9f1b82c18ab0893d65bfadeb646b8ea244614632 -Revision: 1438 +Repsitory UUID: 5719fa8e7143d444cc9ca6ba81444541b179e317 +Revision: 1440 Branch: developer Last Changed Author: Dhanya_Maliakal -Last Changed Rev: 1443 -Last Changed Date: 2017-07-10 11:06:07.000000002 +0200 ./eigerDetectorServer/Feb.o +Last Changed Rev: 1445 +Last Changed Date: 2017-07-11 11:09:53.000000002 +0200 ./slsDetectorAnalysis/postProcessing.o diff --git a/slsDetectorSoftware/slsDetector/gitInfoLib.h b/slsDetectorSoftware/slsDetector/gitInfoLib.h index f7474c5df..5f891d220 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 "9f1b82c18ab0893d65bfadeb646b8ea244614632" -//#define SVNREV 0x1443 +#define SVNREPUUIDLIB "5719fa8e7143d444cc9ca6ba81444541b179e317" +//#define SVNREV 0x1445 //#define SVNKIND "" //#define SVNSCHED "" #define SVNAUTHLIB "Dhanya_Maliakal" -#define SVNREVLIB 0x1443 -#define SVNDATELIB 0x20170710 +#define SVNREVLIB 0x1445 +#define SVNDATELIB 0x20170711 // diff --git a/slsDetectorSoftware/updateGitVersion.sh b/slsDetectorSoftware/updateGitVersion.sh index a8f638fab..8a0f17dec 100755 --- a/slsDetectorSoftware/updateGitVersion.sh +++ b/slsDetectorSoftware/updateGitVersion.sh @@ -10,7 +10,7 @@ source $EVALFILE #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" +RDATE1="find . -not -path '*DetectorServer/*' -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` NEWDATE=$(sed "s/-//g" <<< $RDATE | awk '{print $1;}') NEWDATE=${NEWDATE/#/0x}