detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-04-19 18:40:01 +02:00
Code Issues Actions Packages Releases Activity

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

Browse Source
This commit is contained in:
Dhanya Maliakal 2017-12-06 10:29:57 +01:00
parent 7436d6c8d3
commit c4a242e10a
39 changed files with 154 additions and 243 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
genVersionHeader.sh
View File

@ -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 '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\"";} \ 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;} 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];}}1' $fin $ftmp > $fout {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

17
slsDetectorGui/include/gitInfoGui.h
View File

@ -1,11 +1,6 @@
//#define SVNPATH "" #define GITURL "git@git.psi.ch:sls_detectors_software/slsDetectorPackage.git"
#define SVNURL "git@git.psi.ch:sls_detectors_software/slsDetectorPackage.git" #define GITREPUUID "b498043ea612fa3148bf1d7ea2a39c46092addf8"
//#define SVNREPPATH "" #define GITAUTH "Dhanya_Maliakal"
#define SVNREPUUID "b498043ea612fa3148bf1d7ea2a39c46092addf8" #define GITREV 0x3185
//#define SVNREV 0x3185 #define GITDATE 0x20171206
//#define SVNKIND "" #define GITBRANCH "blabla"
//#define SVNSCHED ""
#define SVNAUTH "Dhanya_Maliakal"
#define SVNREV 0x3185
#define SVNDATE 0x20171206
//

17
slsDetectorGui/include/gitInfoGuiTmp.h
View File

@ -1,11 +1,6 @@
//#define SVNPATH "" #define GITURL ""
#define SVNURL "" #define GITREPUUID ""
//#define SVNREPPATH "" #define GITAUTH ""
#define SVNREPUUID "" #define GITREV ""
//#define SVNREV "" #define GITDATE ""
//#define SVNKIND "" #define GITBRANCH ""
//#define SVNSCHED ""
#define SVNAUTH ""
#define SVNREV ""
#define SVNDATE ""
//

4
slsDetectorGui/src/qDetectorMain.cpp
View File

@ -658,8 +658,8 @@ void qDetectorMain::ExecuteHelp(QAction *action){
cout << "About: Common GUI for Mythen, Eiger, Gotthard, Jungfrau, Moench and Propix detectors" << endl; cout << "About: Common GUI for Mythen, Eiger, Gotthard, Jungfrau, Moench and Propix detectors" << endl;
#endif #endif
char version[200]; char version[200];
long long unsigned int retval= SVNREV; long long unsigned int retval= GITREV;
retval= (retval <<32) | SVNDATE; retval= (retval <<32) | GITDATE;
sprintf(version,"%llx",retval); sprintf(version,"%llx",retval);
string thisGUIVersion = string(version); string thisGUIVersion = string(version);

2
slsDetectorGui/updateGitVersion.sh
View File

@ -16,7 +16,7 @@ NEWDATE=$(sed "s/-//g" <<< $RDATE | awk '{print $1;}')
NEWDATE=${NEWDATE/#/0x} NEWDATE=${NEWDATE/#/0x}
#get old date from INCLFILE #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 #update INCLFILE if changes
if [ "$OLDDATE" != "$NEWDATE" ]; then 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 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

17
slsDetectorSoftware/eigerDetectorServer/gitInfoEiger.h
View File

@ -1,11 +1,6 @@
//#define SVNPATH "" #define GITURL "git@git.psi.ch:sls_detectors_software/sls_detector_software.git"
#define SVNURL "git@git.psi.ch:sls_detectors_software/sls_detector_software.git" #define GITREPUUID "a161a9aad8ac38a79ba43340344a3c923cea85f7"
//#define SVNREPPATH "" #define GITAUTH "Dhanya_Thattil"
#define SVNREPUUID "a161a9aad8ac38a79ba43340344a3c923cea85f7" #define GITREV 0x1578
//#define SVNREV 0x1578 #define GITDATE 0x20171011
//#define SVNKIND "" #define GITBRANCH "blabla"
//#define SVNSCHED ""
#define SVNAUTH "Dhanya_Thattil"
#define SVNREV 0x1578
#define SVNDATE 0x20171011
//

17
slsDetectorSoftware/eigerDetectorServer/gitInfoEigerTmp.h
View File

@ -1,11 +1,6 @@
//#define SVNPATH "" #define GITURL ""
#define SVNURL "" #define GITREPUUID ""
//#define SVNREPPATH "" #define GITAUTH ""
#define SVNREPUUID "" #define GITREV ""
//#define SVNREV "" #define GITDATE ""
//#define SVNKIND "" #define GITBRANCH ""
//#define SVNSCHED ""
#define SVNAUTH ""
#define SVNREV ""
#define SVNDATE ""
//

6
slsDetectorSoftware/eigerDetectorServer/slsDetectorFunctionList.c
View File

@ -134,9 +134,9 @@ int64_t getDetectorId(enum idMode arg){
case SOFTWARE_FIRMWARE_API_VERSION: case SOFTWARE_FIRMWARE_API_VERSION:
return (int64_t)Beb_GetFirmwareSoftwareAPIVersion(); return (int64_t)Beb_GetFirmwareSoftwareAPIVersion();
case DETECTOR_SOFTWARE_VERSION: case DETECTOR_SOFTWARE_VERSION:
retval= SVNREV; retval= GITREV;
retval= (retval <<32) | SVNDATE; retval= (retval <<32) | GITDATE;
//cprintf(BLUE,"git date:%x, git rev:%x\n",SVNDATE,SVNREV); //cprintf(BLUE,"git date:%x, git rev:%x\n",GITDATE,GITREV);
break; break;
default: default:
break; break;

2
slsDetectorSoftware/eigerDetectorServer/updateGitVersion.sh
View File

@ -18,7 +18,7 @@ NEWDATE=${NEWDATE/#/0x}
#get old date from INCLFILE #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 #update INCLFILE if changes

17
slsDetectorSoftware/gotthardDetectorServer/gitInfoGotthard.h
View File

@ -1,11 +1,6 @@
//#define SVNPATH "" #define GITURL "git@git.psi.ch:sls_detectors_software/sls_detector_software.git"
#define SVNURL "git@git.psi.ch:sls_detectors_software/sls_detector_software.git" #define GITREPUUID "c5777e517c451226e3275e6948895baee21a1f94"
//#define SVNREPPATH "" #define GITAUTH "Dhanya_Maliakal"
#define SVNREPUUID "c5777e517c451226e3275e6948895baee21a1f94" #define GITREV 0x1585
//#define SVNREV 0x1585 #define GITDATE 0x20171109
//#define SVNKIND "" #define GITBRANCH "blabla"
//#define SVNSCHED ""
#define SVNAUTH "Dhanya_Maliakal"
#define SVNREV 0x1585
#define SVNDATE 0x20171109
//

17
slsDetectorSoftware/gotthardDetectorServer/gitInfoGotthardTmp.h
View File

@ -1,11 +1,6 @@
//#define SVNPATH "" #define GITURL ""
#define SVNURL "" #define GITREPUUID ""
//#define SVNREPPATH "" #define GITAUTH ""
#define SVNREPUUID "" #define GITREV ""
//#define SVNREV "" #define GITDATE ""
//#define SVNKIND "" #define GITBRANCH ""
//#define SVNSCHED ""
#define SVNAUTH ""
#define SVNREV ""
#define SVNDATE ""
//

7
slsDetectorSoftware/gotthardDetectorServer/server_funcs.c
View File

@ -592,12 +592,9 @@ int get_id(int file_des) {
retval=(retval <<32) | getFirmwareVersion(); retval=(retval <<32) | getFirmwareVersion();
break; break;
case DETECTOR_SOFTWARE_VERSION: case DETECTOR_SOFTWARE_VERSION:
retval= SVNREV; retval= GITREV;
retval= (retval <<32) | SVNDATE; retval= (retval <<32) | GITDATE;
break; break;
/* case DETECTOR_FIRMWARE_SVN_VERSION:
retval=getFirmwareSVNVersion();
break;*/
default: default:
printf("Required unknown id %d \n", arg); printf("Required unknown id %d \n", arg);
ret=FAIL; ret=FAIL;

2
slsDetectorSoftware/gotthardDetectorServer/updateGitVersion.sh
View File

@ -18,7 +18,7 @@ NEWDATE=${NEWDATE/#/0x}
#get old date from INCLFILE #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 #update INCLFILE if changes

17
slsDetectorSoftware/jctbDetectorServer/gitInfoMoench.h
View File

@ -1,11 +1,6 @@
//#define SVNPATH "" #define GITURL "git@gitorious.psi.ch:sls_det_software/sls_detector_software.git/moenchDetectorServer"
#define SVNURL "git@gitorious.psi.ch:sls_det_software/sls_detector_software.git/moenchDetectorServer" #define GITREPUUID "046a469b1e6582c4c55bd6eaeb4818b618d0a9a9"
//#define SVNREPPATH "" #define GITAUTH "Maliakal_Dhanya"
#define SVNREPUUID "046a469b1e6582c4c55bd6eaeb4818b618d0a9a9" #define GITREV 0x14
//#define SVNREV 0x14 #define GITDATE 0x20140603
//#define SVNKIND "" #define GITBRANCH "blabla"
//#define SVNSCHED ""
#define SVNAUTH "Maliakal_Dhanya"
#define SVNREV 0x14
#define SVNDATE 0x20140603
//

17
slsDetectorSoftware/jctbDetectorServer/gitInfoMoenchTmp.h
View File

@ -1,11 +1,6 @@
//#define SVNPATH "" #define GITURL ""
#define SVNURL "" #define GITREPUUID ""
//#define SVNREPPATH "" #define GITAUTH ""
#define SVNREPUUID "" #define GITREV ""
//#define SVNREV "" #define GITDATE ""
//#define SVNKIND "" #define GITBRANCH ""
//#define SVNSCHED ""
#define SVNAUTH ""
#define SVNREV ""
#define SVNDATE ""
//

7
slsDetectorSoftware/jctbDetectorServer/server_funcs.c
View File

@ -624,12 +624,9 @@ int get_id(int file_des) {
retval=(retval <<32) | getFirmwareVersion(); retval=(retval <<32) | getFirmwareVersion();
break; break;
case DETECTOR_SOFTWARE_VERSION: case DETECTOR_SOFTWARE_VERSION:
retval= SVNREV; retval= GITREV;
retval= (retval <<32) | SVNDATE; retval= (retval <<32) | GITDATE;
break; break;
/* case DETECTOR_FIRMWARE_SVN_VERSION:
retval=getFirmwareSVNVersion();
break;*/
default: default:
printf("Required unknown id %d \n", arg); printf("Required unknown id %d \n", arg);
ret=FAIL; ret=FAIL;

2
slsDetectorSoftware/jctbDetectorServer/updateGitVersion.sh
View File

@ -19,7 +19,7 @@ NEWDATE=${NEWDATE/#/0x}
#get old date from INCLFILE #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 #update INCLFILE if changes

17
slsDetectorSoftware/jungfrauDetectorServer/gitInfoJungfrau.h
View File

@ -1,11 +1,6 @@
//#define SVNPATH "" #define GITURL "git@git.psi.ch:sls_detectors_software/sls_detector_software.git"
#define SVNURL "git@git.psi.ch:sls_detectors_software/sls_detector_software.git" #define GITREPUUID "3c1eb747d1930d6d38030a5a607f72d3b58a7a21"
//#define SVNREPPATH "" #define GITAUTH "Dhanya_Maliakal"
#define SVNREPUUID "3c1eb747d1930d6d38030a5a607f72d3b58a7a21" #define GITREV 0x1549
//#define SVNREV 0x1549 #define GITDATE 0x20171025
//#define SVNKIND "" #define GITBRANCH "blabla"
//#define SVNSCHED ""
#define SVNAUTH "Dhanya_Maliakal"
#define SVNREV 0x1549
#define SVNDATE 0x20171025
//

17
slsDetectorSoftware/jungfrauDetectorServer/gitInfoJungfrauTmp.h
View File

@ -1,11 +1,6 @@
//#define SVNPATH "" #define GITURL ""
#define SVNURL "" #define GITREPUUID ""
//#define SVNREPPATH "" #define GITAUTH ""
#define SVNREPUUID "" #define GITREV ""
//#define SVNREV "" #define GITDATE ""
//#define SVNKIND "" #define GITBRANCH ""
//#define SVNSCHED ""
#define SVNAUTH ""
#define SVNREV ""
#define SVNDATE ""
//

4
slsDetectorSoftware/jungfrauDetectorServer/slsDetectorFunctionList.c
View File

@ -178,8 +178,8 @@ int64_t getDetectorId(enum idMode arg){
//case SOFTWARE_FIRMWARE_API_VERSION: //case SOFTWARE_FIRMWARE_API_VERSION:
//return GetFirmwareSoftwareAPIVersion(); //return GetFirmwareSoftwareAPIVersion();
case DETECTOR_SOFTWARE_VERSION: case DETECTOR_SOFTWARE_VERSION:
retval= SVNREV; retval= GITREV;
retval= (retval <<32) | SVNDATE; retval= (retval <<32) | GITDATE;
break; break;
default: default:
break; break;

2
slsDetectorSoftware/jungfrauDetectorServer/updateGitVersion.sh
View File

@ -19,7 +19,7 @@ NEWDATE=${NEWDATE/#/0x}
#get old date from INCLFILE #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 #update INCLFILE if changes

17
slsDetectorSoftware/moenchDetectorServer/gitInfoMoench.h
View File

@ -1,11 +1,6 @@
//#define SVNPATH "" #define GITURL "git@git.psi.ch:sls_detectors_software/sls_detector_software.git"
#define SVNURL "git@git.psi.ch:sls_detectors_software/sls_detector_software.git" #define GITREPUUID "9f1b82c18ab0893d65bfadeb646b8ea244614632"
//#define SVNREPPATH "" #define GITAUTH "Dhanya_Maliakal"
#define SVNREPUUID "9f1b82c18ab0893d65bfadeb646b8ea244614632" #define GITREV 0x1443
//#define SVNREV 0x1443 #define GITDATE 0x20170710
//#define SVNKIND "" #define GITBRANCH "blabla"
//#define SVNSCHED ""
#define SVNAUTH "Dhanya_Maliakal"
#define SVNREV 0x1443
#define SVNDATE 0x20170710
//

17
slsDetectorSoftware/moenchDetectorServer/gitInfoMoenchTmp.h
View File

@ -1,11 +1,6 @@
//#define SVNPATH "" #define GITURL ""
#define SVNURL "" #define GITREPUUID ""
//#define SVNREPPATH "" #define GITAUTH ""
#define SVNREPUUID "" #define GITREV ""
//#define SVNREV "" #define GITDATE ""
//#define SVNKIND "" #define GITBRANCH ""
//#define SVNSCHED ""
#define SVNAUTH ""
#define SVNREV ""
#define SVNDATE ""
//

7
slsDetectorSoftware/moenchDetectorServer/server_funcs.c
View File

@ -597,12 +597,9 @@ int get_id(int file_des) {
retval=(retval <<32) | getFirmwareVersion(); retval=(retval <<32) | getFirmwareVersion();
break; break;
case DETECTOR_SOFTWARE_VERSION: case DETECTOR_SOFTWARE_VERSION:
retval= SVNREV; retval= GITREV;
retval= (retval <<32) | SVNDATE; retval= (retval <<32) | GITDATE;
break; break;
/* case DETECTOR_FIRMWARE_SVN_VERSION:
retval=getFirmwareSVNVersion();
break;*/
default: default:
printf("Required unknown id %d \n", arg); printf("Required unknown id %d \n", arg);
ret=FAIL; ret=FAIL;

2
slsDetectorSoftware/moenchDetectorServer/updateGitVersion.sh
View File

@ -19,7 +19,7 @@ NEWDATE=${NEWDATE/#/0x}
#get old date from INCLFILE #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 #update INCLFILE if changes

17
slsDetectorSoftware/mythenDetectorServer/gitInfoMythen.h
View File

@ -1,11 +1,6 @@
//#define SVNPATH "" #define GITURL "git@git.psi.ch:sls_detectors_software/sls_detector_software.git/mythenDetectorServer"
#define SVNURL "git@git.psi.ch:sls_detectors_software/sls_detector_software.git/mythenDetectorServer" #define GITREPUUID "8aceb5d4b0ca6bd95a11b53e7a799b463b92d51b"
//#define SVNREPPATH "" #define GITAUTH "Dhanya_Maliakal"
#define SVNREPUUID "8aceb5d4b0ca6bd95a11b53e7a799b463b92d51b" #define GITREV 0x334
//#define SVNREV 0x334 #define GITDATE 0x20160812
//#define SVNKIND "" #define GITBRANCH "blabla"
//#define SVNSCHED ""
#define SVNAUTH "Dhanya_Maliakal"
#define SVNREV 0x334
#define SVNDATE 0x20160812
//

17
slsDetectorSoftware/mythenDetectorServer/gitInfoMythenTmp.h
View File

@ -1,11 +1,6 @@
//#define SVNPATH "" #define GITURL ""
#define SVNURL "" #define GITREPUUID ""
//#define SVNREPPATH "" #define GITAUTH ""
#define SVNREPUUID "" #define GITREV ""
//#define SVNREV "" #define GITDATE ""
//#define SVNKIND "" #define GITBRANCH ""
//#define SVNSCHED ""
#define SVNAUTH ""
#define SVNREV ""
#define SVNDATE ""
//

4
slsDetectorSoftware/mythenDetectorServer/server_funcs.c
View File

@ -586,8 +586,8 @@ int get_id(int file_des) {
retval=getMcsVersion(); retval=getMcsVersion();
break; break;
case DETECTOR_SOFTWARE_VERSION: case DETECTOR_SOFTWARE_VERSION:
retval= SVNREV; retval= GITREV;
retval= (retval <<32) | SVNDATE; retval= (retval <<32) | GITDATE;
/* sscanf(THIS_REVISION,"$Rev : %x",&rev1); /* sscanf(THIS_REVISION,"$Rev : %x",&rev1);
rev=((int64_t)rev1); rev=((int64_t)rev1);
dat=THIS_SOFTWARE_VERSION; dat=THIS_SOFTWARE_VERSION;

2
slsDetectorSoftware/mythenDetectorServer/updateGitVersion.sh
View File

@ -19,7 +19,7 @@ NEWDATE=${NEWDATE/#/0x}
#get old date from INCLFILE #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 #update INCLFILE if changes

17
slsDetectorSoftware/slsDetector/gitInfoLib.h
View File

@ -1,11 +1,6 @@
//#define SVNPATH "" #define GITURL "git@git.psi.ch:sls_detectors_software/slsDetectorPackage.git"
#define SVNURLLIB "git@git.psi.ch:sls_detectors_software/slsDetectorPackage.git" #define GITREPUUID "b498043ea612fa3148bf1d7ea2a39c46092addf8"
//#define SVNREPPATH "" #define GITAUTH "Dhanya_Maliakal"
#define SVNREPUUIDLIB "b498043ea612fa3148bf1d7ea2a39c46092addf8" #define GITREV 0x3185
//#define SVNREV 0x3185 #define GITDATE 0x20171206
//#define SVNKIND "" #define GITBRANCH "blabla"
//#define SVNSCHED ""
#define SVNAUTHLIB "Dhanya_Maliakal"
#define SVNREVLIB 0x3185
#define SVNDATELIB 0x20171206
//

17
slsDetectorSoftware/slsDetector/gitInfoLibTmp.h
View File

@ -1,11 +1,6 @@
//#define SVNPATH "" #define GITURL ""
#define SVNURLLIB "/root/" #define GITREPUUID ""
//#define SVNREPPATH "" #define GITAUTH ""
#define SVNREPUUIDLIB "00000-00000-00000" #define GITREV ""
//#define SVNREV "" #define GITDATE ""
//#define SVNKIND "" #define GITBRANCH ""
//#define SVNSCHED ""
#define SVNAUTHLIB "nobody"
#define SVNREVLIB 0
#define SVNDATELIB 20000101
//

4
slsDetectorSoftware/slsDetector/slsDetector.cpp
View File

@ -2156,8 +2156,8 @@ int64_t slsDetector::getId( idMode mode, int imod){
#endif #endif
if (mode==THIS_SOFTWARE_VERSION) { if (mode==THIS_SOFTWARE_VERSION) {
ret=OK; ret=OK;
retval=SVNREVLIB; retval=GITREV;
retval=(retval<<32) | SVNDATELIB; retval=(retval<<32) | GITDATE;
} else if (mode==RECEIVER_VERSION) { } else if (mode==RECEIVER_VERSION) {
if (thisDetector->receiverOnlineFlag==ONLINE_FLAG) { if (thisDetector->receiverOnlineFlag==ONLINE_FLAG) {
if (connectData() == OK){ if (connectData() == OK){

2
slsDetectorSoftware/updateGitVersion.sh
View File

@ -16,7 +16,7 @@ NEWDATE=$(sed "s/-//g" <<< $RDATE | awk '{print $1;}')
NEWDATE=${NEWDATE/#/0x} NEWDATE=${NEWDATE/#/0x}
#get old date from INCLFILE #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 #update INCLFILE if changes

8
slsReceiverSoftware/gitInfo.txt
View File

@ -1,9 +1,9 @@
Path: slsDetectorsPackage/slsReceiverSoftware Path: slsDetectorsPackage/slsReceiverSoftware
URL: origin git@git.psi.ch:sls_detectors_software/slsDetectorPackage.git URL: origin git@git.psi.ch:sls_detectors_software/slsDetectorPackage.git
Repository Root: 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 Repsitory UUID: 7436d6c8d3538cef443e0fa76bc01762fd6cc246
Revision: 687 Revision: 688
Branch: 3.0.1 Branch: 3.0.1
Last Changed Author: Dhanya_Maliakal Last Changed Author: Dhanya_Maliakal
Last Changed Rev: 3185 Last Changed Rev: 3186
Last Changed Date: 2017-12-06 08:43:21.000000002 +0100 ./src/UDPStandardImplementation.cpp Last Changed Date: 2017-12-06 08:45:14.000000002 +0100 ./src/UDPStandardImplementation.cpp

17
slsReceiverSoftware/include/gitInfoReceiver.h
View File

@ -1,11 +1,6 @@
//#define SVNPATH "" #define GITURL "git@git.psi.ch:sls_detectors_software/slsDetectorPackage.git"
#define SVNURL "git@git.psi.ch:sls_detectors_software/slsDetectorPackage.git" #define GITREPUUID "7436d6c8d3538cef443e0fa76bc01762fd6cc246"
//#define SVNREPPATH "" #define GITAUTH "Dhanya_Maliakal"
#define SVNREPUUID "b498043ea612fa3148bf1d7ea2a39c46092addf8" #define GITREV 0x3186
//#define SVNREV 0x3185 #define GITDATE 0x20171206
//#define SVNKIND "" #define GITBRANCH "3.0.1"
//#define SVNSCHED ""
#define SVNAUTH "Dhanya_Maliakal"
#define SVNREV 0x3185
#define SVNDATE 0x20171206
//

17
slsReceiverSoftware/include/gitInfoReceiverTmp.h
View File

@ -1,11 +1,6 @@
//#define SVNPATH "" #define GITURL ""
#define SVNURL "" #define GITREPUUID ""
//#define SVNREPPATH "" #define GITAUTH ""
#define SVNREPUUID "" #define GITREV ""
//#define SVNREV "" #define GITDATE ""
//#define SVNKIND "" #define GITBRANCH ""
//#define SVNSCHED ""
#define SVNAUTH ""
#define SVNREV ""
#define SVNDATE ""
//

14
slsReceiverSoftware/src/slsReceiver.cpp
View File

@ -12,7 +12,7 @@
#include <getopt.h> #include <getopt.h>
#include "slsReceiver.h" #include "slsReceiver.h"
//#include "UDPInterface.h" #include "gitInfoReceiver.h"
using namespace std; 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. // These options don’t set a flag. We distinguish them by their indices.
{"config", required_argument, 0, 'f'}, {"config", required_argument, 0, 'f'},
{"rx_tcpport", required_argument, 0, 't'}, {"rx_tcpport", required_argument, 0, 't'},
{"version", no_argument, 0, 'v'},
{"help", no_argument, 0, 'h'}, {"help", no_argument, 0, 'h'},
{0, 0, 0, 0} {0, 0, 0, 0}
}; };
@ -44,8 +45,10 @@ slsReceiver::slsReceiver(int argc, char *argv[], int &success):
int c=0; int c=0;
optind = 1; optind = 1;
int64_t tempval = 0;
while ( c != -1 ){ 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. // Detect the end of the options.
if (c == -1) if (c == -1)
@ -60,6 +63,13 @@ slsReceiver::slsReceiver(int argc, char *argv[], int &success):
#endif #endif
break; break;
case 'v':
tempval = GITREV;
tempval = (tempval <<32) | GITDATE;
cout << "SLS Receiver " << GITBRANCH << " (0x" << hex << tempval << ")" << endl;
success = FAIL; // to exit
break;
case 't': case 't':
sscanf(optarg, "%d", &tcpip_port_no); sscanf(optarg, "%d", &tcpip_port_no);
break; break;

4
slsReceiverSoftware/src/slsReceiverTCPIPInterface.cpp
View File

@ -152,8 +152,8 @@ void slsReceiverTCPIPInterface::stop(){
int64_t slsReceiverTCPIPInterface::getReceiverVersion(){ int64_t slsReceiverTCPIPInterface::getReceiverVersion(){
int64_t retval = SVNREV; int64_t retval = GITREV;
retval= (retval <<32) | SVNDATE; retval= (retval <<32) | GITDATE;
return retval; return retval;
} }

2
slsReceiverSoftware/updateGitVersion.sh
View File

@ -16,7 +16,7 @@ NEWDATE=$(sed "s/-//g" <<< $RDATE | awk '{print $1;}')
NEWDATE=${NEWDATE/#/0x} NEWDATE=${NEWDATE/#/0x}
#get old date from INCLFILE #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 #update INCLFILE if changes
if [ "$OLDDATE" != "$NEWDATE" ]; then if [ "$OLDDATE" != "$NEWDATE" ]; then