diff options
| -rw-r--r-- | configure.ac | 21 | ||||
| -rw-r--r-- | src/util/program.c | 2 | ||||
| -rw-r--r-- | src/util/service.c | 2 | ||||
| -rw-r--r-- | src/util/test_getopt.c | 2 |
4 files changed, 24 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac index 6d77903138..c0d44484f0 100644 --- a/configure.ac +++ b/configure.ac @@ -1137,6 +1137,27 @@ AC_MSG_RESULT($use_gcov) AM_CONDITIONAL([USE_COVERAGE], [test "x$use_gcov" = "xyes"]) +# version info +AC_PATH_PROG(svnversioncommand, svnversion) +AC_PATH_PROG(gitcommand, git) +if test "X$svnversioncommand" = "X" || test `$svnversioncommand -n '.'` = "exported" +then + if test "X$gitcommand" = "X" + then + AC_DEFINE_UNQUOTED(VCS_VERSION, ["release"], [repository svn version]) + else + gitver=$(git log -1 | grep "git-svn-id" | sed -e 's/.*@\([[0-9]]\+\) .*/\1/') + if "X$gitver" = "X" + then + AC_DEFINE_UNQUOTED(VCS_VERSION, ["release"], [repository svn version]) + else + AC_DEFINE_UNQUOTED(VCS_VERSION, ["svn-$gitver"], [repository svn version]) + fi + fi +else + AC_DEFINE_UNQUOTED(VCS_VERSION, ["svn-`svnversion -n`"], [repository svn version]) +fi + AC_CONFIG_FILES([ Makefile contrib/Makefile diff --git a/src/util/program.c b/src/util/program.c index 4985995b49..01a8b496a1 100644 --- a/src/util/program.c +++ b/src/util/program.c @@ -158,7 +158,7 @@ GNUNET_PROGRAM_run2 (int argc, char *const *argv, const char *binaryName, GNUNET_GETOPT_OPTION_HELP (binaryHelp), GNUNET_GETOPT_OPTION_LOGLEVEL (&loglev), GNUNET_GETOPT_OPTION_LOGFILE (&logfile), - GNUNET_GETOPT_OPTION_VERSION (PACKAGE_VERSION) + GNUNET_GETOPT_OPTION_VERSION (PACKAGE_VERSION " " VCS_VERSION) }; struct GNUNET_GETOPT_CommandLineOption *allopts; const char *gargs; diff --git a/src/util/service.c b/src/util/service.c index 8b779c61d8..c6fdc1f8d6 100644 --- a/src/util/service.c +++ b/src/util/service.c @@ -1749,7 +1749,7 @@ GNUNET_SERVICE_run (int argc, char *const *argv, const char *service_name, GNUNET_GETOPT_OPTION_HELP (NULL), GNUNET_GETOPT_OPTION_LOGLEVEL (&loglev), GNUNET_GETOPT_OPTION_LOGFILE (&logfile), - GNUNET_GETOPT_OPTION_VERSION (PACKAGE_VERSION), + GNUNET_GETOPT_OPTION_VERSION (PACKAGE_VERSION " " VCS_VERSION), GNUNET_GETOPT_OPTION_END }; err = 1; diff --git a/src/util/test_getopt.c b/src/util/test_getopt.c index 65c3b5d2ee..313167d173 100644 --- a/src/util/test_getopt.c +++ b/src/util/test_getopt.c @@ -85,7 +85,7 @@ testVersion () NULL }; const struct GNUNET_GETOPT_CommandLineOption versionoptionlist[] = { - GNUNET_GETOPT_OPTION_VERSION (PACKAGE_VERSION), + GNUNET_GETOPT_OPTION_VERSION (PACKAGE_VERSION " " VCS_VERSION), GNUNET_GETOPT_OPTION_END }; |