From c3a42a4b0b90fa0d9f766e8859a77cb26e75ea11 Mon Sep 17 00:00:00 2001 From: Marcel Loose <loose@astron.nl> Date: Tue, 16 Dec 2008 11:15:14 +0000 Subject: [PATCH] Bug 835: Fixing the last loose ends w.r.t. the code reorganization (rf. bug #1296, #1297, #1298, #1300). --- .gitignore | 18 ++++++++++++++++++ CEP/Imager/MWControl/configure.in | 2 +- MAC/APL/CEPCU/configure.in | 2 +- MAC/APL/MainCU/configure.in | 2 +- MAC/APL/StationCU/configure.in | 2 +- RTCP/Run/bootstrap | 2 +- RTCP/Run/src/Makefile.am | 2 +- SAS/lofarconf.in | 1 + SubSystems/Offline/lofarconf.in | 8 ++++---- SubSystems/lofarconf.in | 4 ++++ 10 files changed, 33 insertions(+), 10 deletions(-) create mode 100644 SAS/lofarconf.in create mode 100644 SubSystems/lofarconf.in diff --git a/.gitignore b/.gitignore index 837a72ef9f4..5765184c961 100644 --- a/.gitignore +++ b/.gitignore @@ -230,6 +230,24 @@ MAC/Test/TestHarness/THPVSSBridge/lofarconf MAC/Test/TestHarness/TSE/Makefile.common MAC/Test/TestHarness/TSE/autoconf_share MAC/Test/TestHarness/TSE/lofarconf +RTCP/CNProc/Makefile.common +RTCP/CNProc/autoconf_share +RTCP/CNProc/lofarconf +RTCP/IONProc/Makefile.common +RTCP/IONProc/autoconf_share +RTCP/IONProc/lofarconf +RTCP/Interface/Makefile.common +RTCP/Interface/autoconf_share +RTCP/Interface/lofarconf +RTCP/RTCPTools/Makefile.common +RTCP/RTCPTools/autoconf_share +RTCP/RTCPTools/lofarconf +RTCP/Run/Makefile.common +RTCP/Run/autoconf_share +RTCP/Run/lofarconf +RTCP/Storage/Makefile.common +RTCP/Storage/autoconf_share +RTCP/Storage/lofarconf SAS/OTB/MoM-OTDB-adapter/bin SAS/OTB/MoM-OTDB-adapter/dist/tasks SAS/OTB/MoM-OTDB-adapter/tasks diff --git a/CEP/Imager/MWControl/configure.in b/CEP/Imager/MWControl/configure.in index 7e0646a154a..1383218b1fe 100644 --- a/CEP/Imager/MWControl/configure.in +++ b/CEP/Imager/MWControl/configure.in @@ -52,7 +52,7 @@ dnl Check for LOFAR specific things dnl lofar_GENERAL lofar_INTERNAL(CEP/Imager/MWCommon,MWCommon,,1,MWCommon/MWConnection.h,,) -lofar_INTERNAL(CEP/Calibration/BBSKernel,BBSKernel,,1,BBSKernel/Prediffer.h,,) +lofar_INTERNAL(CEP/Calibration/BBSKernel,BBSKernel,,1,BBSKernel/Types.h,,) lofar_EXTERNAL(boost,1,boost/shared_ptr.hpp,"") dnl diff --git a/MAC/APL/CEPCU/configure.in b/MAC/APL/CEPCU/configure.in index 95fa78353df..27088115861 100644 --- a/MAC/APL/CEPCU/configure.in +++ b/MAC/APL/CEPCU/configure.in @@ -57,7 +57,7 @@ lofar_COMPILETOOLS lofar_PVSS(1) lofar_INTERNAL(LCS/Common, Common,, 1, Common/LofarTypes.h,,) lofar_INTERNAL(LCS/ACC/APS, APS,, 1, APS/ParameterSet.h,,) -lofar_INTERNAL(Appl/ApplCommon, ApplCommon,, 1, ApplCommon/Observation.h,,) +lofar_INTERNAL(LCS/ApplCommon, ApplCommon,, 1, ApplCommon/Observation.h,,) lofar_INTERNAL(LCS/ACC/ALC, ALC,, 1, ALC/ApplControl.h,,) lofar_INTERNAL(LCS/ACC/PLC, PLC,, 1, PLC/PCCmd.h,,) dnl lofar_INTERNAL(SAS/OTDB, OTDB, , 1, OTDB/OTDBconnection.h,,) diff --git a/MAC/APL/MainCU/configure.in b/MAC/APL/MainCU/configure.in index 6c9cbd85c37..f59213ce5d8 100644 --- a/MAC/APL/MainCU/configure.in +++ b/MAC/APL/MainCU/configure.in @@ -63,7 +63,7 @@ lofar_INTERNAL(MAC/GCF/TM, GCFTM, , 1, GCF/TM/GCF_Task.h,,) lofar_INTERNAL(MAC/GCF/RTDB, GCFRTDB, , 1, GCF/RTDB/RTDB_PropertySet.h,,) lofar_INTERNAL(MAC/APL/APLCommon, APLCommon, , 1, APL/APLCommon/APL_Defines.h,,) lofar_INTERNAL(MAC/APL/RTDBCommon, RTDBCommon, , 1, APL/RTDBCommon/RTDButilities.h,,) -lofar_INTERNAL(Appl/ApplCommon, ApplCommon, , 1, ApplCommon/Observation.h,,) +lofar_INTERNAL(LCS/ApplCommon, ApplCommon, , 1, ApplCommon/Observation.h,,) lofar_EXTERNAL(boost,1,boost/date_time/date.hpp, boost_date_time) lofar_EXTERNAL(pqxx,2.5.5,pqxx/pqxx, pqxx) lofar_EXTERNAL(pq,,libpq-fe.h, pq, /usr/local/pgsql) diff --git a/MAC/APL/StationCU/configure.in b/MAC/APL/StationCU/configure.in index 42f7c05727c..ab8133c727a 100644 --- a/MAC/APL/StationCU/configure.in +++ b/MAC/APL/StationCU/configure.in @@ -58,7 +58,7 @@ lofar_PVSS(1) lofar_BLITZ lofar_INTERNAL(LCS/Common, Common,, 1, Common/LofarTypes.h,,) lofar_INTERNAL(LCS/ACC/APS, APS,, 1, APS/ParameterSet.h,,) -lofar_INTERNAL(Appl/ApplCommon, ApplCommon,, 1, ApplCommon/Observation.h,,) +lofar_INTERNAL(LCS/ApplCommon, ApplCommon,, 1, ApplCommon/Observation.h,,) dnl lofar_INTERNAL(SAS/OTDB, OTDB,, 1, OTDB/OTDBconnection.h,,) lofar_INTERNAL(MAC/MACIO, MACIO, , 1, MACIO/MACServiceInfo.h,,) lofar_INTERNAL(MAC/GCF/TM, GCFTM,, 1, GCF/TM/GCF_Task.h,,) diff --git a/RTCP/Run/bootstrap b/RTCP/Run/bootstrap index be0aa5082f7..fd49f5826a5 100755 --- a/RTCP/Run/bootstrap +++ b/RTCP/Run/bootstrap @@ -1,3 +1,3 @@ #!/bin/sh -../autoconf_share/bootstrap ../autoconf_share +../../autoconf_share/bootstrap ../../autoconf_share diff --git a/RTCP/Run/src/Makefile.am b/RTCP/Run/src/Makefile.am index 41dd95b32ca..3f2ac45ef8f 100644 --- a/RTCP/Run/src/Makefile.am +++ b/RTCP/Run/src/Makefile.am @@ -34,7 +34,7 @@ dist_python_SCRIPTS = \ LOFAR_Jobs.py \ CS1_RSPCtl.py \ CS1_Run.py \ - CS1_Sections.py \ + CS1_Sections.py scriptdir = $(bindir) dist_script_SCRIPTS = diff --git a/SAS/lofarconf.in b/SAS/lofarconf.in new file mode 100644 index 00000000000..c79ce2f6784 --- /dev/null +++ b/SAS/lofarconf.in @@ -0,0 +1 @@ +OTDB diff --git a/SubSystems/Offline/lofarconf.in b/SubSystems/Offline/lofarconf.in index 1b50bfcd0b1..796b6b5fdd6 100644 --- a/SubSystems/Offline/lofarconf.in +++ b/SubSystems/Offline/lofarconf.in @@ -1,4 +1,4 @@ -/CEP/BB/BBSControl -/CEP/BB/pyparmdb -/CEP/BB/MWImager -/Appl/CEP/CS1/CS1_pp_lib +/CEP/Calibration/BBSControl +/CEP/pyparmdb +/CEP/Imager/MWImager +/CEP/DP3/CS1_pp_lib diff --git a/SubSystems/lofarconf.in b/SubSystems/lofarconf.in new file mode 100644 index 00000000000..a78e6a31459 --- /dev/null +++ b/SubSystems/lofarconf.in @@ -0,0 +1,4 @@ +CEPCU_MAC +LCU_MAC +MCU_MAC +Offline -- GitLab