[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r25059 - in gnunet: . src/util
From: |
gnunet |
Subject: |
[GNUnet-SVN] r25059 - in gnunet: . src/util |
Date: |
Mon, 19 Nov 2012 19:14:33 +0100 |
Author: LRN
Date: 2012-11-19 19:14:33 +0100 (Mon, 19 Nov 2012)
New Revision: 25059
Modified:
gnunet/configure.ac
gnunet/src/util/program.c
gnunet/src/util/service.c
gnunet/src/util/test_getopt.c
Log:
Hardcode svn revision in compiled binaries
Modified: gnunet/configure.ac
===================================================================
--- gnunet/configure.ac 2012-11-19 16:30:11 UTC (rev 25058)
+++ gnunet/configure.ac 2012-11-19 18:14:33 UTC (rev 25059)
@@ -1137,6 +1137,27 @@
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/address@hidden([[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
Modified: gnunet/src/util/program.c
===================================================================
--- gnunet/src/util/program.c 2012-11-19 16:30:11 UTC (rev 25058)
+++ gnunet/src/util/program.c 2012-11-19 18:14:33 UTC (rev 25059)
@@ -158,7 +158,7 @@
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;
Modified: gnunet/src/util/service.c
===================================================================
--- gnunet/src/util/service.c 2012-11-19 16:30:11 UTC (rev 25058)
+++ gnunet/src/util/service.c 2012-11-19 18:14:33 UTC (rev 25059)
@@ -1749,7 +1749,7 @@
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;
Modified: gnunet/src/util/test_getopt.c
===================================================================
--- gnunet/src/util/test_getopt.c 2012-11-19 16:30:11 UTC (rev 25058)
+++ gnunet/src/util/test_getopt.c 2012-11-19 18:14:33 UTC (rev 25059)
@@ -85,7 +85,7 @@
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
};
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r25059 - in gnunet: . src/util,
gnunet <=