Improve the git revision tracking
PATCH 1/1 Improve the git revision tracking
From: David Sommerseth <[email protected]...>
This removes the single 'git revision' line from the --version screen and moves this information on the top, together with the OpenVPN version.
In addition this patch adds two git flags after the git committish. If there exists changed but unstaged files when the build was done, a '+' is appended after the committish. If there exists staged files (files which have been added with 'git add') a '*' will be appended. These flags are not exclusive.
This also simplifies the config-version.h generation by not using sed parsing a template. It's just two lines which are generated, so no need to complicate things more than needed.
--- Makefile.am | 9 ++++++--- config-version.h.in | 1 - src/openvpn/options.c | 6 +++--- version.m4 | 2 +- 4 files changed, 10 insertions(+), 8 deletions(-)
Makefile.am +6 -3
@@ -66,7 +66,6 @@ dist_doc_DATA = \ dist_noinst_DATA = \ .gitignore \ .gitattributes \ - config-version.h.in \ PORTS \ README.IPv6 TODO.IPv6 \ README.polarssl \
@@ -91,8 +90,12 @@ root_DATA = version.sh endif config-version.h: - @CONFIGURE_GIT_REVISION="`GIT_DIR=\"$(top_srcdir)/.git\" $(GIT) rev-parse --symbolic-full-name HEAD`/`GIT_DIR=\"$(top_srcdir)/.git\" $(GIT) rev-parse --short=16 HEAD`"; \ - $(SED) "s#@CONFIGURE_GIT_REVISION[@]#$${CONFIGURE_GIT_REVISION}#g" "$(srcdir)/config-version.h.in" > config-version.h.tmp + @CONFIGURE_GIT_CHFILES="`GIT_DIR=\"$(top_srcdir)/.git\" $(GIT) diff-files --name-status -r --ignore-submodules --quiet -- || echo \"+\"`"; \ + CONFIGURE_GIT_UNCOMMITTED="`GIT_DIR=\"$(top_srcdir)/.git\" $(GIT) diff-index --cached --quiet --ignore-submodules HEAD || echo \"*\"`"; \ + CONFIGURE_GIT_REVISION="`GIT_DIR=\"$(top_srcdir)/.git\" $(GIT) rev-parse --symbolic-full-name HEAD | cut -d/ -f3-`/`GIT_DIR=\"$(top_srcdir)/.git\" $(GIT) rev-parse --short=16 HEAD`"; \ + echo "#define CONFIGURE_GIT_REVISION \"$${CONFIGURE_GIT_REVISION}\"" > config-version.h.tmp; \ + echo "#define CONFIGURE_GIT_FLAGS \"$${CONFIGURE_GIT_CHFILES}$${CONFIGURE_GIT_UNCOMMITTED}\"" >> config-version.h.tmp + @if ! [ -f config-version.h ] || ! cmp -s config-version.h.tmp config-version.h; then \ echo "replacing config-version.h"; \ mv config-version.h.tmp config-version.h; \
config-version.h.in deleted +0 -1
@@ -1 +0,0 @@ -#define CONFIGURE_GIT_REVISION "@CONFIGURE_GIT_REVISION@"
src/openvpn/options.c +3 -3
@@ -64,6 +64,9 @@const char title_string[] = PACKAGE_STRING +#ifdef CONFIGURE_GIT_REVISION + " [git:" CONFIGURE_GIT_REVISION CONFIGURE_GIT_FLAGS "]" +#endif " " TARGET_ALIAS#ifdef ENABLE_CRYPTO #ifdef ENABLE_SSL
@@ -3426,9 +3429,6 @@ usage_version (void)#ifdef CONFIGURE_SPECIAL_BUILD msg (M_INFO |M_NOPREFIX ,"special build: %s" ,CONFIGURE_SPECIAL_BUILD );#endif -#ifdef CONFIGURE_GIT_REVISION -msg (M_INFO |M_NOPREFIX ,"git revision: %s" ,CONFIGURE_GIT_REVISION ); -#endif #endif openvpn_exit (OPENVPN_EXIT_STATUS_USAGE );/* exit point */ }
version.m4 +1 -1
@@ -1,7 +1,7 @@ dnl define the OpenVPN version define([PRODUCT_NAME], [OpenVPN]) define([PRODUCT_TARNAME], [openvpn]) -define([PRODUCT_VERSION], [2.3_master]) +define([PRODUCT_VERSION], [2.3_git]) define([PRODUCT_BUGREPORT], [[email protected]]) define([PRODUCT_VERSION_RESOURCE], [2,3,0,0]) dnl define the TAP version
Signature · 1 line
1.7.10.2
Hi,
Quoted 4 lines · David Sommerseth
From: David Sommerseth <[email protected]...>
This removes the single 'git revision' line from the --version screen and moves this information on the top, together with the OpenVPN version.
ACK!
gert
Signature · 4 lines
USENET is *not* the non-clickable part of WWW!
//www.muc.de/~gert/
Gert Doering - Munich, Germany [email protected]...
fax: +49-89-35655025 [email protected]...Your patch has been applied to the master branch.
commit fff03917947379167502934f09f79ca3e8817fe3
Author: David Sommerseth Date: Fri Apr 19 13:21:54 2013 +0200
Improve the git revision tracking
Signed-off-by: David Sommerseth <[email protected]...>
Acked-by: Gert Doering <[email protected]...>
Message-Id: [email protected]...
URL: http://article.gmane.org/gmane.network.openvpn.devel/7522--
kind regards,
David Sommerseth
Signature · 3 lines
kind regards, David Sommerseth