From 90329ab34a07c7999150132b674a65c543ce6c0d Mon Sep 17 00:00:00 2001
From: Tammo Jan Dijkema <dijkema@astron.nl>
Date: Wed, 24 Aug 2016 12:24:25 +0000
Subject: [PATCH] Task #9798: fix symlinks in pipeline installation

---
 .gitattributes                                |  2 ++
 CEP/Pipeline/recipes/sip/CMakeLists.txt       | 20 ++-----------------
 CEP/Pipeline/recipes/sip/bin/CMakeLists.txt   | 19 ++++++++++++++++++
 .../bad_station_detection/CMakeLists.txt      |  6 ++++++
 4 files changed, 29 insertions(+), 18 deletions(-)
 create mode 100644 CEP/Pipeline/recipes/sip/bin/CMakeLists.txt
 create mode 100644 CEP/Pipeline/recipes/sip/external/bad_station_detection/CMakeLists.txt

diff --git a/.gitattributes b/.gitattributes
index e8eba5c3e36..c94fae351e0 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1521,6 +1521,7 @@ CEP/Pipeline/recipes/examples/master/example.py eol=lf
 CEP/Pipeline/recipes/examples/master/example_parallel.py eol=lf
 CEP/Pipeline/recipes/examples/nodes/example_parallel.py eol=lf
 CEP/Pipeline/recipes/sip/CMakeLists.txt eol=lf
+CEP/Pipeline/recipes/sip/bin/CMakeLists.txt -text
 CEP/Pipeline/recipes/sip/bin/genericpipeline.py -text
 CEP/Pipeline/recipes/sip/bin/imaging_pipeline.py -text
 CEP/Pipeline/recipes/sip/bin/loader.py -text
@@ -1545,6 +1546,7 @@ CEP/Pipeline/recipes/sip/demixing/bbs_TauA.parset eol=lf
 CEP/Pipeline/recipes/sip/demixing/bbs_TauA_smoothcal.parset eol=lf
 CEP/Pipeline/recipes/sip/demixing/bbs_VirA.parset eol=lf
 CEP/Pipeline/recipes/sip/demixing/bbs_VirA_smoothcal.parset eol=lf
+CEP/Pipeline/recipes/sip/external/bad_station_detection/CMakeLists.txt -text
 CEP/Pipeline/recipes/sip/helpers/ComplexArray.py -text
 CEP/Pipeline/recipes/sip/helpers/MultipartPostHandler.py -text
 CEP/Pipeline/recipes/sip/helpers/WritableParmDB.py -text
diff --git a/CEP/Pipeline/recipes/sip/CMakeLists.txt b/CEP/Pipeline/recipes/sip/CMakeLists.txt
index 297a997162b..ed77327d735 100644
--- a/CEP/Pipeline/recipes/sip/CMakeLists.txt
+++ b/CEP/Pipeline/recipes/sip/CMakeLists.txt
@@ -64,24 +64,8 @@ python_install(
   plugins/PipelineStep_combineParsets.py
   DESTINATION lofarpipe/recipes)
 
-lofar_add_bin_scripts(
-  bin/calibration_pipeline.py
-  bin/msss_calibrator_pipeline.py
-  bin/msss_imager_pipeline.py
-  bin/msss_target_pipeline.py
-  bin/preprocessing_pipeline.py
-  bin/imaging_pipeline.py
-  bin/pulsar_pipeline.py
-  bin/long_baseline_pipeline.py
-  bin/selfcal_imager_pipeline.py
-  bin/runPipeline.sh
-  bin/startPython.sh
-  bin/startPythonVersion.sh
-  bin/stopPython.sh
-  bin/genericpipeline.py
-  bin/loader.py
-  external/bad_station_detection/asciistats.py
-  external/bad_station_detection/statsplot.py)
+add_subdirectory(bin)
+add_subdirectory(external/bad_station_detection)
 
 install(FILES
   demixing/bbs_CasA.parset
diff --git a/CEP/Pipeline/recipes/sip/bin/CMakeLists.txt b/CEP/Pipeline/recipes/sip/bin/CMakeLists.txt
new file mode 100644
index 00000000000..53d89911854
--- /dev/null
+++ b/CEP/Pipeline/recipes/sip/bin/CMakeLists.txt
@@ -0,0 +1,19 @@
+# $Id: CMakeLists.txt 34753 2016-06-20 10:43:42Z schaap $
+
+lofar_add_bin_scripts(
+  calibration_pipeline.py
+  msss_calibrator_pipeline.py
+  msss_imager_pipeline.py
+  msss_target_pipeline.py
+  preprocessing_pipeline.py
+  imaging_pipeline.py
+  pulsar_pipeline.py
+  long_baseline_pipeline.py
+  selfcal_imager_pipeline.py
+  runPipeline.sh
+  startPython.sh
+  startPythonVersion.sh
+  stopPython.sh
+  genericpipeline.py
+  loader.py
+  )
diff --git a/CEP/Pipeline/recipes/sip/external/bad_station_detection/CMakeLists.txt b/CEP/Pipeline/recipes/sip/external/bad_station_detection/CMakeLists.txt
new file mode 100644
index 00000000000..bca19e5255f
--- /dev/null
+++ b/CEP/Pipeline/recipes/sip/external/bad_station_detection/CMakeLists.txt
@@ -0,0 +1,6 @@
+# $Id: CMakeLists.txt 34753 2016-06-20 10:43:42Z schaap $
+
+lofar_add_bin_scripts(
+  asciistats.py
+  statsplot.py
+  )
-- 
GitLab