From 006eff921309122ae771a93f439a29d0bbd231da Mon Sep 17 00:00:00 2001 From: Dhanya Thattil Date: Fri, 9 Dec 2022 12:30:03 +0100 Subject: [PATCH 1/3] minor --- RELEASE.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/RELEASE.txt b/RELEASE.txt index e5ea07064..4ed282842 100644 --- a/RELEASE.txt +++ b/RELEASE.txt @@ -42,7 +42,6 @@ This document describes the differences between v7.0.0.rc1 and v6.1.2 Option to provide a custom location to look for ZeroMQ, if not found using FindZeroMQ.cmake - For example, to use the system installed zmq: Using cmake: -DZeroMQ_HINT=/usr/lib64 Using cmk.sh script: -q /usr/lib64 From f52942877380783521c6436528141f32696ee6f8 Mon Sep 17 00:00:00 2001 From: Dhanya Thattil Date: Mon, 12 Dec 2022 08:39:04 +0100 Subject: [PATCH 2/3] added binaries for the fix --- .../bin/ctbDetectorServerv7.0.0.rc1 | Bin 317404 -> 317404 bytes .../bin/eigerDetectorServerv7.0.0.rc1 | Bin 431505 -> 431505 bytes .../bin/gotthard2DetectorServerv7.0.0.rc1 | Bin 282012 -> 282012 bytes .../bin/gotthardDetectorServerv7.0.0.rc1 | Bin 270844 -> 270844 bytes .../bin/jungfrauDetectorServerv7.0.0.rc1 | Bin 302632 -> 302632 bytes .../bin/moenchDetectorServerv7.0.0.rc1 | Bin 306008 -> 306008 bytes .../bin/mythen3DetectorServerv7.0.0.rc1 | Bin 291832 -> 291832 bytes slsSupportLib/include/sls/versionAPI.h | 14 +++++++------- 8 files changed, 7 insertions(+), 7 deletions(-) diff --git a/slsDetectorServers/ctbDetectorServer/bin/ctbDetectorServerv7.0.0.rc1 b/slsDetectorServers/ctbDetectorServer/bin/ctbDetectorServerv7.0.0.rc1 index b720ce36d0d13b57af8bb9d147234dbfba592bd9..b18c0b6c362eebb8b06c6936b501d2cabbd86397 100755 GIT binary patch delta 52 zcmcb!Uii*>;R%||({6s79{7z}qS2+*g|XFzX{!sfh&hv?(e@~FW-f6cqdm=!d3%~4 HOIarX8@3VJ delta 52 zcmcb!Uii*>;R%||6X*Pz9{7z}qS2+*g|XFzX{!sfh&hvi#r7z3W-f6cqdm=!d3%~4 HOIarX5*iVv diff --git a/slsDetectorServers/eigerDetectorServer/bin/eigerDetectorServerv7.0.0.rc1 b/slsDetectorServers/eigerDetectorServer/bin/eigerDetectorServerv7.0.0.rc1 index c8a3106c31f875e8a4a6f57b418ab0abf55b5723..235e80ba35f25485e85b845693369a58db376a45 100755 GIT binary patch delta 41 ucmbQZT595IsfHHD7N#xC60evHjkZg@Vty9_WVCbHvj8#cb}oCi_Amf5&kaWa delta 41 ucmbQZT595IsfHHD7N#xC60evHEVfI%Vty9_WVCbHvj8#cb}oCi_Amf6kPT4) diff --git a/slsDetectorServers/gotthard2DetectorServer/bin/gotthard2DetectorServerv7.0.0.rc1 b/slsDetectorServers/gotthard2DetectorServer/bin/gotthard2DetectorServerv7.0.0.rc1 index 8b491f7a5c2b232a43c14ee482b333a6b4b70f0b..bac68afdce6209602dace9e7700e6ba7a95c4f5c 100755 GIT binary patch delta 39 xcmV+?0NDSWn-QFw5wIZF14N9>gCp06Bi8}9Bi90j1_CiMhpOEIx2oL(@^4V-5i0-y delta 39 xcmV+?0NDSWn-QFw5wIZF0|X4tgCp06Bi8}9Bi90j1_CfRhpOEIx2oL(@^3s95OM$j diff --git a/slsDetectorServers/gotthardDetectorServer/bin/gotthardDetectorServerv7.0.0.rc1 b/slsDetectorServers/gotthardDetectorServer/bin/gotthardDetectorServerv7.0.0.rc1 index 42b0ec36ae76a928e8e902cea4b6064ece9c67db..e68e9c5579db5c969f8f0af7f633416549d7820f 100755 GIT binary patch delta 49 zcmex!Sm4iLfeD(-({6sBzA=_rqS2+*g>kD3Q^p}CL!<5M4lykg1v1*hZZK^RyTQE7 F696M!6mb9m delta 49 zcmex!Sm4iLfeD(-6X*P%zA=_rqS2+*g>kD3Q^p}C1B>nJ4lykg1v1*hZZK^RyTQE7 F695`}6g>a{ diff --git a/slsDetectorServers/jungfrauDetectorServer/bin/jungfrauDetectorServerv7.0.0.rc1 b/slsDetectorServers/jungfrauDetectorServer/bin/jungfrauDetectorServerv7.0.0.rc1 index 9a8617e063f46210dcf036e1fa62998965e9ae1b..6617666e0bfff4d0ba55ad3366efc35448cfe8c0 100755 GIT binary patch delta 52 zcmZ3nM`*gZrq5`=|l8`=|oJV*)WUhrSF0x4sMnI%mMf6Mz5! delta 39 xcmV+?0NDTd=Mnhl5wQ5E0|X4tgZrq5`=|l8`=|oJV*)TZhrSF0x4sMnI%li$62|}l diff --git a/slsSupportLib/include/sls/versionAPI.h b/slsSupportLib/include/sls/versionAPI.h index 40e5e27ff..1326f4eb7 100644 --- a/slsSupportLib/include/sls/versionAPI.h +++ b/slsSupportLib/include/sls/versionAPI.h @@ -4,10 +4,10 @@ #define RELEASE "7.0.0.rc1" #define APILIB "7.0.0.rc1 0x221208" #define APIRECEIVER "7.0.0.rc1 0x221208" -#define APICTB "7.0.0.rc1 0x221208" -#define APIGOTTHARD "7.0.0.rc1 0x221208" -#define APIGOTTHARD2 "7.0.0.rc1 0x221208" -#define APIJUNGFRAU "7.0.0.rc1 0x221208" -#define APIMYTHEN3 "7.0.0.rc1 0x221208" -#define APIMOENCH "7.0.0.rc1 0x221208" -#define APIEIGER "7.0.0.rc1 0x221208" +#define APICTB "7.0.0.rc1 0x221212" +#define APIGOTTHARD "7.0.0.rc1 0x221212" +#define APIGOTTHARD2 "7.0.0.rc1 0x221212" +#define APIJUNGFRAU "7.0.0.rc1 0x221212" +#define APIMYTHEN3 "7.0.0.rc1 0x221212" +#define APIMOENCH "7.0.0.rc1 0x221212" +#define APIEIGER "7.0.0.rc1 0x221212" From 8ef032aecdc12bc9ebf0c87975e4f5f7566142c8 Mon Sep 17 00:00:00 2001 From: Dhanya Thattil Date: Mon, 12 Dec 2022 08:41:58 +0100 Subject: [PATCH 3/3] Revert "added binaries for the fix" This reverts commit f52942877380783521c6436528141f32696ee6f8. --- .../bin/ctbDetectorServerv7.0.0.rc1 | Bin 317404 -> 317404 bytes .../bin/eigerDetectorServerv7.0.0.rc1 | Bin 431505 -> 431505 bytes .../bin/gotthard2DetectorServerv7.0.0.rc1 | Bin 282012 -> 282012 bytes .../bin/gotthardDetectorServerv7.0.0.rc1 | Bin 270844 -> 270844 bytes .../bin/jungfrauDetectorServerv7.0.0.rc1 | Bin 302632 -> 302632 bytes .../bin/moenchDetectorServerv7.0.0.rc1 | Bin 306008 -> 306008 bytes .../bin/mythen3DetectorServerv7.0.0.rc1 | Bin 291832 -> 291832 bytes slsSupportLib/include/sls/versionAPI.h | 14 +++++++------- 8 files changed, 7 insertions(+), 7 deletions(-) diff --git a/slsDetectorServers/ctbDetectorServer/bin/ctbDetectorServerv7.0.0.rc1 b/slsDetectorServers/ctbDetectorServer/bin/ctbDetectorServerv7.0.0.rc1 index b18c0b6c362eebb8b06c6936b501d2cabbd86397..b720ce36d0d13b57af8bb9d147234dbfba592bd9 100755 GIT binary patch delta 52 zcmcb!Uii*>;R%||6X*Pz9{7z}qS2+*g|XFzX{!sfh&hvi#r7z3W-f6cqdm=!d3%~4 HOIarX5*iVv delta 52 zcmcb!Uii*>;R%||({6s79{7z}qS2+*g|XFzX{!sfh&hv?(e@~FW-f6cqdm=!d3%~4 HOIarX8@3VJ diff --git a/slsDetectorServers/eigerDetectorServer/bin/eigerDetectorServerv7.0.0.rc1 b/slsDetectorServers/eigerDetectorServer/bin/eigerDetectorServerv7.0.0.rc1 index 235e80ba35f25485e85b845693369a58db376a45..c8a3106c31f875e8a4a6f57b418ab0abf55b5723 100755 GIT binary patch delta 41 ucmbQZT595IsfHHD7N#xC60evHEVfI%Vty9_WVCbHvj8#cb}oCi_Amf6kPT4) delta 41 ucmbQZT595IsfHHD7N#xC60evHjkZg@Vty9_WVCbHvj8#cb}oCi_Amf5&kaWa diff --git a/slsDetectorServers/gotthard2DetectorServer/bin/gotthard2DetectorServerv7.0.0.rc1 b/slsDetectorServers/gotthard2DetectorServer/bin/gotthard2DetectorServerv7.0.0.rc1 index bac68afdce6209602dace9e7700e6ba7a95c4f5c..8b491f7a5c2b232a43c14ee482b333a6b4b70f0b 100755 GIT binary patch delta 39 xcmV+?0NDSWn-QFw5wIZF0|X4tgCp06Bi8}9Bi90j1_CfRhpOEIx2oL(@^3s95OM$j delta 39 xcmV+?0NDSWn-QFw5wIZF14N9>gCp06Bi8}9Bi90j1_CiMhpOEIx2oL(@^4V-5i0-y diff --git a/slsDetectorServers/gotthardDetectorServer/bin/gotthardDetectorServerv7.0.0.rc1 b/slsDetectorServers/gotthardDetectorServer/bin/gotthardDetectorServerv7.0.0.rc1 index e68e9c5579db5c969f8f0af7f633416549d7820f..42b0ec36ae76a928e8e902cea4b6064ece9c67db 100755 GIT binary patch delta 49 zcmex!Sm4iLfeD(-6X*P%zA=_rqS2+*g>kD3Q^p}C1B>nJ4lykg1v1*hZZK^RyTQE7 F695`}6g>a{ delta 49 zcmex!Sm4iLfeD(-({6sBzA=_rqS2+*g>kD3Q^p}CL!<5M4lykg1v1*hZZK^RyTQE7 F696M!6mb9m diff --git a/slsDetectorServers/jungfrauDetectorServer/bin/jungfrauDetectorServerv7.0.0.rc1 b/slsDetectorServers/jungfrauDetectorServer/bin/jungfrauDetectorServerv7.0.0.rc1 index 6617666e0bfff4d0ba55ad3366efc35448cfe8c0..9a8617e063f46210dcf036e1fa62998965e9ae1b 100755 GIT binary patch delta 52 zcmZ3nM`*gZrq5`=|l8`=|oJV*)WUhrSF0x4sMnI%mMf6Mz5! diff --git a/slsSupportLib/include/sls/versionAPI.h b/slsSupportLib/include/sls/versionAPI.h index 1326f4eb7..40e5e27ff 100644 --- a/slsSupportLib/include/sls/versionAPI.h +++ b/slsSupportLib/include/sls/versionAPI.h @@ -4,10 +4,10 @@ #define RELEASE "7.0.0.rc1" #define APILIB "7.0.0.rc1 0x221208" #define APIRECEIVER "7.0.0.rc1 0x221208" -#define APICTB "7.0.0.rc1 0x221212" -#define APIGOTTHARD "7.0.0.rc1 0x221212" -#define APIGOTTHARD2 "7.0.0.rc1 0x221212" -#define APIJUNGFRAU "7.0.0.rc1 0x221212" -#define APIMYTHEN3 "7.0.0.rc1 0x221212" -#define APIMOENCH "7.0.0.rc1 0x221212" -#define APIEIGER "7.0.0.rc1 0x221212" +#define APICTB "7.0.0.rc1 0x221208" +#define APIGOTTHARD "7.0.0.rc1 0x221208" +#define APIGOTTHARD2 "7.0.0.rc1 0x221208" +#define APIJUNGFRAU "7.0.0.rc1 0x221208" +#define APIMYTHEN3 "7.0.0.rc1 0x221208" +#define APIMOENCH "7.0.0.rc1 0x221208" +#define APIEIGER "7.0.0.rc1 0x221208"