detectors/slsDetectorPackage
24
1
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2026-01-17 01:53:29 +01: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