From 0dc20c508d7a95fe2e0dcb47761e0713c6717a37 Mon Sep 17 00:00:00 2001
From: Ruud Overeem <overeem@astron.nl>
Date: Wed, 26 Mar 2008 15:33:18 +0000
Subject: [PATCH] Bug 1167: Modifications for makeversion.

---
 .../src/CTStartDaemon/CTStartDaemon.cc        |  3 +++
 .../CUDaemons/src/CTStartDaemon/Makefile.am   |  3 ++-
 .../src/LoggingClient/LoggingClient.cc        |  3 +++
 .../CUDaemons/src/LoggingClient/Makefile.am   |  3 ++-
 MAC/APL/CUDaemons/src/Makefile.am             | 11 ++++++++++
 .../CUDaemons/src/ServiceBroker/Makefile.am   |  3 ++-
 .../CUDaemons/src/ServiceBroker/Makefile.in   | 21 +++++++++++++++++--
 .../src/ServiceBroker/ServiceBroker.cc        |  4 ++++
 8 files changed, 46 insertions(+), 5 deletions(-)

diff --git a/MAC/APL/CUDaemons/src/CTStartDaemon/CTStartDaemon.cc b/MAC/APL/CUDaemons/src/CTStartDaemon/CTStartDaemon.cc
index 125e74a7627..f97554b48e6 100644
--- a/MAC/APL/CUDaemons/src/CTStartDaemon/CTStartDaemon.cc
+++ b/MAC/APL/CUDaemons/src/CTStartDaemon/CTStartDaemon.cc
@@ -26,6 +26,7 @@
 #include <lofar_config.h>
 #include <Common/LofarLogger.h>
 #include <Common/LofarLocators.h>
+#include <Common/Version.h>
 
 #include <GCF/TM/GCF_Protocols.h>
 #include <MACIO/MACServiceInfo.h>
@@ -34,6 +35,7 @@
 #include <APL/APLCommon/ControllerDefines.h>
 #include <APL/APLCommon/StartDaemon_Protocol.ph>
 #include "CTStartDaemon.h"
+#include "../Package__Version.h"
 
 using namespace LOFAR::GCF::TM;
 
@@ -53,6 +55,7 @@ CTStartDaemon::CTStartDaemon(const string& name) :
 	itsTimerPort		(0)
 {
 	LOG_TRACE_FLOW(formatString("CTStartDaemon(%s)", getName().c_str()));
+	LOG_INFO(Version::getInfo<CUDaemonsVersion>("CTStartDaemon"));
 
 	itsListener = new GCFTCPPort(*this, MAC_SVCMASK_STARTDAEMON, 
 								 GCFPortInterface::MSPP, STARTDAEMON_PROTOCOL);
diff --git a/MAC/APL/CUDaemons/src/CTStartDaemon/Makefile.am b/MAC/APL/CUDaemons/src/CTStartDaemon/Makefile.am
index d245a16a1b6..d054d72dc93 100644
--- a/MAC/APL/CUDaemons/src/CTStartDaemon/Makefile.am
+++ b/MAC/APL/CUDaemons/src/CTStartDaemon/Makefile.am
@@ -6,7 +6,8 @@ CTStartDaemon_CPPFLAGS		= -DBOOST_DISABLE_THREADS \
 							  -fmessage-length=0 \
 							  -fdiagnostics-show-location=once
 
-CTStartDaemon_SOURCES		= CTStartDaemon.cc \
+CTStartDaemon_SOURCES		= ../Package__Version.cc \
+							  CTStartDaemon.cc \
 							  CTStartDaemonMain.cc
 CTStartDaemon_LDADD			= $(LOFAR_DEPEND) 
 CTStartDaemon_DEPENDENCIES	= $(LOFAR_DEPEND)
diff --git a/MAC/APL/CUDaemons/src/LoggingClient/LoggingClient.cc b/MAC/APL/CUDaemons/src/LoggingClient/LoggingClient.cc
index fe04e9b8cea..932f7dfc774 100644
--- a/MAC/APL/CUDaemons/src/LoggingClient/LoggingClient.cc
+++ b/MAC/APL/CUDaemons/src/LoggingClient/LoggingClient.cc
@@ -23,6 +23,7 @@
 #include <lofar_config.h>
 #include <Common/LofarLogger.h>
 #include <Common/lofar_fstream.h>
+#include <Common/Version.h>
 #include <APS/ParameterSet.h>
 #include <GCF/PVSS/GCF_PVTypes.h>
 #include <MACIO/MACServiceInfo.h>
@@ -30,6 +31,7 @@
 #include <APL/APLCommon/StationInfo.h>		// LOFAR_SHARE_LOCATION
 #include <log4cplus/socketappender.h>
 #include "LoggingClient.h"
+#include "../Package__Version.h"
 
 using namespace log4cplus;
 using namespace log4cplus::helpers;
@@ -58,6 +60,7 @@ LoggingClient::LoggingClient(const string&	myName) :
 	itsOutSeqnr			(1)
 {
 	LOG_DEBUG_STR("LoggingClient(" << myName << ")");
+	LOG_INFO(Version::getInfo<CUDaemonsVersion>("LoggingClient"));
 
 	registerProtocol(F_FSM_PROTOCOL, F_FSM_PROTOCOL_STRINGS);
 	registerProtocol(LOG_PROTOCOL,   LOG_PROTOCOL_STRINGS);
diff --git a/MAC/APL/CUDaemons/src/LoggingClient/Makefile.am b/MAC/APL/CUDaemons/src/LoggingClient/Makefile.am
index b06bf09b69d..b2adeeabaf8 100644
--- a/MAC/APL/CUDaemons/src/LoggingClient/Makefile.am
+++ b/MAC/APL/CUDaemons/src/LoggingClient/Makefile.am
@@ -1,7 +1,8 @@
 # Executables
 bin_PROGRAMS 				= LoggingClient
 
-LoggingClient_SOURCES		= LoggingClient.cc \
+LoggingClient_SOURCES		= ../Package__Version.cc \
+							  LoggingClient.cc \
 							  LoggingClientMain.cc
 
 bin_SCRIPTS					= 
diff --git a/MAC/APL/CUDaemons/src/Makefile.am b/MAC/APL/CUDaemons/src/Makefile.am
index fdae53e7404..7dac283638c 100644
--- a/MAC/APL/CUDaemons/src/Makefile.am
+++ b/MAC/APL/CUDaemons/src/Makefile.am
@@ -1,4 +1,15 @@
+lib_LTLIBRARIES = libcudaemons.la
+libcudaemons_la_SOURCES = Package__Version.cc
+
+pkginclude_HEADERS = Package__Version.h
+
 SUBDIRS = CTStartDaemon LoggingClient
 
+bin_PROGRAMS = versioncudaemons
+
+versioncudaemons_SOURCES      = versioncudaemons.cc
+versioncudaemons_LDADD        = libcudaemons.la
+versioncudaemons_DEPENDENCIES = libcudaemons.la $(LOFAR_DEPEND)
+
 include $(top_srcdir)/Makefile.common
 
diff --git a/MAC/APL/CUDaemons/src/ServiceBroker/Makefile.am b/MAC/APL/CUDaemons/src/ServiceBroker/Makefile.am
index 4dc6b747dbe..e20cac99238 100644
--- a/MAC/APL/CUDaemons/src/ServiceBroker/Makefile.am
+++ b/MAC/APL/CUDaemons/src/ServiceBroker/Makefile.am
@@ -6,7 +6,8 @@ ServiceBroker_CPPFLAGS		= -DBOOST_DISABLE_THREADS \
 							  -fmessage-length=0 \
 							  -fdiagnostics-show-location=once
 
-ServiceBroker_SOURCES		= ServiceBroker.cc \
+ServiceBroker_SOURCES		= ../Package__Version.cc \
+							  ServiceBroker.cc \
 							  ServiceBrokerMain.cc
 ServiceBroker_LDADD			= $(LOFAR_DEPEND)
 ServiceBroker_DEPENDENCIES	= $(LOFAR_DEPEND)
diff --git a/MAC/APL/CUDaemons/src/ServiceBroker/Makefile.in b/MAC/APL/CUDaemons/src/ServiceBroker/Makefile.in
index a5d8fad670d..f92d47b199c 100644
--- a/MAC/APL/CUDaemons/src/ServiceBroker/Makefile.in
+++ b/MAC/APL/CUDaemons/src/ServiceBroker/Makefile.in
@@ -68,7 +68,8 @@ am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)" \
 	"$(DESTDIR)$(pkgincludedir)"
 binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
 PROGRAMS = $(bin_PROGRAMS)
-am_ServiceBroker_OBJECTS = ServiceBroker-ServiceBroker.$(OBJEXT) \
+am_ServiceBroker_OBJECTS = ServiceBroker-Package__Version.$(OBJEXT) \
+	ServiceBroker-ServiceBroker.$(OBJEXT) \
 	ServiceBroker-ServiceBrokerMain.$(OBJEXT)
 ServiceBroker_OBJECTS = $(am_ServiceBroker_OBJECTS)
 am__DEPENDENCIES_1 =
@@ -252,7 +253,8 @@ ServiceBroker_CPPFLAGS = -DBOOST_DISABLE_THREADS \
 							  -fmessage-length=0 \
 							  -fdiagnostics-show-location=once
 
-ServiceBroker_SOURCES = ServiceBroker.cc \
+ServiceBroker_SOURCES = ../Package__Version.cc \
+							  ServiceBroker.cc \
 							  ServiceBrokerMain.cc
 
 ServiceBroker_LDADD = $(LOFAR_DEPEND)
@@ -399,6 +401,7 @@ mostlyclean-compile:
 distclean-compile:
 	-rm -f *.tab.c
 
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ServiceBroker-Package__Version.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ServiceBroker-ServiceBroker.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ServiceBroker-ServiceBrokerMain.Po@am__quote@
 
@@ -423,6 +426,20 @@ distclean-compile:
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
 
+ServiceBroker-Package__Version.o: ../Package__Version.cc
+@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ServiceBroker_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT ServiceBroker-Package__Version.o -MD -MP -MF "$(DEPDIR)/ServiceBroker-Package__Version.Tpo" -c -o ServiceBroker-Package__Version.o `test -f '../Package__Version.cc' || echo '$(srcdir)/'`../Package__Version.cc; \
+@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/ServiceBroker-Package__Version.Tpo" "$(DEPDIR)/ServiceBroker-Package__Version.Po"; else rm -f "$(DEPDIR)/ServiceBroker-Package__Version.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../Package__Version.cc' object='ServiceBroker-Package__Version.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ServiceBroker_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o ServiceBroker-Package__Version.o `test -f '../Package__Version.cc' || echo '$(srcdir)/'`../Package__Version.cc
+
+ServiceBroker-Package__Version.obj: ../Package__Version.cc
+@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ServiceBroker_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT ServiceBroker-Package__Version.obj -MD -MP -MF "$(DEPDIR)/ServiceBroker-Package__Version.Tpo" -c -o ServiceBroker-Package__Version.obj `if test -f '../Package__Version.cc'; then $(CYGPATH_W) '../Package__Version.cc'; else $(CYGPATH_W) '$(srcdir)/../Package__Version.cc'; fi`; \
+@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/ServiceBroker-Package__Version.Tpo" "$(DEPDIR)/ServiceBroker-Package__Version.Po"; else rm -f "$(DEPDIR)/ServiceBroker-Package__Version.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../Package__Version.cc' object='ServiceBroker-Package__Version.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ServiceBroker_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o ServiceBroker-Package__Version.obj `if test -f '../Package__Version.cc'; then $(CYGPATH_W) '../Package__Version.cc'; else $(CYGPATH_W) '$(srcdir)/../Package__Version.cc'; fi`
+
 ServiceBroker-ServiceBroker.o: ServiceBroker.cc
 @am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ServiceBroker_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT ServiceBroker-ServiceBroker.o -MD -MP -MF "$(DEPDIR)/ServiceBroker-ServiceBroker.Tpo" -c -o ServiceBroker-ServiceBroker.o `test -f 'ServiceBroker.cc' || echo '$(srcdir)/'`ServiceBroker.cc; \
 @am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/ServiceBroker-ServiceBroker.Tpo" "$(DEPDIR)/ServiceBroker-ServiceBroker.Po"; else rm -f "$(DEPDIR)/ServiceBroker-ServiceBroker.Tpo"; exit 1; fi
diff --git a/MAC/APL/CUDaemons/src/ServiceBroker/ServiceBroker.cc b/MAC/APL/CUDaemons/src/ServiceBroker/ServiceBroker.cc
index c0fc0392155..132358e69b9 100644
--- a/MAC/APL/CUDaemons/src/ServiceBroker/ServiceBroker.cc
+++ b/MAC/APL/CUDaemons/src/ServiceBroker/ServiceBroker.cc
@@ -24,6 +24,7 @@
 #include <Common/LofarLogger.h>
 #include <Common/SystemUtil.h>
 #include <Common/lofar_fstream.h>
+#include <Common/Version.h>
 
 #include <APS/ParameterSet.h>
 #include <MACIO/MACServiceInfo.h>
@@ -31,6 +32,7 @@
 #include <MACIO/GCF_Event.h>
 //#include <GCF/TM/GCF_Protocols.h>
 #include "ServiceBroker.h"
+#include "../Package__Version.h"
 
 namespace LOFAR {
     using namespace MACIO;
@@ -52,6 +54,8 @@ ServiceBroker::ServiceBroker() :
 	itsNrPorts(0),
 	itsNrFreePorts(0)
 {
+	LOG_INFO(Version::getInfo<CUDaemonsVersion>("ServiceBroker"));
+
 	// register the protocol for debugging purposes
 	TM::registerProtocol(SB_PROTOCOL, SB_PROTOCOL_STRINGS);
 
-- 
GitLab