Bug 1167: Mofifications for makeversion.

MAC/APL/CURTDBDaemons/src/KeyValueLogger/KeyValueLogger.cc

@@ -22,6 +22,7 @@
 
 #include <lofar_config.h>
 #include <Common/LofarLogger.h>
+#include <Common/Version.h>
 #include <APS/ParameterSet.h>
 #include <MACIO/GCF_Event.h>
 #include <MACIO/MACServiceInfo.h>
@@ -30,6 +31,7 @@
 #include <GCF/PVSS/PVSSresult.h>
 #include <GCF/RTDB/DP_Protocol.ph>
 #include "KeyValueLogger.h"
+#include "../Package__Version.h"
 
 namespace LOFAR {
   using namespace MACIO;
@@ -49,6 +51,7 @@ KeyValueLogger::KeyValueLogger(const string&	myName) :
 	itsTimerPort(0)
 {
 	LOG_DEBUG_STR("KeyValueLogger(" << myName << ")");
+	LOG_INFO(Version::getInfo<CURTDBDaemonsVersion>("KeyValueLogger"));
 
 	registerProtocol(F_FSM_PROTOCOL, F_FSM_PROTOCOL_STRINGS);
 	registerProtocol(DP_PROTOCOL,	 DP_PROTOCOL_STRINGS);

MAC/APL/CURTDBDaemons/src/KeyValueLogger/Makefile.am

@@ -6,7 +6,8 @@ bin_PROGRAMS 				= KeyValueLogger
 #							  -fmessage-length=0 \
 #							  -fdiagnostics-show-location=once
 
-KeyValueLogger_SOURCES	= KeyValueLogger.cc \
+KeyValueLogger_SOURCES		= ../Package__Version.cc \
+							  KeyValueLogger.cc \
 							  KeyValueLoggerMain.cc
 KeyValueLogger_LDADD		= $(LOFAR_DEPEND) $(libdir)/libkvt_protocol.a
 KeyValueLogger_DEPENDENCIES = $(LOFAR_DEPEND)

MAC/APL/CURTDBDaemons/src/LoggingProcessor/LoggingProcessor.cc

@@ -22,6 +22,7 @@
 
 #include <lofar_config.h>
 #include <Common/LofarLogger.h>
+#include <Common/Version.h>
 #include <GCF/PVSS/GCF_PVTypes.h>
 #include <MACIO/GCF_Event.h>
 #include <MACIO/MACServiceInfo.h>
@@ -30,6 +31,7 @@
 #include <GCF/RTDB/DP_Protocol.ph>
 #include <log4cplus/socketappender.h>
 #include "LoggingProcessor.h"
+#include "../Package__Version.h"
 
 using namespace log4cplus;
 using namespace log4cplus::helpers;
@@ -52,6 +54,7 @@ LoggingProcessor::LoggingProcessor(const string&	myName) :
 	itsTimerPort(0)
 {
 	LOG_DEBUG_STR("LoggingProcessor(" << myName << ")");
+	LOG_INFO(Version::getInfo<CURTDBDaemonsVersion>("LoggingProcessor"));
 
 	registerProtocol(F_FSM_PROTOCOL, F_FSM_PROTOCOL_STRINGS);
 	registerProtocol(LOG_PROTOCOL,   LOG_PROTOCOL_STRINGS);

MAC/APL/CURTDBDaemons/src/LoggingProcessor/Makefile.am

@@ -6,7 +6,8 @@ bin_PROGRAMS 				= LoggingProcessor
 #							  -fmessage-length=0 \
 #							  -fdiagnostics-show-location=once
 
-LoggingProcessor_SOURCES	= LoggingProcessor.cc \
+LoggingProcessor_SOURCES	= ../Package__Version.cc \
+							  LoggingProcessor.cc \
 							  LoggingProcessorMain.cc
 LoggingProcessor_LDADD		= $(LOFAR_DEPEND) $(libdir)/liblog_protocol.a
 LoggingProcessor_DEPENDENCIES=$(LOFAR_DEPEND)

MAC/APL/CURTDBDaemons/src/Makefile.am

+lib_LTLIBRARIES = libcurtdbdaemons.la
+libcurtdbdaemons_la_SOURCES = Package__Version.cc
+
+pkginclude_HEADERS = Package__Version.h
+
 SUBDIRS = LoggingProcessor KeyValueLogger
 
+bin_PROGRAMS = versioncurtdbdaemons
+
+versioncurtdbdaemons_SOURCES      = versioncurtdbdaemons.cc
+versioncurtdbdaemons_LDADD        = libcurtdbdaemons.la
+versioncurtdbdaemons_DEPENDENCIES = libcurtdbdaemons.la $(LOFAR_DEPEND)
+
 include $(top_srcdir)/Makefile.common