From d2c47dac2abe68e3b74ae5748d0674c636fa13ef Mon Sep 17 00:00:00 2001 From: Alexander Mueller <alexander.mueller@hs.uni-hamburg.de> Date: Wed, 21 Sep 2005 12:01:23 +0000 Subject: [PATCH] BugID: 330 Corrects all tags and readme files. --- MAC/GCF/DEPENDENCIES | 5 +---- MAC/GCF/GCFCommon/configure.in | 2 +- MAC/GCF/LogSys/configure.in | 8 ++++---- MAC/GCF/Protocols/configure.in | 8 ++++---- MAC/GCF/README | 14 ++------------ MAC/GCF/TM/configure.in | 4 ++-- MAC/GCF/_PAL/configure.in | 14 +++++++------- MAC/GCF/_PALlight/configure.in | 12 ++++++------ 8 files changed, 27 insertions(+), 40 deletions(-) diff --git a/MAC/GCF/DEPENDENCIES b/MAC/GCF/DEPENDENCIES index 7b5618f74d9..a37ad0b26d2 100644 --- a/MAC/GCF/DEPENDENCIES +++ b/MAC/GCF/DEPENDENCIES @@ -13,7 +13,4 @@ PVSS II 3.0.1 (lofar_PVSS(1)) - add all permanent DP instances by means of the PARA module of PVSSII - now the started project is ready for GCF -LCS/Common (CVS TAG: LCS-Common-2_1) -LCS/Transport (CVS TAG: LCS-Transport-1_1) -autoconf_share (CVS TAG: autoconf_share-2_1) -log4cplus (lofar_LOG4CPLUS(1)) +autoconf_share (CVS TAG: autoconf_share-2_3) diff --git a/MAC/GCF/GCFCommon/configure.in b/MAC/GCF/GCFCommon/configure.in index 3f4a3ae2944..62b3dcd927b 100644 --- a/MAC/GCF/GCFCommon/configure.in +++ b/MAC/GCF/GCFCommon/configure.in @@ -5,7 +5,7 @@ AC_INIT(include/GCF/GCF_Defines.h) dnl AC_CONFIG_AUX_DIR(config) dnl AM_CONFIG_HEADER(config/config.h) AM_CONFIG_HEADER(config.h) -AM_INIT_AUTOMAKE(GCFCommon, 4.2) +AM_INIT_AUTOMAKE(GCFCommon, 6.0) dnl Initialize for LOFAR (may set compilers) lofar_INIT diff --git a/MAC/GCF/LogSys/configure.in b/MAC/GCF/LogSys/configure.in index d0cde2ec283..bc5075c4a2a 100644 --- a/MAC/GCF/LogSys/configure.in +++ b/MAC/GCF/LogSys/configure.in @@ -5,7 +5,7 @@ AC_INIT(include/GCF/LogSys/GCF_KeyValueLogger.h) dnl AC_CONFIG_AUX_DIR(config) dnl AM_CONFIG_HEADER(config/config.h) AM_CONFIG_HEADER(config.h) -AM_INIT_AUTOMAKE(GCF/LogSys, 1.0) +AM_INIT_AUTOMAKE(GCF/LogSys, 6.0) dnl Initialize for LOFAR (may set compilers) lofar_INIT @@ -44,9 +44,9 @@ lofar_LOG4CPLUS lofar_DOCXX lofar_PVSS lofar_INTERNAL(LCS/Common, common, LCS-Common-2_3, 1, Common/LofarTypes.h,,) -lofar_INTERNAL(MAC/GCF/GCFCommon, gcfcommon, MAC-GCF-5_2rc1, 1, GCF/GCF_Defines.h,,) -lofar_INTERNAL(MAC/GCF/TM, gcftm, MAC-GCF-5_2rc1, 1, GCF/TM/GCF_Task.h,,) -lofar_INTERNAL(MAC/GCF/PAL, gcfpal, MAC-GCF-5_2rc1, 1, GCF/PAL/GCF_PVSSInfo.h,,) +lofar_INTERNAL(MAC/GCF/GCFCommon, gcfcommon, MAC-GCF-6_0, 1, GCF/GCF_Defines.h,,) +lofar_INTERNAL(MAC/GCF/TM, gcftm, MAC-GCF-6_0, 1, GCF/TM/GCF_Task.h,,) +lofar_INTERNAL(MAC/GCF/PAL, gcfpal, MAC-GCF-6_0, 1, GCF/PAL/GCF_PVSSInfo.h,,) dnl dnl Output Makefiles diff --git a/MAC/GCF/Protocols/configure.in b/MAC/GCF/Protocols/configure.in index 9607373c2b5..d40a7d50cf5 100644 --- a/MAC/GCF/Protocols/configure.in +++ b/MAC/GCF/Protocols/configure.in @@ -5,7 +5,7 @@ AC_INIT(src/DH_PIProtocol.h) dnl AC_CONFIG_AUX_DIR(config) dnl AM_CONFIG_HEADER(config/config.h) AM_CONFIG_HEADER(config.h) -AM_INIT_AUTOMAKE(GCF/Protocols, 4.2) +AM_INIT_AUTOMAKE(GCF/Protocols, 6.0) dnl Initialize for LOFAR (may set compilers) lofar_INIT @@ -55,9 +55,9 @@ lofar_DEBUG_OPTIMIZE lofar_QATOOLS lofar_DOCXX lofar_INTERNAL(LCS/Common, Common, LCS-Common-2_3, 1,Common/LofarTypes.h,,) -lofar_INTERNAL(LCS/Transport, transport, LCS-Transport-2_0, 1, Transport/DataHolder.h,,) -lofar_INTERNAL(MAC/GCF/GCFCommon, GCFCommon, MAC-GCF-5_2rc1, 1,GCF/GCF_Defines.h,,) -lofar_INTERNAL(MAC/GCF/TM, GCFTM, MAC-GCF-5_2rc1, 1, GCF/TM/GCF_Event.h,,) +lofar_INTERNAL(LCS/Transport, transport, LCS-Transport-2_1, 1, Transport/DataHolder.h,,) +lofar_INTERNAL(MAC/GCF/GCFCommon, GCFCommon, MAC-GCF-6_0, 1,GCF/GCF_Defines.h,,) +lofar_INTERNAL(MAC/GCF/TM, GCFTM, MAC-GCF-6_0, 1, GCF/TM/GCF_Event.h,,) dnl dnl Output Makefiles diff --git a/MAC/GCF/README b/MAC/GCF/README index dfdd1d2ea1b..f25b07b1095 100644 --- a/MAC/GCF/README +++ b/MAC/GCF/README @@ -1,22 +1,11 @@ Using: ServiceBroker -Using: PropertyAgent - - change the paramline 'mac.controller.pvss.cmdline' in PropertyAgent.conf to: - -proj <projname> - (projname must be filled in with the project, which is configured for LOFAR) -Using: PropertyInterface - - change the paramline 'mac.controller.pvss.cmdline' in PropertyInterface.conf to: - -proj <projname> - (projname must be filled in with the project, which is configured for LOFAR) - Precondition: -- After installation of GCF go to install dir: - > configurePVSSProj <projname> - a PVSS project is running which is configured for GCF (see DEPENDENCIES) Applications, which uses GCF/PAL, can place a file named customPrepPVSSDB.ctl in install dir of PropertyAgent, which executes the containing CTRL-script at startup. -(see example in MAC/Test/GCF package). +(see example in MAC/Test/GCF/RTC package). These are continuous applications, which not end by itself. This can be done by CTRL-C. @@ -25,6 +14,7 @@ GCFCommon TM Protocols PAL +LogSys PALlight Each package should be build with the following commands: diff --git a/MAC/GCF/TM/configure.in b/MAC/GCF/TM/configure.in index 5b382fbc04f..d586bf0ae31 100644 --- a/MAC/GCF/TM/configure.in +++ b/MAC/GCF/TM/configure.in @@ -5,7 +5,7 @@ AC_INIT(include/GCF/TM/GCF_Event.h) dnl AC_CONFIG_AUX_DIR(config) dnl AM_CONFIG_HEADER(config/config.h) AM_CONFIG_HEADER(config.h) -AM_INIT_AUTOMAKE(GCF/TM, 4.2) +AM_INIT_AUTOMAKE(GCF/TM, 6.0) dnl Initialize for LOFAR (may set compilers) lofar_INIT @@ -57,7 +57,7 @@ lofar_DOCXX lofar_LOG4CPLUS lofar_MPI(0) lofar_INTERNAL(LCS/Common, Common, LCS-Common-2_3, 1, Common/LofarTypes.h,,) -lofar_INTERNAL(MAC/GCF/GCFCommon, GCFCommon, MAC-GCF-5_2rc1, 1, GCF/GCF_Defines.h,,) +lofar_INTERNAL(MAC/GCF/GCFCommon, GCFCommon, MAC-GCF-6_0, 1, GCF/GCF_Defines.h,,) dnl dnl Output Makefiles diff --git a/MAC/GCF/_PAL/configure.in b/MAC/GCF/_PAL/configure.in index 48eefbe4486..1ed7d012c1d 100644 --- a/MAC/GCF/_PAL/configure.in +++ b/MAC/GCF/_PAL/configure.in @@ -5,7 +5,7 @@ AC_INIT(include/GCF/PAL/GCF_Property.h) dnl AC_CONFIG_AUX_DIR(config) dnl AM_CONFIG_HEADER(config/config.h) AM_CONFIG_HEADER(config.h) -AM_INIT_AUTOMAKE(GCF/PAL, 4.2) +AM_INIT_AUTOMAKE(GCF/PAL, 6.0) dnl Initialize for LOFAR (may set compilers) lofar_INIT @@ -58,12 +58,12 @@ lofar_DOCXX lofar_MPI(0) lofar_PVSS(1) lofar_INTERNAL(LCS/Common, common, LCS-Common-2_3, 1, Common/LofarTypes.h,,) -lofar_INTERNAL(LCS/Transport, transport, LCS-Transport-2_0, 1, Transport/DataHolder.h,,) -lofar_INTERNAL(MAC/GCF/GCFCommon, gcfcommon, MAC-GCF-5_2rc1, 1, GCF/GCF_Defines.h,,) -lofar_INTERNAL(MAC/GCF/TM, gcftm, MAC-GCF-5_2rc1, 1, GCF/TM/GCF_Task.h,,) -lofar_INTERNAL(MAC/GCF/Protocols, gcfpirtcprot, MAC-GCF-5_2rc1, 1, GCF/Protocols/PI_Protocol.ph,,) -lofar_INTERNAL(MAC/GCF/Protocols, gcfpicepprot, MAC-GCF-5_2rc1, 1, GCF/Protocols/DH_PIProtocol.h,,) -lofar_INTERNAL(MAC/GCF/Protocols, gcfpaprot, MAC-GCF-5_2rc1, 1, GCF/Protocols/PA_Protocol.ph,,) +lofar_INTERNAL(LCS/Transport, transport, LCS-Transport-2_1, 1, Transport/DataHolder.h,,) +lofar_INTERNAL(MAC/GCF/GCFCommon, gcfcommon, MAC-GCF-6_0, 1, GCF/GCF_Defines.h,,) +lofar_INTERNAL(MAC/GCF/TM, gcftm, MAC-GCF-6_0, 1, GCF/TM/GCF_Task.h,,) +lofar_INTERNAL(MAC/GCF/Protocols, gcfpirtcprot, MAC-GCF-6_0, 1, GCF/Protocols/PI_Protocol.ph,,) +lofar_INTERNAL(MAC/GCF/Protocols, gcfpicepprot, MAC-GCF-6_0, 1, GCF/Protocols/DH_PIProtocol.h,,) +lofar_INTERNAL(MAC/GCF/Protocols, gcfpaprot, MAC-GCF-6_0, 1, GCF/Protocols/PA_Protocol.ph,,) dnl dnl Output Makefiles diff --git a/MAC/GCF/_PALlight/configure.in b/MAC/GCF/_PALlight/configure.in index 9dffa775ac7..02f89b88625 100644 --- a/MAC/GCF/_PALlight/configure.in +++ b/MAC/GCF/_PALlight/configure.in @@ -5,7 +5,7 @@ AC_INIT(include/GCF/PALlight/GCF_RTMyProperty.h) dnl AC_CONFIG_AUX_DIR(config) dnl AM_CONFIG_HEADER(config/config.h) AM_CONFIG_HEADER(config.h) -AM_INIT_AUTOMAKE(GCF/PALlight, 4.2) +AM_INIT_AUTOMAKE(GCF/PALlight, 6.0) dnl Initialize for LOFAR (may set compilers) lofar_INIT @@ -57,11 +57,11 @@ lofar_QATOOLS lofar_DOCXX lofar_MPI(0) lofar_INTERNAL(LCS/Common, common, LCS-Common-2_3, 1, Common/LofarTypes.h,,) -lofar_INTERNAL(LCS/Transport, transport, LCS-Transport-2_0, 1, Transport/DataHolder.h,,) -lofar_INTERNAL(MAC/GCF/GCFCommon, gcfcommon, MAC-GCF-5_2rc1, 1, GCF/GCF_Defines.h,,) -lofar_INTERNAL(MAC/GCF/TM, gcftm, MAC-GCF-5_2rc1, 1, GCF/TM/GCF_Task.h,,) -lofar_INTERNAL(MAC/GCF/Protocols, gcfpirtcprot, MAC-GCF-5_2rc1, 1, GCF/Protocols/PI_Protocol.ph,,) -lofar_INTERNAL(MAC/GCF/Protocols, gcfpicepprot, MAC-GCF-5_2rc1, 1, GCF/Protocols/DH_PIProtocol.h,,) +lofar_INTERNAL(LCS/Transport, transport, LCS-Transport-2_1, 1, Transport/DataHolder.h,,) +lofar_INTERNAL(MAC/GCF/GCFCommon, gcfcommon, MAC-GCF-6_0, 1, GCF/GCF_Defines.h,,) +lofar_INTERNAL(MAC/GCF/TM, gcftm, MAC-GCF-6_0, 1, GCF/TM/GCF_Task.h,,) +lofar_INTERNAL(MAC/GCF/Protocols, gcfpirtcprot, MAC-GCF-6_0, 1, GCF/Protocols/PI_Protocol.ph,,) +lofar_INTERNAL(MAC/GCF/Protocols, gcfpicepprot, MAC-GCF-6_0, 1, GCF/Protocols/DH_PIProtocol.h,,) dnl dnl Output Makefiles -- GitLab