From a13ef9ed6c2f6d664a7e9da27fe2e7fc7a316cb3 Mon Sep 17 00:00:00 2001
From: Jan David Mol <mol@astron.nl>
Date: Wed, 11 Dec 2013 11:18:53 +0000
Subject: [PATCH] Task #5286: Generate OutputProc.parset and
FinalMetaDataGatherer.parset in order to use the executables installed in
/bin
---
.gitattributes | 4 ++--
RTCP/Cobalt/GPUProc/etc/CMakeLists.txt | 11 +++++++++++
...therer.parset => FinalMetaDataGatherer.parsett.in} | 4 ++--
.../{OutputProc.parset => OutputProc.parset.in} | 2 +-
4 files changed, 16 insertions(+), 5 deletions(-)
rename RTCP/Cobalt/GPUProc/etc/parset-additions.d/default/{FinalMetaDataGatherer.parset => FinalMetaDataGatherer.parsett.in} (81%)
rename RTCP/Cobalt/GPUProc/etc/parset-additions.d/default/{OutputProc.parset => OutputProc.parset.in} (85%)
diff --git a/.gitattributes b/.gitattributes
index 1f27cf00d51..c5cc3150250 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -3824,11 +3824,11 @@ RTCP/Cobalt/GPUProc/doc/rtcp-usage.txt -text
RTCP/Cobalt/GPUProc/doc/scripts.txt -text
RTCP/Cobalt/GPUProc/etc/CMakeLists.txt -text
RTCP/Cobalt/GPUProc/etc/default.parset -text
-RTCP/Cobalt/GPUProc/etc/parset-additions.d/default/FinalMetaDataGatherer.parset -text
+RTCP/Cobalt/GPUProc/etc/parset-additions.d/default/FinalMetaDataGatherer.parsett.in -text
RTCP/Cobalt/GPUProc/etc/parset-additions.d/default/HardwareList.parset -text
RTCP/Cobalt/GPUProc/etc/parset-additions.d/default/HardwareUsed.parset -text
RTCP/Cobalt/GPUProc/etc/parset-additions.d/default/MAC-feedback.parset -text
-RTCP/Cobalt/GPUProc/etc/parset-additions.d/default/OutputProc.parset -text
+RTCP/Cobalt/GPUProc/etc/parset-additions.d/default/OutputProc.parset.in -text
RTCP/Cobalt/GPUProc/etc/parset-additions.d/default/StationCalibration.parset -text
RTCP/Cobalt/GPUProc/etc/parset-additions.d/default/StationStreams.parset -text
RTCP/Cobalt/GPUProc/etc/parset-additions.d/default/generateStationStreams.sh -text
diff --git a/RTCP/Cobalt/GPUProc/etc/CMakeLists.txt b/RTCP/Cobalt/GPUProc/etc/CMakeLists.txt
index cc29aa50212..2e7e616f5d3 100644
--- a/RTCP/Cobalt/GPUProc/etc/CMakeLists.txt
+++ b/RTCP/Cobalt/GPUProc/etc/CMakeLists.txt
@@ -1,5 +1,16 @@
# $Id: CMakeLists.txt 25878 2013-08-01 02:08:38Z amesfoort $
+configure_file(
+ "${CMAKE_CURRENT_SOURCE_DIR}/parset-additions.d/default/OutputProc.parset.in"
+ "${CMAKE_CURRENT_BINARY_DIR}/parset-additions.d/default/OutputProc.parset"
+ @ONLY
+)
+
+configure_file(
+ "${CMAKE_CURRENT_SOURCE_DIR}/parset-additions.d/default/FinalMetaDataGatherer.parset.in"
+ "${CMAKE_CURRENT_BINARY_DIR}/parset-additions.d/default/FinalMetaDataGatherer.parset"
+ @ONLY
+)
install(FILES
parset-additions.d/default/HardwareList.parset
diff --git a/RTCP/Cobalt/GPUProc/etc/parset-additions.d/default/FinalMetaDataGatherer.parset b/RTCP/Cobalt/GPUProc/etc/parset-additions.d/default/FinalMetaDataGatherer.parsett.in
similarity index 81%
rename from RTCP/Cobalt/GPUProc/etc/parset-additions.d/default/FinalMetaDataGatherer.parset
rename to RTCP/Cobalt/GPUProc/etc/parset-additions.d/default/FinalMetaDataGatherer.parsett.in
index 318a87778ee..91bc29ffd09 100644
--- a/RTCP/Cobalt/GPUProc/etc/parset-additions.d/default/FinalMetaDataGatherer.parset
+++ b/RTCP/Cobalt/GPUProc/etc/parset-additions.d/default/FinalMetaDataGatherer.parsett.in
@@ -1,5 +1,5 @@
# The host on which to run the FinalMetaDataGatherer
-Cobalt.FinalMetaDataGatherer.host = lhn001.cep2.lofar
+Cobalt.FinalMetaDataGatherer.host = localhost
# The user with which to log in. If empty, is set to $USER.
Cobalt.FinalMetaDataGatherer.userName =
@@ -11,7 +11,7 @@ Cobalt.FinalMetaDataGatherer.sshPrivateKey =
# The executable of the process to start. If no absolute path is given,
# it needs to be found in $PATH after login.
-Cobalt.FinalMetaDataGatherer.executable = FinalMetaDataGatherer
+Cobalt.FinalMetaDataGatherer.executable = @CMAKE_INSTALL_PREFIX@/bin/FinalMetaDataGatherer
# The database to connect to:
# Development: sasdbtest
diff --git a/RTCP/Cobalt/GPUProc/etc/parset-additions.d/default/OutputProc.parset b/RTCP/Cobalt/GPUProc/etc/parset-additions.d/default/OutputProc.parset.in
similarity index 85%
rename from RTCP/Cobalt/GPUProc/etc/parset-additions.d/default/OutputProc.parset
rename to RTCP/Cobalt/GPUProc/etc/parset-additions.d/default/OutputProc.parset.in
index c922008b1cb..5720a66b34a 100644
--- a/RTCP/Cobalt/GPUProc/etc/parset-additions.d/default/OutputProc.parset
+++ b/RTCP/Cobalt/GPUProc/etc/parset-additions.d/default/OutputProc.parset.in
@@ -8,5 +8,5 @@ Cobalt.OutputProc.sshPrivateKey =
# The executable of the process to start.
# which thus needs to be found in $PATH after login.
-Cobalt.OutputProc.executable = outputProc
+Cobalt.OutputProc.executable = @CMAKE_INSTALL_PREFIX@/bin/outputProc
--
GitLab