From 90fb8258ca261d58ce035c800fba7ccbfe990006 Mon Sep 17 00:00:00 2001 From: Dhanya Maliakal Date: Tue, 14 Nov 2017 17:52:51 +0100 Subject: [PATCH 1/4] updated binaries --- serverBin/eigerDetectorServer | 2 +- serverBin/jungfrauDetectorServer | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/serverBin/eigerDetectorServer b/serverBin/eigerDetectorServer index de04d83a9..d66dad8c1 120000 --- a/serverBin/eigerDetectorServer +++ b/serverBin/eigerDetectorServer @@ -1 +1 @@ -../slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServerv3.0.0.16.10 \ No newline at end of file +../slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServerv3.0.0.16.8 \ No newline at end of file diff --git a/serverBin/jungfrauDetectorServer b/serverBin/jungfrauDetectorServer index aeb42a3f9..963568b79 120000 --- a/serverBin/jungfrauDetectorServer +++ b/serverBin/jungfrauDetectorServer @@ -1 +1 @@ -../slsDetectorSoftware/jungfrauDetectorServer/bin/jungfrauDetectorServerv3.0.0.6.1 \ No newline at end of file +../slsDetectorSoftware/jungfrauDetectorServer/bin/jungfrauDetectorServerv3.0.0.6.2 \ No newline at end of file From bee751cebb9bd644e71b5f879c7eb1d0ce477994 Mon Sep 17 00:00:00 2001 From: Dhanya Maliakal Date: Wed, 15 Nov 2017 09:31:49 +0100 Subject: [PATCH 2/4] updated binaries --- serverBin/eigerDetectorServer | 1 - serverBin/eigerDetectorServerv3.0.0.16.10 | 1 + serverBin/gotthardDetectorServer | 1 - serverBin/gotthardDetectorServerv3.0.0.6 | 1 + .../{jungfrauDetectorServer => jungfrauDetectorServerv3.0.0.6.2} | 0 serverBin/{moenchDetectorServer => moenchDetectorServerv2.0.3} | 0 serverBin/{mythenDetectorServer => mythenDetectorServerv2.0.3} | 0 7 files changed, 2 insertions(+), 2 deletions(-) delete mode 120000 serverBin/eigerDetectorServer create mode 120000 serverBin/eigerDetectorServerv3.0.0.16.10 delete mode 120000 serverBin/gotthardDetectorServer create mode 120000 serverBin/gotthardDetectorServerv3.0.0.6 rename serverBin/{jungfrauDetectorServer => jungfrauDetectorServerv3.0.0.6.2} (100%) rename serverBin/{moenchDetectorServer => moenchDetectorServerv2.0.3} (100%) rename serverBin/{mythenDetectorServer => mythenDetectorServerv2.0.3} (100%) diff --git a/serverBin/eigerDetectorServer b/serverBin/eigerDetectorServer deleted file mode 120000 index d66dad8c1..000000000 --- a/serverBin/eigerDetectorServer +++ /dev/null @@ -1 +0,0 @@ -../slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServerv3.0.0.16.8 \ No newline at end of file diff --git a/serverBin/eigerDetectorServerv3.0.0.16.10 b/serverBin/eigerDetectorServerv3.0.0.16.10 new file mode 120000 index 000000000..de04d83a9 --- /dev/null +++ b/serverBin/eigerDetectorServerv3.0.0.16.10 @@ -0,0 +1 @@ +../slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServerv3.0.0.16.10 \ No newline at end of file diff --git a/serverBin/gotthardDetectorServer b/serverBin/gotthardDetectorServer deleted file mode 120000 index 98922ce43..000000000 --- a/serverBin/gotthardDetectorServer +++ /dev/null @@ -1 +0,0 @@ -../slsDetectorSoftware/gotthardDetectorServer/gotthardDetectorServerv3.0.0.5 \ No newline at end of file diff --git a/serverBin/gotthardDetectorServerv3.0.0.6 b/serverBin/gotthardDetectorServerv3.0.0.6 new file mode 120000 index 000000000..ca005a699 --- /dev/null +++ b/serverBin/gotthardDetectorServerv3.0.0.6 @@ -0,0 +1 @@ +../slsDetectorSoftware/gotthardDetectorServer/gotthardDetectorServerv3.0.0.6 \ No newline at end of file diff --git a/serverBin/jungfrauDetectorServer b/serverBin/jungfrauDetectorServerv3.0.0.6.2 similarity index 100% rename from serverBin/jungfrauDetectorServer rename to serverBin/jungfrauDetectorServerv3.0.0.6.2 diff --git a/serverBin/moenchDetectorServer b/serverBin/moenchDetectorServerv2.0.3 similarity index 100% rename from serverBin/moenchDetectorServer rename to serverBin/moenchDetectorServerv2.0.3 diff --git a/serverBin/mythenDetectorServer b/serverBin/mythenDetectorServerv2.0.3 similarity index 100% rename from serverBin/mythenDetectorServer rename to serverBin/mythenDetectorServerv2.0.3 From 875ca44c0b99a634fa3aaf2dbcf14b5099cc47f3 Mon Sep 17 00:00:00 2001 From: Dhanya Maliakal Date: Thu, 16 Nov 2017 12:30:41 +0100 Subject: [PATCH 3/4] updated server hotfix binary --- serverBin/jungfrauDetectorServerv3.0.0.6.2 | 1 - serverBin/jungfrauDetectorServerv3.0.0.6.3 | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) delete mode 120000 serverBin/jungfrauDetectorServerv3.0.0.6.2 create mode 120000 serverBin/jungfrauDetectorServerv3.0.0.6.3 diff --git a/serverBin/jungfrauDetectorServerv3.0.0.6.2 b/serverBin/jungfrauDetectorServerv3.0.0.6.2 deleted file mode 120000 index 963568b79..000000000 --- a/serverBin/jungfrauDetectorServerv3.0.0.6.2 +++ /dev/null @@ -1 +0,0 @@ -../slsDetectorSoftware/jungfrauDetectorServer/bin/jungfrauDetectorServerv3.0.0.6.2 \ No newline at end of file diff --git a/serverBin/jungfrauDetectorServerv3.0.0.6.3 b/serverBin/jungfrauDetectorServerv3.0.0.6.3 new file mode 120000 index 000000000..386608ee5 --- /dev/null +++ b/serverBin/jungfrauDetectorServerv3.0.0.6.3 @@ -0,0 +1 @@ +../slsDetectorSoftware/jungfrauDetectorServer/bin/jungfrauDetectorServerv3.0.0.6.3 \ No newline at end of file From b020270734b68fc41fdb0e1c7ad25ecf265672b8 Mon Sep 17 00:00:00 2001 From: Dhanya Maliakal Date: Fri, 17 Nov 2017 08:46:59 +0100 Subject: [PATCH 4/4] edited cmake to show warnings --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index c5c302e9a..0425353e4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,7 +3,7 @@ set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake") set (REST OFF) set (CALIBRATE OFF) option (USE_HDF5 "HDF5 File format" OFF) - +set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall") find_package(Qt4) find_package(Qwt 6)