From 7b1cdcb6b9ae5e34901f109ff6db4fe8d660f1d3 Mon Sep 17 00:00:00 2001
From: "Matthias P. Braendli" <matthias.braendli@mpb.li>
Date: Tue, 12 Nov 2013 20:16:15 +0100
Subject: update version generation for git, update INSTALL

---
 src/Makefile.am | 8 ++++----
 src/Makefile.in | 6 +++---
 src/utils.cpp   | 2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'src')

diff --git a/src/Makefile.am b/src/Makefile.am
index 65cb221..b20f1ed 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -21,10 +21,10 @@
 
 bin_PROGRAMS=CRC-DabMux CRC-BridgeTest
 
-if IS_HG_REPO
-HGVERSION_FLAGS = -DHGVERSION="\"`hg parents --template '-{node|short}'`\""
+if IS_GIT_REPO
+GITVERSION_FLAGS = -DGITVERSION="\"-`git describe --long --tags`\""
 else
-HGVERSION_FLAGS = -DHGVERSION="\"-modified\""
+GITVERSION_FLAGS = -DGITVERSION="\"-exported\""
 endif
 
 FEC_FLAGS   =
@@ -36,7 +36,7 @@ else
 ZMQ_LIBS    =
 endif
 
-CRC_DabMux_CPPFLAGS =-I$(FARSYNC_DIR) $(HGVERSION_FLAGS)
+CRC_DabMux_CPPFLAGS =-I$(FARSYNC_DIR) $(GITVERSION_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 3e4fe5f..0784a0f 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -344,13 +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}'`\""
+@IS_GIT_REPO_FALSE@GITVERSION_FLAGS = -DGITVERSION="\"-exported\""
+@IS_GIT_REPO_TRUE@GITVERSION_FLAGS = -DGITVERSION="\"-`git describe --long --tags`\""
 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) $(HGVERSION_FLAGS)
+CRC_DabMux_CPPFLAGS = -I$(FARSYNC_DIR) $(GITVERSION_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 82cde96..76f891f 100644
--- a/src/utils.cpp
+++ b/src/utils.cpp
@@ -48,7 +48,7 @@ void header_message()
 {
     etiLog.printHeader(TcpLog::INFO,
             "Welcome to %s %s%s, compiled at %s, %s\n\n",
-            PACKAGE_NAME, PACKAGE_VERSION, HGVERSION, __DATE__, __TIME__);
+            PACKAGE_NAME, PACKAGE_VERSION, GITVERSION, __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"
-- 
cgit v1.2.3