summaryrefslogtreecommitdiffstats
path: root/src/openvpn/options.c
diff options
context:
space:
mode:
authorDavid Sommerseth <davids@redhat.com>2013-04-19 13:21:54 +0200
committerDavid Sommerseth <davids@redhat.com>2013-04-19 15:46:37 +0200
commitfb6210418162ec036289117f6f1b6705b1d0d1d4 (patch)
tree3a4515bf0e48496167d403c2b23851ef5c705b8a /src/openvpn/options.c
parent1d561d4eaebe8652768270b6373023177b8d706d (diff)
downloadopenvpn-fb6210418162ec036289117f6f1b6705b1d0d1d4.tar.gz
openvpn-fb6210418162ec036289117f6f1b6705b1d0d1d4.tar.xz
openvpn-fb6210418162ec036289117f6f1b6705b1d0d1d4.zip
Improve the git revision tracking
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. Signed-off-by: David Sommerseth <davids@redhat.com> Acked-by: Gert Doering <gert@greenie.muc.de> Message-Id: 1366375212-14886-1-git-send-email-dazo@users.sourceforge.net URL: http://article.gmane.org/gmane.network.openvpn.devel/7522
Diffstat (limited to 'src/openvpn/options.c')
-rw-r--r--src/openvpn/options.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/openvpn/options.c b/src/openvpn/options.c
index ec39212..05c6da2 100644
--- a/src/openvpn/options.c
+++ b/src/openvpn/options.c
@@ -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 */
}