diff options
| author | Matthias P. Braendli <matthias.braendli@mpb.li> | 2014-02-07 08:50:39 +0100 |
|---|---|---|
| committer | Matthias P. Braendli <matthias.braendli@mpb.li> | 2014-02-07 09:01:02 +0100 |
| commit | 8a93130b066efd90f5b7d775cb1b5812e7677863 (patch) | |
| tree | a7bcf6c5c94ec9da89b684cf19e4126ffddf5001 | |
| parent | 2356d1f77f4a2a3dd75638621d687dc9d3771d6c (diff) | |
| download | dabmux-02bab8327dbe492635678e5bcc65ccda158f0401.tar.gz dabmux-02bab8327dbe492635678e5bcc65ccda158f0401.tar.bz2 dabmux-02bab8327dbe492635678e5bcc65ccda158f0401.zip | |
repair versioning and tarball generationv0.4.0
| -rw-r--r-- | src/Makefile.am | 6 | ||||
| -rw-r--r-- | src/StatsServer.cpp | 7 | ||||
| -rw-r--r-- | src/utils.cpp | 10 |
3 files changed, 13 insertions, 10 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index c5b40d4..0097b2c 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -23,9 +23,9 @@ bin_PROGRAMS=odr-dabmux odr-bridgetest if IS_GIT_REPO -GITVERSION_FLAGS = -DGITVERSION="\"-`git describe --long --tags`\"" +GITVERSION_FLAGS = -DGITVERSION="\"`git describe`\"" else -GITVERSION_FLAGS = -DGITVERSION="\"-exported\"" +GITVERSION_FLAGS = endif FEC_FLAGS = @@ -39,7 +39,7 @@ endif odr_dabmux_CPPFLAGS =-I$(FARSYNC_DIR) $(GITVERSION_FLAGS) odr_dabmux_LDADD =$(FEC_LIBS) $(ZMQ_LIBS) -lpthread -lboost_thread -lboost_system -odr_dabmux_SOURCES =DabMux.cpp \ +odr_dabmux_SOURCES =DabMux.cpp DabMux.h \ dabInput.h dabInput.cpp \ dabInputBridgeUdp.h dabInputBridgeUdp.cpp \ dabInputDabplusFifo.h dabInputDabplusFifo.cpp \ diff --git a/src/StatsServer.cpp b/src/StatsServer.cpp index 578f8d5..2e89134 100644 --- a/src/StatsServer.cpp +++ b/src/StatsServer.cpp @@ -157,13 +157,10 @@ void StatsServer::serverThread() struct sockaddr_in serv_addr, cli_addr; int n; -#ifndef GITVERSION -#define GITVERSION "-r???" -#endif int welcome_msg_len = snprintf(welcome_msg, 256, "{ \"service\": \"" - "%s %s%s Stats Server\" }\n", - PACKAGE_NAME, PACKAGE_VERSION, GITVERSION); + "%s %s Stats Server\" }\n", + PACKAGE_NAME, PACKAGE_VERSION); m_sock = socket(AF_INET, SOCK_STREAM, 0); diff --git a/src/utils.cpp b/src/utils.cpp index b7e1400..05a2d87 100644 --- a/src/utils.cpp +++ b/src/utils.cpp @@ -47,8 +47,14 @@ time_t getDabTime() void header_message() { etiLog.log(info, - "Welcome to %s %s%s, compiled at %s, %s\n\n", - PACKAGE_NAME, PACKAGE_VERSION, GITVERSION, __DATE__, __TIME__); + "Welcome to %s %s, compiled at %s, %s\n\n", + PACKAGE_NAME, +#if defined(GITVERSION) + GITVERSION, +#else + PACKAGE_VERSION, +#endif + __DATE__, __TIME__); etiLog.log(info, "Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012\n" "Her Majesty the Queen in Right of Canada,\n" |