changed all variables from svn to git, included --version for receiver binary

2025-04-19 18:40:01 +02:00 · 2017-12-06 10:29:57 +01:00 · 2017-12-06 10:29:57 +01:00 · c4a242e10a
commit c4a242e10a
parent 7436d6c8d3
39 changed files with 154 additions and 243 deletions
--- a/genVersionHeader.sh
+++ b/genVersionHeader.sh
@ -21,5 +21,5 @@ echo "Updating $fout"
 #awk 'NR==FNR {if ($3=="Date:") {l[FNR]=$4; gsub("-","",l[FNR]);} else { if (match($0,"Rev")) {l[FNR]=$(NF);} else {l[FNR]="\""$(NF)"\"";};};next} {$0=$1" "$2" "l[FNR]}1' $fin $ftmp > $fout

 awk 'BEGIN {l[0]=0; "date +%Y%m%d" | getline l[1]; l[2]="\"/\""; l[3]="\"nobody\""; l[3]="\"nobody\""; l[4]="\"0000-0000-0000\"";} \
-NR==FNR {if (match($0,"Rev")) {l[0]="0x"$(NF);} else if (match($0,"Date")) {l[1]="0x"$4; gsub("-","",l[1]);} else if (match($0,"URL")) {l[2]="\""$(NF)"\"";} else if (match($0,"Author")) {l[3]="\""$(NF)"\"";} else if (match($0,"UUID")) {l[4]="\""$(NF)"\"";};next;} 
-{if (match($2,"REV")) {$0=$1" "$2" "l[0];} else if (match($2,"DATE")) {$0=$1" "$2" "l[1];} else if (match($2,"URL")) {$0=$1" "$2" "l[2];} else if (match($2,"AUTH")) {$0=$1" "$2" "l[3];} else if (match($2,"UUID")) {$0=$1" "$2" "l[4];}}1' $fin $ftmp > $fout
+NR==FNR {if (match($0,"Rev")) {l[0]="0x"$(NF);} else if (match($0,"Date")) {l[1]="0x"$4; gsub("-","",l[1]);} else if (match($0,"URL")) {l[2]="\""$(NF)"\"";} else if (match($0,"Author")) {l[3]="\""$(NF)"\"";} else if (match($0,"UUID")) {l[4]="\""$(NF)"\"";} else if (match($0,"Branch")) {l[5]="\""$(NF)"\"";};next;} 
+{if (match($2,"REV")) {$0=$1" "$2" "l[0];} else if (match($2,"DATE")) {$0=$1" "$2" "l[1];} else if (match($2,"URL")) {$0=$1" "$2" "l[2];} else if (match($2,"AUTH")) {$0=$1" "$2" "l[3];} else if (match($2,"UUID")) {$0=$1" "$2" "l[4];} else if (match($2,"BRANCH")) {$0=$1" "$2" "l[5];}}1' $fin $ftmp > $fout
--- a/slsDetectorGui/include/gitInfoGui.h
+++ b/slsDetectorGui/include/gitInfoGui.h
@ -1,11 +1,6 @@
-//#define SVNPATH ""
-#define SVNURL "git@git.psi.ch:sls_detectors_software/slsDetectorPackage.git"
-//#define SVNREPPATH ""
-#define SVNREPUUID "b498043ea612fa3148bf1d7ea2a39c46092addf8"
-//#define SVNREV 0x3185
-//#define SVNKIND ""
-//#define SVNSCHED ""
-#define SVNAUTH "Dhanya_Maliakal"
-#define SVNREV 0x3185
-#define SVNDATE 0x20171206
-//
+#define GITURL "git@git.psi.ch:sls_detectors_software/slsDetectorPackage.git"
+#define GITREPUUID "b498043ea612fa3148bf1d7ea2a39c46092addf8"
+#define GITAUTH "Dhanya_Maliakal"
+#define GITREV 0x3185
+#define GITDATE 0x20171206
+#define GITBRANCH "blabla"
--- a/slsDetectorGui/include/gitInfoGuiTmp.h
+++ b/slsDetectorGui/include/gitInfoGuiTmp.h
@ -1,11 +1,6 @@
-//#define SVNPATH ""
-#define SVNURL ""
-//#define SVNREPPATH ""
-#define SVNREPUUID ""
-//#define SVNREV ""
-//#define SVNKIND ""
-//#define SVNSCHED ""
-#define SVNAUTH ""
-#define SVNREV ""
-#define SVNDATE ""
-//
+#define GITURL ""
+#define GITREPUUID ""
+#define GITAUTH ""
+#define GITREV ""
+#define GITDATE ""
+#define GITBRANCH ""
--- a/slsDetectorGui/src/qDetectorMain.cpp
+++ b/slsDetectorGui/src/qDetectorMain.cpp
@ -658,8 +658,8 @@ void qDetectorMain::ExecuteHelp(QAction *action){
 		cout << "About: Common GUI for Mythen, Eiger, Gotthard, Jungfrau, Moench and Propix detectors" << endl;
 #endif
 		char version[200];
-		long long unsigned int retval= SVNREV;
-		retval= (retval <<32) | SVNDATE;
+		long long unsigned int retval= GITREV;
+		retval= (retval <<32) | GITDATE;
 		sprintf(version,"%llx",retval);
 		string thisGUIVersion = string(version);

--- a/slsDetectorGui/updateGitVersion.sh
+++ b/slsDetectorGui/updateGitVersion.sh
@ -16,7 +16,7 @@ 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}')
+OLDDATE=$(more $INCLFILE | grep '#define GITDATE' | 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 
--- a/slsDetectorSoftware/eigerDetectorServer/gitInfoEiger.h
+++ b/slsDetectorSoftware/eigerDetectorServer/gitInfoEiger.h
@ -1,11 +1,6 @@
-//#define SVNPATH ""
-#define SVNURL "git@git.psi.ch:sls_detectors_software/sls_detector_software.git"
-//#define SVNREPPATH ""
-#define SVNREPUUID "a161a9aad8ac38a79ba43340344a3c923cea85f7"
-//#define SVNREV 0x1578
-//#define SVNKIND ""
-//#define SVNSCHED ""
-#define SVNAUTH "Dhanya_Thattil"
-#define SVNREV 0x1578
-#define SVNDATE 0x20171011
-//
+#define GITURL "git@git.psi.ch:sls_detectors_software/sls_detector_software.git"
+#define GITREPUUID "a161a9aad8ac38a79ba43340344a3c923cea85f7"
+#define GITAUTH "Dhanya_Thattil"
+#define GITREV 0x1578
+#define GITDATE 0x20171011
+#define GITBRANCH "blabla"
--- a/slsDetectorSoftware/eigerDetectorServer/gitInfoEigerTmp.h
+++ b/slsDetectorSoftware/eigerDetectorServer/gitInfoEigerTmp.h
@ -1,11 +1,6 @@
-//#define SVNPATH ""
-#define SVNURL ""
-//#define SVNREPPATH ""
-#define SVNREPUUID ""
-//#define SVNREV ""
-//#define SVNKIND ""
-//#define SVNSCHED ""
-#define SVNAUTH ""
-#define SVNREV ""
-#define SVNDATE ""
-//
+#define GITURL ""
+#define GITREPUUID ""
+#define GITAUTH ""
+#define GITREV ""
+#define GITDATE ""
+#define GITBRANCH ""
--- a/slsDetectorSoftware/eigerDetectorServer/slsDetectorFunctionList.c
+++ b/slsDetectorSoftware/eigerDetectorServer/slsDetectorFunctionList.c
@ -134,9 +134,9 @@ int64_t getDetectorId(enum idMode arg){
 	case SOFTWARE_FIRMWARE_API_VERSION:
 		return (int64_t)Beb_GetFirmwareSoftwareAPIVersion();
 	case DETECTOR_SOFTWARE_VERSION:
-		retval= SVNREV;
-		retval= (retval <<32) | SVNDATE;
-		//cprintf(BLUE,"git date:%x, git rev:%x\n",SVNDATE,SVNREV);
+		retval= GITREV;
+		retval= (retval <<32) | GITDATE;
+		//cprintf(BLUE,"git date:%x, git rev:%x\n",GITDATE,GITREV);
 		break;
 	default:
 		break;
--- a/slsDetectorSoftware/eigerDetectorServer/updateGitVersion.sh
+++ b/slsDetectorSoftware/eigerDetectorServer/updateGitVersion.sh
@ -18,7 +18,7 @@ NEWDATE=${NEWDATE/#/0x}


 #get old date from INCLFILE
-OLDDATE=$(more $INCLFILE | grep '#define SVNDATE' | awk '{print $3}')
+OLDDATE=$(more $INCLFILE | grep '#define GITDATE' | awk '{print $3}')


 #update INCLFILE if changes
--- a/slsDetectorSoftware/gotthardDetectorServer/gitInfoGotthard.h
+++ b/slsDetectorSoftware/gotthardDetectorServer/gitInfoGotthard.h
@ -1,11 +1,6 @@
-//#define SVNPATH ""
-#define SVNURL "git@git.psi.ch:sls_detectors_software/sls_detector_software.git"
-//#define SVNREPPATH ""
-#define SVNREPUUID "c5777e517c451226e3275e6948895baee21a1f94"
-//#define SVNREV 0x1585
-//#define SVNKIND ""
-//#define SVNSCHED ""
-#define SVNAUTH "Dhanya_Maliakal"
-#define SVNREV 0x1585
-#define SVNDATE 0x20171109
-//
+#define GITURL "git@git.psi.ch:sls_detectors_software/sls_detector_software.git"
+#define GITREPUUID "c5777e517c451226e3275e6948895baee21a1f94"
+#define GITAUTH "Dhanya_Maliakal"
+#define GITREV 0x1585
+#define GITDATE 0x20171109
+#define GITBRANCH "blabla"
--- a/slsDetectorSoftware/gotthardDetectorServer/gitInfoGotthardTmp.h
+++ b/slsDetectorSoftware/gotthardDetectorServer/gitInfoGotthardTmp.h
@ -1,11 +1,6 @@
-//#define SVNPATH ""
-#define SVNURL ""
-//#define SVNREPPATH ""
-#define SVNREPUUID ""
-//#define SVNREV ""
-//#define SVNKIND ""
-//#define SVNSCHED ""
-#define SVNAUTH ""
-#define SVNREV ""
-#define SVNDATE ""
-//
+#define GITURL ""
+#define GITREPUUID ""
+#define GITAUTH ""
+#define GITREV ""
+#define GITDATE ""
+#define GITBRANCH ""
--- a/slsDetectorSoftware/gotthardDetectorServer/server_funcs.c
+++ b/slsDetectorSoftware/gotthardDetectorServer/server_funcs.c
@ -592,12 +592,9 @@ int get_id(int file_des) {
    retval=(retval <<32) | getFirmwareVersion();
    break;
  case DETECTOR_SOFTWARE_VERSION:
-	retval= SVNREV;
-	retval= (retval <<32) | SVNDATE;
+	retval= GITREV;
+	retval= (retval <<32) | GITDATE;
    break;
-/*  case DETECTOR_FIRMWARE_SVN_VERSION:
-    retval=getFirmwareSVNVersion();
-    break;*/
  default:
    printf("Required unknown id %d \n", arg);
    ret=FAIL;
--- a/slsDetectorSoftware/gotthardDetectorServer/updateGitVersion.sh
+++ b/slsDetectorSoftware/gotthardDetectorServer/updateGitVersion.sh
@ -18,7 +18,7 @@ NEWDATE=${NEWDATE/#/0x}


 #get old date from INCLFILE
-OLDDATE=$(more $INCLFILE | grep '#define SVNDATE' | awk '{print $3}')
+OLDDATE=$(more $INCLFILE | grep '#define GITDATE' | awk '{print $3}')


 #update INCLFILE if changes
--- a/slsDetectorSoftware/jctbDetectorServer/gitInfoMoench.h
+++ b/slsDetectorSoftware/jctbDetectorServer/gitInfoMoench.h
@ -1,11 +1,6 @@
-//#define SVNPATH ""
-#define SVNURL "git@gitorious.psi.ch:sls_det_software/sls_detector_software.git/moenchDetectorServer"
-//#define SVNREPPATH ""
-#define SVNREPUUID "046a469b1e6582c4c55bd6eaeb4818b618d0a9a9"
-//#define SVNREV 0x14
-//#define SVNKIND ""
-//#define SVNSCHED ""
-#define SVNAUTH "Maliakal_Dhanya"
-#define SVNREV 0x14
-#define SVNDATE 0x20140603
-//
+#define GITURL "git@gitorious.psi.ch:sls_det_software/sls_detector_software.git/moenchDetectorServer"
+#define GITREPUUID "046a469b1e6582c4c55bd6eaeb4818b618d0a9a9"
+#define GITAUTH "Maliakal_Dhanya"
+#define GITREV 0x14
+#define GITDATE 0x20140603
+#define GITBRANCH "blabla"
--- a/slsDetectorSoftware/jctbDetectorServer/gitInfoMoenchTmp.h
+++ b/slsDetectorSoftware/jctbDetectorServer/gitInfoMoenchTmp.h
@ -1,11 +1,6 @@
-//#define SVNPATH ""
-#define SVNURL ""
-//#define SVNREPPATH ""
-#define SVNREPUUID ""
-//#define SVNREV ""
-//#define SVNKIND ""
-//#define SVNSCHED ""
-#define SVNAUTH ""
-#define SVNREV ""
-#define SVNDATE ""
-//
+#define GITURL ""
+#define GITREPUUID ""
+#define GITAUTH ""
+#define GITREV ""
+#define GITDATE ""
+#define GITBRANCH ""
--- a/slsDetectorSoftware/jctbDetectorServer/server_funcs.c
+++ b/slsDetectorSoftware/jctbDetectorServer/server_funcs.c
@ -624,12 +624,9 @@ int get_id(int file_des) {
    retval=(retval <<32) | getFirmwareVersion();
    break;
  case DETECTOR_SOFTWARE_VERSION:
-	retval= SVNREV;
-	retval= (retval <<32) | SVNDATE;
+	retval= GITREV;
+	retval= (retval <<32) | GITDATE;
    break;
-/*  case DETECTOR_FIRMWARE_SVN_VERSION:
-    retval=getFirmwareSVNVersion();
-    break;*/
  default:
    printf("Required unknown id %d \n", arg);
    ret=FAIL;
--- a/slsDetectorSoftware/jctbDetectorServer/updateGitVersion.sh
+++ b/slsDetectorSoftware/jctbDetectorServer/updateGitVersion.sh
@ -19,7 +19,7 @@ NEWDATE=${NEWDATE/#/0x}


 #get old date from INCLFILE
-OLDDATE=$(more $INCLFILE | grep '#define SVNDATE' | awk '{print $3}')
+OLDDATE=$(more $INCLFILE | grep '#define GITDATE' | awk '{print $3}')


 #update INCLFILE if changes
--- a/slsDetectorSoftware/jungfrauDetectorServer/gitInfoJungfrau.h
+++ b/slsDetectorSoftware/jungfrauDetectorServer/gitInfoJungfrau.h
@ -1,11 +1,6 @@
-//#define SVNPATH ""
-#define SVNURL "git@git.psi.ch:sls_detectors_software/sls_detector_software.git"
-//#define SVNREPPATH ""
-#define SVNREPUUID "3c1eb747d1930d6d38030a5a607f72d3b58a7a21"
-//#define SVNREV 0x1549
-//#define SVNKIND ""
-//#define SVNSCHED ""
-#define SVNAUTH "Dhanya_Maliakal"
-#define SVNREV 0x1549
-#define SVNDATE 0x20171025
-//
+#define GITURL "git@git.psi.ch:sls_detectors_software/sls_detector_software.git"
+#define GITREPUUID "3c1eb747d1930d6d38030a5a607f72d3b58a7a21"
+#define GITAUTH "Dhanya_Maliakal"
+#define GITREV 0x1549
+#define GITDATE 0x20171025
+#define GITBRANCH "blabla"
--- a/slsDetectorSoftware/jungfrauDetectorServer/gitInfoJungfrauTmp.h
+++ b/slsDetectorSoftware/jungfrauDetectorServer/gitInfoJungfrauTmp.h
@ -1,11 +1,6 @@
-//#define SVNPATH ""
-#define SVNURL ""
-//#define SVNREPPATH ""
-#define SVNREPUUID ""
-//#define SVNREV ""
-//#define SVNKIND ""
-//#define SVNSCHED ""
-#define SVNAUTH ""
-#define SVNREV ""
-#define SVNDATE ""
-//
+#define GITURL ""
+#define GITREPUUID ""
+#define GITAUTH ""
+#define GITREV ""
+#define GITDATE ""
+#define GITBRANCH ""
--- a/slsDetectorSoftware/jungfrauDetectorServer/slsDetectorFunctionList.c
+++ b/slsDetectorSoftware/jungfrauDetectorServer/slsDetectorFunctionList.c
@ -178,8 +178,8 @@ int64_t getDetectorId(enum idMode arg){
 	//case SOFTWARE_FIRMWARE_API_VERSION:
 	//return GetFirmwareSoftwareAPIVersion();
 	case DETECTOR_SOFTWARE_VERSION:
-		retval= SVNREV;
-		retval= (retval <<32) | SVNDATE;
+		retval= GITREV;
+		retval= (retval <<32) | GITDATE;
 		break;
 	default:
 		break;
--- a/slsDetectorSoftware/jungfrauDetectorServer/updateGitVersion.sh
+++ b/slsDetectorSoftware/jungfrauDetectorServer/updateGitVersion.sh
@ -19,7 +19,7 @@ NEWDATE=${NEWDATE/#/0x}


 #get old date from INCLFILE
-OLDDATE=$(more $INCLFILE | grep '#define SVNDATE' | awk '{print $3}')
+OLDDATE=$(more $INCLFILE | grep '#define GITDATE' | awk '{print $3}')


 #update INCLFILE if changes
--- a/slsDetectorSoftware/moenchDetectorServer/gitInfoMoench.h
+++ b/slsDetectorSoftware/moenchDetectorServer/gitInfoMoench.h
@ -1,11 +1,6 @@
-//#define SVNPATH ""
-#define SVNURL "git@git.psi.ch:sls_detectors_software/sls_detector_software.git"
-//#define SVNREPPATH ""
-#define SVNREPUUID "9f1b82c18ab0893d65bfadeb646b8ea244614632"
-//#define SVNREV 0x1443
-//#define SVNKIND ""
-//#define SVNSCHED ""
-#define SVNAUTH "Dhanya_Maliakal"
-#define SVNREV 0x1443
-#define SVNDATE 0x20170710
-//
+#define GITURL "git@git.psi.ch:sls_detectors_software/sls_detector_software.git"
+#define GITREPUUID "9f1b82c18ab0893d65bfadeb646b8ea244614632"
+#define GITAUTH "Dhanya_Maliakal"
+#define GITREV 0x1443
+#define GITDATE 0x20170710
+#define GITBRANCH "blabla"
--- a/slsDetectorSoftware/moenchDetectorServer/gitInfoMoenchTmp.h
+++ b/slsDetectorSoftware/moenchDetectorServer/gitInfoMoenchTmp.h
@ -1,11 +1,6 @@
-//#define SVNPATH ""
-#define SVNURL ""
-//#define SVNREPPATH ""
-#define SVNREPUUID ""
-//#define SVNREV ""
-//#define SVNKIND ""
-//#define SVNSCHED ""
-#define SVNAUTH ""
-#define SVNREV ""
-#define SVNDATE ""
-//
+#define GITURL ""
+#define GITREPUUID ""
+#define GITAUTH ""
+#define GITREV ""
+#define GITDATE ""
+#define GITBRANCH ""
--- a/slsDetectorSoftware/moenchDetectorServer/server_funcs.c
+++ b/slsDetectorSoftware/moenchDetectorServer/server_funcs.c
@ -597,12 +597,9 @@ int get_id(int file_des) {
    retval=(retval <<32) | getFirmwareVersion();
    break;
  case DETECTOR_SOFTWARE_VERSION:
-	retval= SVNREV;
-	retval= (retval <<32) | SVNDATE;
+	retval= GITREV;
+	retval= (retval <<32) | GITDATE;
    break;
-/*  case DETECTOR_FIRMWARE_SVN_VERSION:
-    retval=getFirmwareSVNVersion();
-    break;*/
  default:
    printf("Required unknown id %d \n", arg);
    ret=FAIL;
--- a/slsDetectorSoftware/moenchDetectorServer/updateGitVersion.sh
+++ b/slsDetectorSoftware/moenchDetectorServer/updateGitVersion.sh
@ -19,7 +19,7 @@ NEWDATE=${NEWDATE/#/0x}


 #get old date from INCLFILE
-OLDDATE=$(more $INCLFILE | grep '#define SVNDATE' | awk '{print $3}')
+OLDDATE=$(more $INCLFILE | grep '#define GITDATE' | awk '{print $3}')


 #update INCLFILE if changes
--- a/slsDetectorSoftware/mythenDetectorServer/gitInfoMythen.h
+++ b/slsDetectorSoftware/mythenDetectorServer/gitInfoMythen.h
@ -1,11 +1,6 @@
-//#define SVNPATH ""
-#define SVNURL "git@git.psi.ch:sls_detectors_software/sls_detector_software.git/mythenDetectorServer"
-//#define SVNREPPATH ""
-#define SVNREPUUID "8aceb5d4b0ca6bd95a11b53e7a799b463b92d51b"
-//#define SVNREV 0x334
-//#define SVNKIND ""
-//#define SVNSCHED ""
-#define SVNAUTH "Dhanya_Maliakal"
-#define SVNREV 0x334
-#define SVNDATE 0x20160812
-//
+#define GITURL "git@git.psi.ch:sls_detectors_software/sls_detector_software.git/mythenDetectorServer"
+#define GITREPUUID "8aceb5d4b0ca6bd95a11b53e7a799b463b92d51b"
+#define GITAUTH "Dhanya_Maliakal"
+#define GITREV 0x334
+#define GITDATE 0x20160812
+#define GITBRANCH "blabla"
--- a/slsDetectorSoftware/mythenDetectorServer/gitInfoMythenTmp.h
+++ b/slsDetectorSoftware/mythenDetectorServer/gitInfoMythenTmp.h
@ -1,11 +1,6 @@
-//#define SVNPATH ""
-#define SVNURL ""
-//#define SVNREPPATH ""
-#define SVNREPUUID ""
-//#define SVNREV ""
-//#define SVNKIND ""
-//#define SVNSCHED ""
-#define SVNAUTH ""
-#define SVNREV ""
-#define SVNDATE ""
-//
+#define GITURL ""
+#define GITREPUUID ""
+#define GITAUTH ""
+#define GITREV ""
+#define GITDATE ""
+#define GITBRANCH ""
--- a/slsDetectorSoftware/mythenDetectorServer/server_funcs.c
+++ b/slsDetectorSoftware/mythenDetectorServer/server_funcs.c
@ -586,8 +586,8 @@ int get_id(int file_des) {
    retval=getMcsVersion();
    break;
  case DETECTOR_SOFTWARE_VERSION:
-	retval= SVNREV;
-	retval= (retval <<32) | SVNDATE;
+	retval= GITREV;
+	retval= (retval <<32) | GITDATE;
 /*  sscanf(THIS_REVISION,"$Rev : %x",&rev1);
    rev=((int64_t)rev1);
    dat=THIS_SOFTWARE_VERSION;
--- a/slsDetectorSoftware/mythenDetectorServer/updateGitVersion.sh
+++ b/slsDetectorSoftware/mythenDetectorServer/updateGitVersion.sh
@ -19,7 +19,7 @@ NEWDATE=${NEWDATE/#/0x}


 #get old date from INCLFILE
-OLDDATE=$(more $INCLFILE | grep '#define SVNDATE' | awk '{print $3}')
+OLDDATE=$(more $INCLFILE | grep '#define GITDATE' | awk '{print $3}')


 #update INCLFILE if changes
--- a/slsDetectorSoftware/slsDetector/gitInfoLib.h
+++ b/slsDetectorSoftware/slsDetector/gitInfoLib.h
@ -1,11 +1,6 @@
-//#define SVNPATH ""
-#define SVNURLLIB "git@git.psi.ch:sls_detectors_software/slsDetectorPackage.git"
-//#define SVNREPPATH ""
-#define SVNREPUUIDLIB "b498043ea612fa3148bf1d7ea2a39c46092addf8"
-//#define SVNREV 0x3185
-//#define SVNKIND ""
-//#define SVNSCHED ""
-#define SVNAUTHLIB "Dhanya_Maliakal"
-#define SVNREVLIB 0x3185
-#define SVNDATELIB 0x20171206
-//
+#define GITURL "git@git.psi.ch:sls_detectors_software/slsDetectorPackage.git"
+#define GITREPUUID "b498043ea612fa3148bf1d7ea2a39c46092addf8"
+#define GITAUTH "Dhanya_Maliakal"
+#define GITREV 0x3185
+#define GITDATE 0x20171206
+#define GITBRANCH "blabla"
--- a/slsDetectorSoftware/slsDetector/gitInfoLibTmp.h
+++ b/slsDetectorSoftware/slsDetector/gitInfoLibTmp.h
@ -1,11 +1,6 @@
-//#define SVNPATH ""
-#define SVNURLLIB "/root/"
-//#define SVNREPPATH ""
-#define SVNREPUUIDLIB "00000-00000-00000"
-//#define SVNREV ""
-//#define SVNKIND ""
-//#define SVNSCHED ""
-#define SVNAUTHLIB "nobody"
-#define SVNREVLIB 0
-#define SVNDATELIB 20000101
-//
+#define GITURL ""
+#define GITREPUUID ""
+#define GITAUTH ""
+#define GITREV ""
+#define GITDATE ""
+#define GITBRANCH ""
--- a/slsDetectorSoftware/slsDetector/slsDetector.cpp
+++ b/slsDetectorSoftware/slsDetector/slsDetector.cpp
@ -2156,8 +2156,8 @@ int64_t slsDetector::getId( idMode mode, int imod){
 #endif
  if (mode==THIS_SOFTWARE_VERSION) {
    ret=OK;
-    retval=SVNREVLIB;
-    retval=(retval<<32) | SVNDATELIB;
+    retval=GITREV;
+    retval=(retval<<32) | GITDATE;
  } else if (mode==RECEIVER_VERSION) {
    if (thisDetector->receiverOnlineFlag==ONLINE_FLAG) {
    	if (connectData() == OK){
--- a/slsDetectorSoftware/updateGitVersion.sh
+++ b/slsDetectorSoftware/updateGitVersion.sh
@ -16,7 +16,7 @@ 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}')
+OLDDATE=$(more $INCLFILE | grep '#define GITDATE' | awk '{print $3}')


 #update INCLFILE if changes
--- a/slsReceiverSoftware/gitInfo.txt
+++ b/slsReceiverSoftware/gitInfo.txt
@ -1,9 +1,9 @@
 Path: slsDetectorsPackage/slsReceiverSoftware 
 URL: origin git@git.psi.ch:sls_detectors_software/slsDetectorPackage.git 
 Repository Root: origin git@git.psi.ch:sls_detectors_software/slsDetectorPackage.git 
-Repsitory UUID: b498043ea612fa3148bf1d7ea2a39c46092addf8 
-Revision: 687 
+Repsitory UUID: 7436d6c8d3538cef443e0fa76bc01762fd6cc246 
+Revision: 688 
 Branch: 3.0.1 
 Last Changed Author: Dhanya_Maliakal 
-Last Changed Rev: 3185 
-Last Changed Date: 2017-12-06 08:43:21.000000002 +0100 ./src/UDPStandardImplementation.cpp
+Last Changed Rev: 3186 
+Last Changed Date: 2017-12-06 08:45:14.000000002 +0100 ./src/UDPStandardImplementation.cpp
--- a/slsReceiverSoftware/include/gitInfoReceiver.h
+++ b/slsReceiverSoftware/include/gitInfoReceiver.h
@ -1,11 +1,6 @@
-//#define SVNPATH ""
-#define SVNURL "git@git.psi.ch:sls_detectors_software/slsDetectorPackage.git"
-//#define SVNREPPATH ""
-#define SVNREPUUID "b498043ea612fa3148bf1d7ea2a39c46092addf8"
-//#define SVNREV 0x3185
-//#define SVNKIND ""
-//#define SVNSCHED ""
-#define SVNAUTH "Dhanya_Maliakal"
-#define SVNREV 0x3185
-#define SVNDATE 0x20171206
-//
+#define GITURL "git@git.psi.ch:sls_detectors_software/slsDetectorPackage.git"
+#define GITREPUUID "7436d6c8d3538cef443e0fa76bc01762fd6cc246"
+#define GITAUTH "Dhanya_Maliakal"
+#define GITREV 0x3186
+#define GITDATE 0x20171206
+#define GITBRANCH "3.0.1"
--- a/slsReceiverSoftware/include/gitInfoReceiverTmp.h
+++ b/slsReceiverSoftware/include/gitInfoReceiverTmp.h
@ -1,11 +1,6 @@
-//#define SVNPATH ""
-#define SVNURL ""
-//#define SVNREPPATH ""
-#define SVNREPUUID ""
-//#define SVNREV ""
-//#define SVNKIND ""
-//#define SVNSCHED ""
-#define SVNAUTH ""
-#define SVNREV ""
-#define SVNDATE ""
-//
+#define GITURL ""
+#define GITREPUUID ""
+#define GITAUTH ""
+#define GITREV ""
+#define GITDATE ""
+#define GITBRANCH ""
--- a/slsReceiverSoftware/src/slsReceiver.cpp
+++ b/slsReceiverSoftware/src/slsReceiver.cpp
@ -12,7 +12,7 @@
 #include <getopt.h>

 #include "slsReceiver.h"
-//#include "UDPInterface.h"
+#include "gitInfoReceiver.h"

 using namespace std;

@ -36,6 +36,7 @@ slsReceiver::slsReceiver(int argc, char *argv[], int &success):
 		// These options don’t set a flag. We distinguish them by their indices.
 		{"config",     	required_argument,  0, 'f'},
 		{"rx_tcpport",  required_argument,  0, 't'},
+		{"version",  	no_argument,  		0, 'v'},
 		{"help",  		no_argument,       	0, 'h'},
 		{0, 			0, 					0, 	0}
        };
@ -44,8 +45,10 @@ slsReceiver::slsReceiver(int argc, char *argv[], int &success):
 	int c=0;
 	optind = 1;
 	
+	int64_t tempval = 0;
+
 	while ( c != -1 ){
-		c = getopt_long (argc, argv, "hf:t:", long_options, &option_index);
+		c = getopt_long (argc, argv, "hvf:t:", long_options, &option_index);
 		
 		// Detect the end of the options.
 		if (c == -1)
@ -60,6 +63,13 @@ slsReceiver::slsReceiver(int argc, char *argv[], int &success):
 #endif
 			break;

+		case 'v':
+			tempval = GITREV;
+			tempval = (tempval <<32) | GITDATE;
+			cout << "SLS Receiver " << GITBRANCH << " (0x" << hex << tempval << ")" << endl;
+			success = FAIL; // to exit
+			break;
+
 		case 't':
 			sscanf(optarg, "%d", &tcpip_port_no);
 			break;
--- a/slsReceiverSoftware/src/slsReceiverTCPIPInterface.cpp
+++ b/slsReceiverSoftware/src/slsReceiverTCPIPInterface.cpp
@ -152,8 +152,8 @@ void slsReceiverTCPIPInterface::stop(){


 int64_t slsReceiverTCPIPInterface::getReceiverVersion(){
-	int64_t retval = SVNREV;
-	retval= (retval <<32) | SVNDATE;
+	int64_t retval = GITREV;
+	retval= (retval <<32) | GITDATE;
 	return retval;
 }

--- a/slsReceiverSoftware/updateGitVersion.sh
+++ b/slsReceiverSoftware/updateGitVersion.sh
@ -16,7 +16,7 @@ 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}')
+OLDDATE=$(more $INCLFILE | grep '#define GITDATE' | awk '{print $3}')

 #update INCLFILE if changes
 if [ "$OLDDATE" != "$NEWDATE" ]; then