detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-06-13 13:27:14 +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 Path: slsDetectorsPackage/slsDetectorGui
URL: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git URL: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git
Repository Root: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git Repository Root: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git
Repsitory UUID: b58c3e8951625ed9124669404f6b68aca340a1b8 Repsitory UUID: b8bdbf4da61f95b88893b02ddabc2491b16fa10f
Revision: 491 Revision: 492
Branch: developer Branch: developer
Last Changed Author: Dhanya_Thattil Last Changed Author: Dhanya_Thattil
Last Changed Rev: 3727 Last Changed Rev: 3746
Last Changed Date: 2018-03-14 15:24:03.000000002 +0100 ./src/qTabMeasurement.cpp 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 GITURL "git@github.com:slsdetectorgroup/slsDetectorPackage.git"
#define GITREPUUID "b58c3e8951625ed9124669404f6b68aca340a1b8" #define GITREPUUID "b8bdbf4da61f95b88893b02ddabc2491b16fa10f"
#define GITAUTH "Dhanya_Thattil" #define GITAUTH "Dhanya_Thattil"
#define GITREV 0x3727 #define GITREV 0x3746
#define GITDATE 0x20180314 #define GITDATE 0x20180326
#define GITBRANCH "developer" #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; break;
case 'v': case 'v':
tempval = GITREV; tempval = GITDATE;
tempval = (tempval <<32) | GITDATE;
cout << "SLS Detector GUI " << GITBRANCH << " (0x" << hex << tempval << ")" << endl; cout << "SLS Detector GUI " << GITBRANCH << " (0x" << hex << tempval << ")" << endl;
return; return;
@ -666,8 +665,7 @@ 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= GITREV; long long unsigned int retval= GITDATE;
retval= (retval <<32) | GITDATE;
sprintf(version,"%llx",retval); sprintf(version,"%llx",retval);
string thisGUIVersion = string(version); string thisGUIVersion = string(version);

8
slsDetectorSoftware/gitInfo.txt
View File

@ -1,9 +1,9 @@
Path: slsDetectorsPackage/slsDetectorSoftware Path: slsDetectorsPackage/slsDetectorSoftware
URL: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git URL: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git
Repository Root: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git Repository Root: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git
Repsitory UUID: 5340b8ef24e00cbc04e9827adc55e3adc9046a24 Repsitory UUID: b8bdbf4da61f95b88893b02ddabc2491b16fa10f
Revision: 1851 Revision: 1852
Branch: developer Branch: developer
Last Changed Author: Dhanya_Thattil Last Changed Author: Dhanya_Thattil
Last Changed Rev: 3745 Last Changed Rev: 3746
Last Changed Date: 2018-03-26 18:09:40.000000002 +0200 ./threadFiles/ThreadPool.o Last Changed Date: 2018-03-27 10:47:02.000000002 +0200 ./slsDetector/slsDetector.o

6
slsDetectorSoftware/slsDetector/gitInfoLib.h
View File

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

3
slsDetectorSoftware/slsDetector/slsDetector.cpp
View File

@ -2246,8 +2246,7 @@ 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=GITREV; retval=GITDATE;
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){

3
slsDetectorSoftware/slsDetectorClient/sls_detector_client.cpp
View File

@ -10,8 +10,7 @@ int main(int argc, char *argv[])
{ {
for (int i = 1; i < argc; ++i ) { for (int i = 1; i < argc; ++i ) {
if (!(strcmp (argv[i],"--version")) || !(strcmp (argv[i],"-v"))) { if (!(strcmp (argv[i],"--version")) || !(strcmp (argv[i],"-v"))) {
int64_t tempval = GITREV; int64_t tempval = GITDATE;
tempval = (tempval <<32) | GITDATE;
cout << argv[0] << " " << GITBRANCH << " (0x" << hex << tempval << ")" << endl; cout << argv[0] << " " << GITBRANCH << " (0x" << hex << tempval << ")" << endl;
return 0; return 0;
} }

8
slsReceiverSoftware/gitInfo.txt
View File

@ -1,9 +1,9 @@
Path: slsDetectorsPackage/slsReceiverSoftware Path: slsDetectorsPackage/slsReceiverSoftware
URL: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git URL: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git
Repository Root: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git Repository Root: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git
Repsitory UUID: b58c3e8951625ed9124669404f6b68aca340a1b8 Repsitory UUID: b8bdbf4da61f95b88893b02ddabc2491b16fa10f
Revision: 764 Revision: 767
Branch: developer Branch: developer
Last Changed Author: Dhanya_Thattil Last Changed Author: Dhanya_Thattil
Last Changed Rev: 3727 Last Changed Rev: 3746
Last Changed Date: 2018-03-13 10:29:32.000000002 +0100 ./src/slsReceiverTCPIPInterface.cpp Last Changed Date: 2018-03-27 10:43:44.000000002 +0200 ./src/slsReceiverTCPIPInterface.cpp

6
slsReceiverSoftware/include/gitInfoReceiver.h
View File

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

3
slsReceiverSoftware/src/slsReceiverTCPIPInterface.cpp
View File

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