diff options
author | LRN <lrn1986@gmail.com> | 2012-11-19 18:14:33 +0000 |
---|---|---|
committer | LRN <lrn1986@gmail.com> | 2012-11-19 18:14:33 +0000 |
commit | 99d0b2ce7659f0dbe0d632d370a5fb8a9bb0f6c9 (patch) | |
tree | e6b857aefb94d06f686921d98bf0b95928c30e4d | |
parent | f64e7ab9c26ccc0d0d32e7458745f2c70bffd352 (diff) | |
download | gnunet-99d0b2ce7659f0dbe0d632d370a5fb8a9bb0f6c9.tar.gz gnunet-99d0b2ce7659f0dbe0d632d370a5fb8a9bb0f6c9.zip |
Hardcode svn revision in compiled binaries
-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 6d7790313..c0d44484f 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -1137,6 +1137,27 @@ AC_MSG_RESULT($use_gcov) | |||
1137 | AM_CONDITIONAL([USE_COVERAGE], [test "x$use_gcov" = "xyes"]) | 1137 | AM_CONDITIONAL([USE_COVERAGE], [test "x$use_gcov" = "xyes"]) |
1138 | 1138 | ||
1139 | 1139 | ||
1140 | # version info | ||
1141 | AC_PATH_PROG(svnversioncommand, svnversion) | ||
1142 | AC_PATH_PROG(gitcommand, git) | ||
1143 | if test "X$svnversioncommand" = "X" || test `$svnversioncommand -n '.'` = "exported" | ||
1144 | then | ||
1145 | if test "X$gitcommand" = "X" | ||
1146 | then | ||
1147 | AC_DEFINE_UNQUOTED(VCS_VERSION, ["release"], [repository svn version]) | ||
1148 | else | ||
1149 | gitver=$(git log -1 | grep "git-svn-id" | sed -e 's/.*@\([[0-9]]\+\) .*/\1/') | ||
1150 | if "X$gitver" = "X" | ||
1151 | then | ||
1152 | AC_DEFINE_UNQUOTED(VCS_VERSION, ["release"], [repository svn version]) | ||
1153 | else | ||
1154 | AC_DEFINE_UNQUOTED(VCS_VERSION, ["svn-$gitver"], [repository svn version]) | ||
1155 | fi | ||
1156 | fi | ||
1157 | else | ||
1158 | AC_DEFINE_UNQUOTED(VCS_VERSION, ["svn-`svnversion -n`"], [repository svn version]) | ||
1159 | fi | ||
1160 | |||
1140 | AC_CONFIG_FILES([ | 1161 | AC_CONFIG_FILES([ |
1141 | Makefile | 1162 | Makefile |
1142 | contrib/Makefile | 1163 | contrib/Makefile |
diff --git a/src/util/program.c b/src/util/program.c index 4985995b4..01a8b496a 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, | |||
158 | GNUNET_GETOPT_OPTION_HELP (binaryHelp), | 158 | GNUNET_GETOPT_OPTION_HELP (binaryHelp), |
159 | GNUNET_GETOPT_OPTION_LOGLEVEL (&loglev), | 159 | GNUNET_GETOPT_OPTION_LOGLEVEL (&loglev), |
160 | GNUNET_GETOPT_OPTION_LOGFILE (&logfile), | 160 | GNUNET_GETOPT_OPTION_LOGFILE (&logfile), |
161 | GNUNET_GETOPT_OPTION_VERSION (PACKAGE_VERSION) | 161 | GNUNET_GETOPT_OPTION_VERSION (PACKAGE_VERSION " " VCS_VERSION) |
162 | }; | 162 | }; |
163 | struct GNUNET_GETOPT_CommandLineOption *allopts; | 163 | struct GNUNET_GETOPT_CommandLineOption *allopts; |
164 | const char *gargs; | 164 | const char *gargs; |
diff --git a/src/util/service.c b/src/util/service.c index 8b779c61d..c6fdc1f8d 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, | |||
1749 | GNUNET_GETOPT_OPTION_HELP (NULL), | 1749 | GNUNET_GETOPT_OPTION_HELP (NULL), |
1750 | GNUNET_GETOPT_OPTION_LOGLEVEL (&loglev), | 1750 | GNUNET_GETOPT_OPTION_LOGLEVEL (&loglev), |
1751 | GNUNET_GETOPT_OPTION_LOGFILE (&logfile), | 1751 | GNUNET_GETOPT_OPTION_LOGFILE (&logfile), |
1752 | GNUNET_GETOPT_OPTION_VERSION (PACKAGE_VERSION), | 1752 | GNUNET_GETOPT_OPTION_VERSION (PACKAGE_VERSION " " VCS_VERSION), |
1753 | GNUNET_GETOPT_OPTION_END | 1753 | GNUNET_GETOPT_OPTION_END |
1754 | }; | 1754 | }; |
1755 | err = 1; | 1755 | err = 1; |
diff --git a/src/util/test_getopt.c b/src/util/test_getopt.c index 65c3b5d2e..313167d17 100644 --- a/src/util/test_getopt.c +++ b/src/util/test_getopt.c | |||
@@ -85,7 +85,7 @@ testVersion () | |||
85 | NULL | 85 | NULL |
86 | }; | 86 | }; |
87 | const struct GNUNET_GETOPT_CommandLineOption versionoptionlist[] = { | 87 | const struct GNUNET_GETOPT_CommandLineOption versionoptionlist[] = { |
88 | GNUNET_GETOPT_OPTION_VERSION (PACKAGE_VERSION), | 88 | GNUNET_GETOPT_OPTION_VERSION (PACKAGE_VERSION " " VCS_VERSION), |
89 | GNUNET_GETOPT_OPTION_END | 89 | GNUNET_GETOPT_OPTION_END |
90 | }; | 90 | }; |
91 | 91 | ||