insert hg revision into version string

5 files changed, 20 insertions, 8 deletions

diff --git a/Makefile.am b/Makefile.am
index 1b198b0..d495b79 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -21,3 +21,4 @@ SUBDIRS	=src lib
 ACLOCAL_AMFLAGS = -I m4
 
 EXTRA_DIST	=COPYING NEWS README AUTHORS ChangeLog TODO doc
+
diff --git a/configure.ac b/configure.ac
index 5ccdbd3..761baaf 100644
--- a/configure.ac
+++ b/configure.ac
@@ -17,7 +17,7 @@
 # along with CRC-DabMux.  If not, see <http://www.gnu.org/licenses/>.
 
 AC_PREREQ(2.61)
-AC_INIT([CRC-DabMux], [0.3.0.4-r7], [pascal.charest@crc.ca])
+AC_INIT([CRC-DabMux], [0.3.0.4-mpb], [pascal.charest@crc.ca])
 AC_CONFIG_AUX_DIR([build-aux])
 AC_CANONICAL_SYSTEM
 AM_INIT_AUTOMAKE([-Wall subdir-objects])
@@ -226,6 +226,8 @@ AC_ARG_ENABLE([format_epm],
 AS_IF([test "x$enable_format_epm" = "xyes"],
         [AC_DEFINE(HAVE_FORMAT_EPM, [1], [Define if EPM format is enabled])])
 
+AM_CONDITIONAL([IS_HG_REPO], [hg parents])
+
 AC_CONFIG_FILES([Makefile
                  src/Makefile
                  lib/Makefile
diff --git a/src/Makefile.am b/src/Makefile.am
index 4815e96..65cb221 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -21,6 +21,12 @@
 
 bin_PROGRAMS=CRC-DabMux CRC-BridgeTest
 
+if IS_HG_REPO
+HGVERSION_FLAGS = -DHGVERSION="\"`hg parents --template '-{node|short}'`\""
+else
+HGVERSION_FLAGS = -DHGVERSION="\"-modified\""
+endif
+
 FEC_FLAGS   =
 FEC_LIBS    =-lfec
 
@@ -30,7 +36,7 @@ else
 ZMQ_LIBS    =
 endif
 
-CRC_DabMux_CPPFLAGS =-I$(FARSYNC_DIR)
+CRC_DabMux_CPPFLAGS =-I$(FARSYNC_DIR) $(HGVERSION_FLAGS)
 CRC_DabMux_LDADD    =$(FEC_LIBS) $(ZMQ_LIBS) -lpthread
 CRC_DabMux_SOURCES  =DabMux.cpp \
                      dabInput.h dabInput.cpp \
diff --git a/src/Makefile.in b/src/Makefile.in
index c978e7e..3e4fe5f 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -344,11 +344,13 @@ target_vendor = @target_vendor@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
+@IS_HG_REPO_FALSE@HGVERSION_FLAGS = -DHGVERSION="\"-modified\""
+@IS_HG_REPO_TRUE@HGVERSION_FLAGS = -DHGVERSION="\"`hg parents --template '-{node|short}'`\""
 FEC_FLAGS = 
 FEC_LIBS = -lfec
 @HAVE_OUTPUT_ZEROMQ_TEST_FALSE@ZMQ_LIBS = 
 @HAVE_OUTPUT_ZEROMQ_TEST_TRUE@ZMQ_LIBS = -lzmq
-CRC_DabMux_CPPFLAGS = -I$(FARSYNC_DIR)
+CRC_DabMux_CPPFLAGS = -I$(FARSYNC_DIR) $(HGVERSION_FLAGS)
 CRC_DabMux_LDADD = $(FEC_LIBS) $(ZMQ_LIBS) -lpthread
 CRC_DabMux_SOURCES = DabMux.cpp \
                      dabInput.h dabInput.cpp \
diff --git a/src/utils.cpp b/src/utils.cpp
index 9e87337..82cde96 100644
--- a/src/utils.cpp
+++ b/src/utils.cpp
@@ -3,8 +3,8 @@
    2011, 2012 Her Majesty the Queen in Right of Canada (Communications
    Research Center Canada)
 
-   Includes modifications
-   2012, Matthias P. Braendli, matthias.braendli@mpb.li
+   Copyright (C) 2013,
+   Matthias P. Braendli, http://mpb.li, matthias.braendli@mpb.li
    */
 /*
    This file is part of CRC-DabMux.
@@ -47,12 +47,13 @@ time_t getDabTime()
 void header_message() 
 {
     etiLog.printHeader(TcpLog::INFO,
-            "Welcome to %s %s, compiled at %s, %s\n\n",
-            PACKAGE_NAME, PACKAGE_VERSION, __DATE__, __TIME__);
+            "Welcome to %s %s%s, compiled at %s, %s\n\n",
+            PACKAGE_NAME, PACKAGE_VERSION, HGVERSION, __DATE__, __TIME__);
     etiLog.printHeader(TcpLog::INFO,
             "Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012\n"
             "Her Majesty the Queen in Right of Canada,\n"
-            "(Communications Research Centre Canada) All rights reserved.\n\n");
+            "(Communications Research Centre Canada) All rights reserved.\n\n"
+            "Copyright (C) 2013\nMatthias P. Braendli, http://mpb.li\n\n");
     etiLog.printHeader(TcpLog::INFO, "Input URLs supported:");
 #if defined(HAVE_INPUT_PRBS)
     etiLog.printHeader(TcpLog::INFO, " prbs");