detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-06-23 18:17:59 +02:00
Code Issues Actions Packages Releases Activity

updating versioning to only have date

Browse Source
This commit is contained in:
maliakal_d
2018-03-27 11:00:15 +02:00
parent b8bdbf4da6
commit fe2ba8621b
10 changed files with 26 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
slsDetectorGui/gitInfo.txt
View File

@ -1,9 +1,9 @@
Path: slsDetectorsPackage/slsDetectorGui
URL: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git
Repository Root: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git
Repsitory UUID: b58c3e8951625ed9124669404f6b68aca340a1b8
Revision: 491
Repsitory UUID: b8bdbf4da61f95b88893b02ddabc2491b16fa10f
Revision: 492
Branch: developer
Last Changed Author: Dhanya_Thattil
Last Changed Rev: 3727
Last Changed Date: 2018-03-14 15:24:03.000000002 +0100 ./src/qTabMeasurement.cpp
Last Changed Rev: 3746
Last Changed Date: 2018-03-26 17:27:44.000000002 +0200 ./src/qTabSettings.cpp

6
slsDetectorGui/include/gitInfoGui.h
View File

@ -1,6 +1,6 @@
#define GITURL "git@github.com:slsdetectorgroup/slsDetectorPackage.git"
#define GITREPUUID "b58c3e8951625ed9124669404f6b68aca340a1b8"
#define GITREPUUID "b8bdbf4da61f95b88893b02ddabc2491b16fa10f"
#define GITAUTH "Dhanya_Thattil"
#define GITREV 0x3727
#define GITDATE 0x20180314
#define GITREV 0x3746
#define GITDATE 0x20180326
#define GITBRANCH "developer"

6
slsDetectorGui/src/qDetectorMain.cpp
View File

@ -99,8 +99,7 @@ qDetectorMain::qDetectorMain(int argc, char **argv, QApplication *app, int& ret,
break;
case 'v':
tempval = GITREV;
tempval = (tempval <<32) | GITDATE;
tempval = GITDATE;
cout << "SLS Detector GUI " << GITBRANCH << " (0x" << hex << tempval << ")" << endl;
return;
@ -666,8 +665,7 @@ 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= GITREV;
retval= (retval <<32) | GITDATE;
long long unsigned int retval= GITDATE;
sprintf(version,"%llx",retval);
string thisGUIVersion = string(version);