updaterev

This commit is contained in:
2019-02-08 17:28:44 +01:00
parent 3c77447868
commit 6bf1a944da
7 changed files with 30 additions and 30 deletions

View File

@ -1,7 +1,7 @@
package: package:
name: sls_detector_software name: sls_detector_software
version: 4.0.1rc version: 4.0.1
source: source:
- path: .. - path: ..
@ -52,14 +52,14 @@ requirements:
outputs: outputs:
- name: sls_detector_lib - name: sls_detector_lib
version: 4.0.1rc version: 4.0.1
script: copy_lib.sh script: copy_lib.sh
requirements: requirements:
build: build:
- {{ compiler('c') }} - {{ compiler('c') }}
- {{compiler('cxx')}} - {{compiler('cxx')}}
- name: sls_detector_gui - name: sls_detector_gui
version: 4.0.1rc version: 4.0.1
script: copy_gui.sh script: copy_gui.sh
requirements: requirements:
build: build:
@ -84,6 +84,6 @@ outputs:
- {{ cdt('libxdamage') }} # [linux] - {{ cdt('libxdamage') }} # [linux]
- {{ cdt('libxxf86vm') }} # [linux] - {{ cdt('libxxf86vm') }} # [linux]
run: run:
- sls_detector_lib=4.0.1rc - sls_detector_lib=4.0.1
- qwt 6.* - qwt 6.*
- qt=4.8.7=7 - qt=4.8.7=7

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: 22686e1e250d2b437e0462635922fcbad2f63cf9 Repsitory UUID: 3c774478681813e451df683e2bc8403b37490323
Revision: 523 Revision: 524
Branch: 4.0.1-rc Branch: 4.0.1
Last Changed Author: Dhanya_Thattil Last Changed Author: Dhanya_Thattil
Last Changed Rev: 4069 Last Changed Rev: 4084
Last Changed Date: 2019-02-07 16:51:30.000000002 +0100 ./src/qTabSettings.cpp Last Changed Date: 2019-02-07 18:05:28.000000002 +0100 ./src/qTabSettings.cpp

View File

@ -1,6 +1,6 @@
#define GITURL "git@github.com:slsdetectorgroup/slsDetectorPackage.git" #define GITURL "git@github.com:slsdetectorgroup/slsDetectorPackage.git"
#define GITREPUUID "22686e1e250d2b437e0462635922fcbad2f63cf9" #define GITREPUUID "3c774478681813e451df683e2bc8403b37490323"
#define GITAUTH "Dhanya_Thattil" #define GITAUTH "Dhanya_Thattil"
#define GITREV 0x4069 #define GITREV 0x4084
#define GITDATE 0x20190207 #define GITDATE 0x20190207
#define GITBRANCH "4.0.1-rc" #define GITBRANCH "4.0.1"

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: 22686e1e250d2b437e0462635922fcbad2f63cf9 Repsitory UUID: 3c774478681813e451df683e2bc8403b37490323
Revision: 2064 Revision: 2071
Branch: 4.0.1-rc Branch: 4.0.1
Last Changed Author: Dhanya_Thattil Last Changed Author: Dhanya_Thattil
Last Changed Rev: 4069 Last Changed Rev: 4084
Last Changed Date: 2019-02-07 16:54:14.000000002 +0100 ./threadFiles/ThreadPool.o Last Changed Date: 2019-02-08 17:25:57.000000002 +0100 ./threadFiles/ThreadPool.o

View File

@ -1,6 +1,6 @@
#define GITURL "git@github.com:slsdetectorgroup/slsDetectorPackage.git" #define GITURL "git@github.com:slsdetectorgroup/slsDetectorPackage.git"
#define GITREPUUID "22686e1e250d2b437e0462635922fcbad2f63cf9" #define GITREPUUID "3c774478681813e451df683e2bc8403b37490323"
#define GITAUTH "Dhanya_Thattil" #define GITAUTH "Dhanya_Thattil"
#define GITREV 0x4069 #define GITREV 0x4084
#define GITDATE 0x20190207 #define GITDATE 0x20190208
#define GITBRANCH "4.0.1-rc" #define GITBRANCH "4.0.1"

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: 22686e1e250d2b437e0462635922fcbad2f63cf9 Repsitory UUID: 3c774478681813e451df683e2bc8403b37490323
Revision: 849 Revision: 858
Branch: 4.0.1-rc Branch: 4.0.1
Last Changed Author: Dhanya_Thattil Last Changed Author: Dhanya_Thattil
Last Changed Rev: 4069 Last Changed Rev: 4084
Last Changed Date: 2019-02-07 16:51:31.000000002 +0100 ./src/utilities.cpp Last Changed Date: 2019-02-08 16:44:46.000000002 +0100 ./src/Listener.cpp

View File

@ -1,6 +1,6 @@
#define GITURL "git@github.com:slsdetectorgroup/slsDetectorPackage.git" #define GITURL "git@github.com:slsdetectorgroup/slsDetectorPackage.git"
#define GITREPUUID "22686e1e250d2b437e0462635922fcbad2f63cf9" #define GITREPUUID "3c774478681813e451df683e2bc8403b37490323"
#define GITAUTH "Dhanya_Thattil" #define GITAUTH "Dhanya_Thattil"
#define GITREV 0x4069 #define GITREV 0x4084
#define GITDATE 0x20190207 #define GITDATE 0x20190208
#define GITBRANCH "4.0.1-rc" #define GITBRANCH "4.0.1"