diff options
| author | Matthias P. Braendli <matthias.braendli@mpb.li> | 2013-11-12 20:16:15 +0100 |
|---|---|---|
| committer | Matthias P. Braendli <matthias.braendli@mpb.li> | 2013-11-12 20:16:15 +0100 |
| commit | 7b1cdcb6b9ae5e34901f109ff6db4fe8d660f1d3 (patch) | |
| tree | 8e867ed36cd40c5163ae490c9d8c1dc32a6094aa /src | |
| parent | 8d461525388f799008118d7fe873079d2bd5ba8e (diff) | |
| download | dabmux-7b1cdcb6b9ae5e34901f109ff6db4fe8d660f1d3.tar.gz dabmux-7b1cdcb6b9ae5e34901f109ff6db4fe8d660f1d3.tar.bz2 dabmux-7b1cdcb6b9ae5e34901f109ff6db4fe8d660f1d3.zip | |
update version generation for git, update INSTALL
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile.am | 8 | ||||
| -rw-r--r-- | src/Makefile.in | 6 | ||||
| -rw-r--r-- | src/utils.cpp | 2 |
3 files changed, 8 insertions, 8 deletions
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" |