From fbdd2207949f2d2d14a1f154cdfd9367b02ee687 Mon Sep 17 00:00:00 2001
From: Arno Schoenmakers <schoenmakers@astron.nl>
Date: Thu, 10 Dec 2015 16:14:06 +0000
Subject: [PATCH] Task #8756: Add Subsystem RAServices
---
.gitattributes | 1 +
CMake/LofarPackageList.cmake | 14 +++++++-------
SAS/CMakeLists.txt | 1 +
SubSystems/CMakeLists.txt | 1 +
SubSystems/RAServices/CMakeLists.txt | 4 ++++
5 files changed, 14 insertions(+), 7 deletions(-)
create mode 100644 SubSystems/RAServices/CMakeLists.txt
diff --git a/.gitattributes b/.gitattributes
index 07f42c74261..d7d486e0501 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -5261,6 +5261,7 @@ SubSystems/Online_Cobalt/validation/system/users/localhome.test eol=lf
SubSystems/Online_Cobalt/validation/system/users/login-shell.test -text
SubSystems/Online_Cobalt/validation/system/users/sudo.test eol=lf
SubSystems/Online_Cobalt/validation/validate eol=lf
+SubSystems/RAServices/CMakeLists.txt -text
SubSystems/SAS_Tools/CMakeLists.txt -text
/jenkins_make -text
/lofar_config.h.cmake -text
diff --git a/CMake/LofarPackageList.cmake b/CMake/LofarPackageList.cmake
index 1a60ed8a4b9..0b43662fb6e 100644
--- a/CMake/LofarPackageList.cmake
+++ b/CMake/LofarPackageList.cmake
@@ -1,7 +1,7 @@
# - Create for each LOFAR package a variable containing the absolute path to
# its source directory.
#
-# Generated by gen_LofarPackageList_cmake.sh at Thu Oct 22 14:16:00 CEST 2015
+# Generated by gen_LofarPackageList_cmake.sh at Thu Dec 10 16:08:57 UTC 2015
#
# ---- DO NOT EDIT ----
#
@@ -64,10 +64,8 @@ if(NOT DEFINED LOFAR_PACKAGE_LIST_INCLUDED)
set(Blob_SOURCE_DIR ${CMAKE_SOURCE_DIR}/LCS/Blob)
set(Common_SOURCE_DIR ${CMAKE_SOURCE_DIR}/LCS/Common)
set(MessageBus_SOURCE_DIR ${CMAKE_SOURCE_DIR}/LCS/MessageBus)
- set(MessageDaemons_SOURCE_DIR ${CMAKE_SOURCE_DIR}/LCS/MessageDaemons)
set(Messaging_SOURCE_DIR ${CMAKE_SOURCE_DIR}/LCS/Messaging)
- set(PyCommon_SOURCE_DIR ${CMAKE_SOURCE_DIR}/LCS/PyCommon)
- set(PyMessaging_SOURCE_DIR ${CMAKE_SOURCE_DIR}/LCS/Messaging/python/messaging)
+ set(MessageDaemons_SOURCE_DIR ${CMAKE_SOURCE_DIR}/LCS/MessageDaemons)
set(MSLofar_SOURCE_DIR ${CMAKE_SOURCE_DIR}/LCS/MSLofar)
set(pyparameterset_SOURCE_DIR ${CMAKE_SOURCE_DIR}/LCS/pyparameterset)
set(pytools_SOURCE_DIR ${CMAKE_SOURCE_DIR}/LCS/pytools)
@@ -76,7 +74,9 @@ if(NOT DEFINED LOFAR_PACKAGE_LIST_INCLUDED)
set(Transport_SOURCE_DIR ${CMAKE_SOURCE_DIR}/LCS/Transport)
set(MSLofar_SOURCE_DIR ${CMAKE_SOURCE_DIR}/LCS/MSLofar)
set(LofarStMan_SOURCE_DIR ${CMAKE_SOURCE_DIR}/LCS/LofarStMan)
+ set(PyCommon_SOURCE_DIR ${CMAKE_SOURCE_DIR}/LCS/PyCommon)
set(ObservationStartListener_SOURCE_DIR ${CMAKE_SOURCE_DIR}/LCS/MessageDaemons/ObservationStartListener)
+ set(PyMessaging_SOURCE_DIR ${CMAKE_SOURCE_DIR}/LCS/Messaging/python/messaging)
set(Firmware_SOURCE_DIR ${CMAKE_SOURCE_DIR}/LCU/Firmware)
set(StationTest_SOURCE_DIR ${CMAKE_SOURCE_DIR}/LCU/StationTest)
set(checkhardware_SOURCE_DIR ${CMAKE_SOURCE_DIR}/LCU/checkhardware)
@@ -135,14 +135,15 @@ if(NOT DEFINED LOFAR_PACKAGE_LIST_INCLUDED)
set(CobaltTest_SOURCE_DIR ${CMAKE_SOURCE_DIR}/RTCP/Cobalt/CobaltTest)
set(BrokenAntennaInfo_SOURCE_DIR ${CMAKE_SOURCE_DIR}/RTCP/Cobalt/BrokenAntennaInfo)
set(OTDB_SOURCE_DIR ${CMAKE_SOURCE_DIR}/SAS/OTDB)
- set(OTDB_Services_SOURCE_DIR ${CMAKE_SOURCE_DIR}/SAS/OTDB_Services)
set(OTB_SOURCE_DIR ${CMAKE_SOURCE_DIR}/SAS/OTB)
set(OTDB_SQL_SOURCE_DIR ${CMAKE_SOURCE_DIR}/SAS/OTDB/sql)
set(Scheduler_SOURCE_DIR ${CMAKE_SOURCE_DIR}/SAS/Scheduler)
set(SAS_Feedback_SOURCE_DIR ${CMAKE_SOURCE_DIR}/SAS/Feedback_Service)
set(CleanupTool_SOURCE_DIR ${CMAKE_SOURCE_DIR}/SAS/CleanupTool)
+ set(OTDB_Services_SOURCE_DIR ${CMAKE_SOURCE_DIR}/SAS/OTDB_Services)
set(jOTDB3_SOURCE_DIR ${CMAKE_SOURCE_DIR}/SAS/OTB/jOTDB3)
set(OTB-Java_SOURCE_DIR ${CMAKE_SOURCE_DIR}/SAS/OTB/OTB)
+ set(ResourceAssignmentEditor_SOURCE_DIR ${CMAKE_SOURCE_DIR}/SAS/ResourceAssignment/ResourceAssignmentEditor)
set(CCU_MAC_SOURCE_DIR ${CMAKE_SOURCE_DIR}/SubSystems/CCU_MAC)
set(LCU_MAC_SOURCE_DIR ${CMAKE_SOURCE_DIR}/SubSystems/LCU_MAC)
set(MCU_MAC_SOURCE_DIR ${CMAKE_SOURCE_DIR}/SubSystems/MCU_MAC)
@@ -155,6 +156,5 @@ if(NOT DEFINED LOFAR_PACKAGE_LIST_INCLUDED)
set(SAS_Tools_SOURCE_DIR ${CMAKE_SOURCE_DIR}/SubSystems/SAS_Tools)
set(PVSS_DB_SOURCE_DIR ${CMAKE_SOURCE_DIR}/SubSystems/PVSS_DB)
set(LAPS_CEP_SOURCE_DIR ${CMAKE_SOURCE_DIR}/SubSystems/LAPS_CEP)
- set(ResourceAssignmentEditor_SOURCE_DIR ${CMAKE_SOURCE_DIR}/SAS/ResourceAssignment/ResourceAssignmentEditor)
- set(MoMQueryService_SOURCE_DIR ${CMAKE_SOURCE_DIR}/SAS/MoM/MoMQueryService)
+ set(RAServices_SOURCE_DIR ${CMAKE_SOURCE_DIR}/SubSystems/RAServices)
endif(NOT DEFINED LOFAR_PACKAGE_LIST_INCLUDED)
diff --git a/SAS/CMakeLists.txt b/SAS/CMakeLists.txt
index 6554e35a1c3..7ce21000870 100644
--- a/SAS/CMakeLists.txt
+++ b/SAS/CMakeLists.txt
@@ -6,5 +6,6 @@ lofar_add_package(OTDB_SQL OTDB/sql)
lofar_add_package(Scheduler)
lofar_add_package(SAS_Feedback Feedback_Service)
lofar_add_package(CleanupTool)
+lofar_add_package(OTDB_Services)
add_subdirectory(ResourceAssignment)
diff --git a/SubSystems/CMakeLists.txt b/SubSystems/CMakeLists.txt
index 92561d79208..e3ed89ab0de 100644
--- a/SubSystems/CMakeLists.txt
+++ b/SubSystems/CMakeLists.txt
@@ -12,3 +12,4 @@ lofar_add_package(SAS_OTDB)
lofar_add_package(SAS_Tools)
lofar_add_package(PVSS_DB)
lofar_add_package(LAPS_CEP)
+lofar_add_package(RAServices)
diff --git a/SubSystems/RAServices/CMakeLists.txt b/SubSystems/RAServices/CMakeLists.txt
new file mode 100644
index 00000000000..0b464656737
--- /dev/null
+++ b/SubSystems/RAServices/CMakeLists.txt
@@ -0,0 +1,4 @@
+# $Id: CMakeLists.txt 20934 2012-05-15 09:26:48Z schoenmakers $
+
+lofar_package(RAServices
+ DEPENDS OTDB_Services)
--
GitLab