mirror of
https://github.com/slsdetectorgroup/slsDetectorPackage.git
synced 2025-06-11 04:17:15 +02:00
updating versioning to only have date
This commit is contained in:
@ -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
|
||||
|
@ -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"
|
||||
|
@ -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);
|
||||
|
||||
|
@ -1,9 +1,9 @@
|
||||
Path: slsDetectorsPackage/slsDetectorSoftware
|
||||
URL: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git
|
||||
Repository Root: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git
|
||||
Repsitory UUID: 5340b8ef24e00cbc04e9827adc55e3adc9046a24
|
||||
Revision: 1851
|
||||
Repsitory UUID: b8bdbf4da61f95b88893b02ddabc2491b16fa10f
|
||||
Revision: 1852
|
||||
Branch: developer
|
||||
Last Changed Author: Dhanya_Thattil
|
||||
Last Changed Rev: 3745
|
||||
Last Changed Date: 2018-03-26 18:09:40.000000002 +0200 ./threadFiles/ThreadPool.o
|
||||
Last Changed Rev: 3746
|
||||
Last Changed Date: 2018-03-27 10:47:02.000000002 +0200 ./slsDetector/slsDetector.o
|
||||
|
@ -1,6 +1,6 @@
|
||||
#define GITURL "git@github.com:slsdetectorgroup/slsDetectorPackage.git"
|
||||
#define GITREPUUID "5340b8ef24e00cbc04e9827adc55e3adc9046a24"
|
||||
#define GITREPUUID "b8bdbf4da61f95b88893b02ddabc2491b16fa10f"
|
||||
#define GITAUTH "Dhanya_Thattil"
|
||||
#define GITREV 0x3745
|
||||
#define GITDATE 0x20180326
|
||||
#define GITREV 0x3746
|
||||
#define GITDATE 0x20180327
|
||||
#define GITBRANCH "developer"
|
||||
|
@ -2246,8 +2246,7 @@ int64_t slsDetector::getId( idMode mode, int imod){
|
||||
#endif
|
||||
if (mode==THIS_SOFTWARE_VERSION) {
|
||||
ret=OK;
|
||||
retval=GITREV;
|
||||
retval=(retval<<32) | GITDATE;
|
||||
retval=GITDATE;
|
||||
} else if (mode==RECEIVER_VERSION) {
|
||||
if (thisDetector->receiverOnlineFlag==ONLINE_FLAG) {
|
||||
if (connectData() == OK){
|
||||
|
@ -10,8 +10,7 @@ int main(int argc, char *argv[])
|
||||
{
|
||||
for (int i = 1; i < argc; ++i ) {
|
||||
if (!(strcmp (argv[i],"--version")) || !(strcmp (argv[i],"-v"))) {
|
||||
int64_t tempval = GITREV;
|
||||
tempval = (tempval <<32) | GITDATE;
|
||||
int64_t tempval = GITDATE;
|
||||
cout << argv[0] << " " << GITBRANCH << " (0x" << hex << tempval << ")" << endl;
|
||||
return 0;
|
||||
}
|
||||
|
@ -1,9 +1,9 @@
|
||||
Path: slsDetectorsPackage/slsReceiverSoftware
|
||||
URL: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git
|
||||
Repository Root: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git
|
||||
Repsitory UUID: b58c3e8951625ed9124669404f6b68aca340a1b8
|
||||
Revision: 764
|
||||
Repsitory UUID: b8bdbf4da61f95b88893b02ddabc2491b16fa10f
|
||||
Revision: 767
|
||||
Branch: developer
|
||||
Last Changed Author: Dhanya_Thattil
|
||||
Last Changed Rev: 3727
|
||||
Last Changed Date: 2018-03-13 10:29:32.000000002 +0100 ./src/slsReceiverTCPIPInterface.cpp
|
||||
Last Changed Rev: 3746
|
||||
Last Changed Date: 2018-03-27 10:43:44.000000002 +0200 ./src/slsReceiverTCPIPInterface.cpp
|
||||
|
@ -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 0x20180313
|
||||
#define GITREV 0x3746
|
||||
#define GITDATE 0x20180327
|
||||
#define GITBRANCH "developer"
|
||||
|
@ -153,8 +153,7 @@ void slsReceiverTCPIPInterface::stop(){
|
||||
|
||||
|
||||
int64_t slsReceiverTCPIPInterface::getReceiverVersion(){
|
||||
int64_t retval = GITREV;
|
||||
retval= (retval <<32) | GITDATE;
|
||||
int64_t retval = GITDATE;
|
||||
return retval;
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user