From 6bf1a944daa45f4ee8e2a92fd2d56da0da5f4ab4 Mon Sep 17 00:00:00 2001 From: Dhanya Thattil Date: Fri, 8 Feb 2019 17:28:44 +0100 Subject: [PATCH] updaterev --- recipe/meta.yaml | 8 ++++---- slsDetectorGui/gitInfo.txt | 10 +++++----- slsDetectorGui/include/gitInfoGui.h | 6 +++--- slsDetectorSoftware/gitInfo.txt | 10 +++++----- slsDetectorSoftware/slsDetector/gitInfoLib.h | 8 ++++---- slsReceiverSoftware/gitInfo.txt | 10 +++++----- slsReceiverSoftware/include/gitInfoReceiver.h | 8 ++++---- 7 files changed, 30 insertions(+), 30 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 870c7cc9e..ae32daf3a 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,7 +1,7 @@ package: name: sls_detector_software - version: 4.0.1rc + version: 4.0.1 source: - path: .. @@ -52,14 +52,14 @@ requirements: outputs: - name: sls_detector_lib - version: 4.0.1rc + version: 4.0.1 script: copy_lib.sh requirements: build: - {{ compiler('c') }} - {{compiler('cxx')}} - name: sls_detector_gui - version: 4.0.1rc + version: 4.0.1 script: copy_gui.sh requirements: build: @@ -84,6 +84,6 @@ outputs: - {{ cdt('libxdamage') }} # [linux] - {{ cdt('libxxf86vm') }} # [linux] run: - - sls_detector_lib=4.0.1rc + - sls_detector_lib=4.0.1 - qwt 6.* - qt=4.8.7=7 diff --git a/slsDetectorGui/gitInfo.txt b/slsDetectorGui/gitInfo.txt index 9d374513e..396cf509e 100644 --- a/slsDetectorGui/gitInfo.txt +++ b/slsDetectorGui/gitInfo.txt @@ -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: 22686e1e250d2b437e0462635922fcbad2f63cf9 -Revision: 523 -Branch: 4.0.1-rc +Repsitory UUID: 3c774478681813e451df683e2bc8403b37490323 +Revision: 524 +Branch: 4.0.1 Last Changed Author: Dhanya_Thattil -Last Changed Rev: 4069 -Last Changed Date: 2019-02-07 16:51:30.000000002 +0100 ./src/qTabSettings.cpp +Last Changed Rev: 4084 +Last Changed Date: 2019-02-07 18:05:28.000000002 +0100 ./src/qTabSettings.cpp diff --git a/slsDetectorGui/include/gitInfoGui.h b/slsDetectorGui/include/gitInfoGui.h index e7b7de46c..fcdafa185 100644 --- a/slsDetectorGui/include/gitInfoGui.h +++ b/slsDetectorGui/include/gitInfoGui.h @@ -1,6 +1,6 @@ #define GITURL "git@github.com:slsdetectorgroup/slsDetectorPackage.git" -#define GITREPUUID "22686e1e250d2b437e0462635922fcbad2f63cf9" +#define GITREPUUID "3c774478681813e451df683e2bc8403b37490323" #define GITAUTH "Dhanya_Thattil" -#define GITREV 0x4069 +#define GITREV 0x4084 #define GITDATE 0x20190207 -#define GITBRANCH "4.0.1-rc" +#define GITBRANCH "4.0.1" diff --git a/slsDetectorSoftware/gitInfo.txt b/slsDetectorSoftware/gitInfo.txt index 0121e6b64..24128dd00 100644 --- a/slsDetectorSoftware/gitInfo.txt +++ b/slsDetectorSoftware/gitInfo.txt @@ -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: 22686e1e250d2b437e0462635922fcbad2f63cf9 -Revision: 2064 -Branch: 4.0.1-rc +Repsitory UUID: 3c774478681813e451df683e2bc8403b37490323 +Revision: 2071 +Branch: 4.0.1 Last Changed Author: Dhanya_Thattil -Last Changed Rev: 4069 -Last Changed Date: 2019-02-07 16:54:14.000000002 +0100 ./threadFiles/ThreadPool.o +Last Changed Rev: 4084 +Last Changed Date: 2019-02-08 17:25:57.000000002 +0100 ./threadFiles/ThreadPool.o diff --git a/slsDetectorSoftware/slsDetector/gitInfoLib.h b/slsDetectorSoftware/slsDetector/gitInfoLib.h index e7b7de46c..02fca6a8d 100644 --- a/slsDetectorSoftware/slsDetector/gitInfoLib.h +++ b/slsDetectorSoftware/slsDetector/gitInfoLib.h @@ -1,6 +1,6 @@ #define GITURL "git@github.com:slsdetectorgroup/slsDetectorPackage.git" -#define GITREPUUID "22686e1e250d2b437e0462635922fcbad2f63cf9" +#define GITREPUUID "3c774478681813e451df683e2bc8403b37490323" #define GITAUTH "Dhanya_Thattil" -#define GITREV 0x4069 -#define GITDATE 0x20190207 -#define GITBRANCH "4.0.1-rc" +#define GITREV 0x4084 +#define GITDATE 0x20190208 +#define GITBRANCH "4.0.1" diff --git a/slsReceiverSoftware/gitInfo.txt b/slsReceiverSoftware/gitInfo.txt index 995dd3545..b5bbd9fb6 100644 --- a/slsReceiverSoftware/gitInfo.txt +++ b/slsReceiverSoftware/gitInfo.txt @@ -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: 22686e1e250d2b437e0462635922fcbad2f63cf9 -Revision: 849 -Branch: 4.0.1-rc +Repsitory UUID: 3c774478681813e451df683e2bc8403b37490323 +Revision: 858 +Branch: 4.0.1 Last Changed Author: Dhanya_Thattil -Last Changed Rev: 4069 -Last Changed Date: 2019-02-07 16:51:31.000000002 +0100 ./src/utilities.cpp +Last Changed Rev: 4084 +Last Changed Date: 2019-02-08 16:44:46.000000002 +0100 ./src/Listener.cpp diff --git a/slsReceiverSoftware/include/gitInfoReceiver.h b/slsReceiverSoftware/include/gitInfoReceiver.h index e7b7de46c..02fca6a8d 100644 --- a/slsReceiverSoftware/include/gitInfoReceiver.h +++ b/slsReceiverSoftware/include/gitInfoReceiver.h @@ -1,6 +1,6 @@ #define GITURL "git@github.com:slsdetectorgroup/slsDetectorPackage.git" -#define GITREPUUID "22686e1e250d2b437e0462635922fcbad2f63cf9" +#define GITREPUUID "3c774478681813e451df683e2bc8403b37490323" #define GITAUTH "Dhanya_Thattil" -#define GITREV 0x4069 -#define GITDATE 0x20190207 -#define GITBRANCH "4.0.1-rc" +#define GITREV 0x4084 +#define GITDATE 0x20190208 +#define GITBRANCH "4.0.1"