detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-06-12 12:57:13 +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
Download Patch File Download Diff File Expand all files Collapse all files

17
slsDetectorSoftware/eigerDetectorServer/gitInfoEiger.h
View File

@ -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"

17
slsDetectorSoftware/eigerDetectorServer/gitInfoEigerTmp.h
View File

@ -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 ""

6
slsDetectorSoftware/eigerDetectorServer/slsDetectorFunctionList.c
View File

@ -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;

2
slsDetectorSoftware/eigerDetectorServer/updateGitVersion.sh
View File

@ -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

17
slsDetectorSoftware/gotthardDetectorServer/gitInfoGotthard.h
View File

@ -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"

17
slsDetectorSoftware/gotthardDetectorServer/gitInfoGotthardTmp.h
View File

@ -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 ""

7
slsDetectorSoftware/gotthardDetectorServer/server_funcs.c
View File

@ -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;

2
slsDetectorSoftware/gotthardDetectorServer/updateGitVersion.sh
View File

@ -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

17
slsDetectorSoftware/jctbDetectorServer/gitInfoMoench.h
View File

@ -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"

17
slsDetectorSoftware/jctbDetectorServer/gitInfoMoenchTmp.h
View File

@ -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 ""

7
slsDetectorSoftware/jctbDetectorServer/server_funcs.c
View File

@ -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;

2
slsDetectorSoftware/jctbDetectorServer/updateGitVersion.sh
View File

@ -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

17
slsDetectorSoftware/jungfrauDetectorServer/gitInfoJungfrau.h
View File

@ -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"

17
slsDetectorSoftware/jungfrauDetectorServer/gitInfoJungfrauTmp.h
View File

@ -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 ""

4
slsDetectorSoftware/jungfrauDetectorServer/slsDetectorFunctionList.c
View File

@ -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;

2
slsDetectorSoftware/jungfrauDetectorServer/updateGitVersion.sh
View File

@ -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

17
slsDetectorSoftware/moenchDetectorServer/gitInfoMoench.h
View File

@ -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"

17
slsDetectorSoftware/moenchDetectorServer/gitInfoMoenchTmp.h
View File

@ -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 ""

7
slsDetectorSoftware/moenchDetectorServer/server_funcs.c
View File

@ -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;

2
slsDetectorSoftware/moenchDetectorServer/updateGitVersion.sh
View File

@ -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

17
slsDetectorSoftware/mythenDetectorServer/gitInfoMythen.h
View File

@ -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"

17
slsDetectorSoftware/mythenDetectorServer/gitInfoMythenTmp.h
View File

@ -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 ""

4
slsDetectorSoftware/mythenDetectorServer/server_funcs.c
View File

@ -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;

2
slsDetectorSoftware/mythenDetectorServer/updateGitVersion.sh
View File

@ -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

17
slsDetectorSoftware/slsDetector/gitInfoLib.h
View File

@ -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"

17
slsDetectorSoftware/slsDetector/gitInfoLibTmp.h
View File

@ -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 ""

4
slsDetectorSoftware/slsDetector/slsDetector.cpp
View File

@ -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){

2
slsDetectorSoftware/updateGitVersion.sh
View File

@ -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