j3d1/tinc
1
0
Fork 0
Code Issues 1 Pull requests Releases Wiki Activity

Revert "Use git description as the tinc version."

Browse source 
This reverts commit e024b7a2c5. Automatic version
number generation needs a little bit more work to get it working correctly in
all cases.
This commit is contained in:
Guus Sliepen 2014-07-12 22:51:37 +02:00
parent 19e42b76f5
commit afb175873e
7 changed files with 8 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

2
configure.ac
View file

@ -1,7 +1,7 @@
dnl Process this file with autoconf to produce a configure script. dnl Process this file with autoconf to produce a configure script.
AC_PREREQ(2.61) AC_PREREQ(2.61)
AC_INIT([tinc], [GIT]) AC_INIT([tinc], [1.1pre10])
AC_CONFIG_SRCDIR([src/tincd.c]) AC_CONFIG_SRCDIR([src/tincd.c])
AC_GNU_SOURCE AC_GNU_SOURCE
AM_INIT_AUTOMAKE([check-news std-options subdir-objects -Wall]) AM_INIT_AUTOMAKE([check-news std-options subdir-objects -Wall])

11
src/Makefile.am
View file

@ -2,11 +2,8 @@
sbin_PROGRAMS = tincd tinc sptps_test sptps_keypair sbin_PROGRAMS = tincd tinc sptps_test sptps_keypair
## Make sure version.c is always rebuilt with the latest git information ## Make sure version.c is always rebuilt
.PHONY: version.c version_git.h .PHONY: version.c
version_git.h:
echo "#define GIT_DESCRIPTION \"`cd $(@D) && git describe || echo UNKNOWN`\"" >$@
version.c: version_git.h
if LINUX if LINUX
sbin_PROGRAMS += sptps_speed sbin_PROGRAMS += sptps_speed
@ -94,7 +91,7 @@ tincd_SOURCES = \
tincd.c \ tincd.c \
utils.c utils.h \ utils.c utils.h \
xalloc.h \ xalloc.h \
version.c version.h version_git.h \ version.c version.h \
$(ed25519_SOURCES) \ $(ed25519_SOURCES) \
$(chacha_poly1305_SOURCES) $(chacha_poly1305_SOURCES)
@ -113,7 +110,7 @@ tinc_SOURCES = \
tincctl.c tincctl.h \ tincctl.c tincctl.h \
top.c top.h \ top.c top.h \
utils.c utils.h \ utils.c utils.h \
version.c version.h version_git.h \ version.c version.h \
$(ed25519_SOURCES) \ $(ed25519_SOURCES) \
$(chacha_poly1305_SOURCES) $(chacha_poly1305_SOURCES)

2
src/process.c
View file

@ -213,7 +213,7 @@ bool detach(void) {
openlogger(identname, use_logfile?LOGMODE_FILE:(do_detach?LOGMODE_SYSLOG:LOGMODE_STDERR)); openlogger(identname, use_logfile?LOGMODE_FILE:(do_detach?LOGMODE_SYSLOG:LOGMODE_STDERR));
logger(DEBUG_ALWAYS, LOG_NOTICE, "tincd %s (%s %s) starting, debug level %d", logger(DEBUG_ALWAYS, LOG_NOTICE, "tincd %s (%s %s) starting, debug level %d",
BUILD_VERSION, BUILD_DATE, BUILD_TIME, debug_level); VERSION, BUILD_DATE, BUILD_TIME, debug_level);
return true; return true;
} }

2
src/tincctl.c
View file

@ -86,7 +86,7 @@ static struct option const long_options[] = {
static void version(void) { static void version(void) {
printf("%s version %s (built %s %s, protocol %d.%d)\n", PACKAGE, printf("%s version %s (built %s %s, protocol %d.%d)\n", PACKAGE,
BUILD_VERSION, BUILD_DATE, BUILD_TIME, PROT_MAJOR, PROT_MINOR); VERSION, BUILD_DATE, BUILD_TIME, PROT_MAJOR, PROT_MINOR);
printf("Copyright (C) 1998-2012 Ivo Timmermans, Guus Sliepen and others.\n" printf("Copyright (C) 1998-2012 Ivo Timmermans, Guus Sliepen and others.\n"
"See the AUTHORS file for a complete list.\n\n" "See the AUTHORS file for a complete list.\n\n"
"tinc comes with ABSOLUTELY NO WARRANTY. This is free software,\n" "tinc comes with ABSOLUTELY NO WARRANTY. This is free software,\n"

2
src/tincd.c
View file

@ -332,7 +332,7 @@ int main(int argc, char **argv) {
if(show_version) { if(show_version) {
printf("%s version %s (built %s %s, protocol %d.%d)\n", PACKAGE, printf("%s version %s (built %s %s, protocol %d.%d)\n", PACKAGE,
BUILD_VERSION, BUILD_DATE, BUILD_TIME, PROT_MAJOR, PROT_MINOR); VERSION, BUILD_DATE, BUILD_TIME, PROT_MAJOR, PROT_MINOR);
printf("Copyright (C) 1998-2014 Ivo Timmermans, Guus Sliepen and others.\n" printf("Copyright (C) 1998-2014 Ivo Timmermans, Guus Sliepen and others.\n"
"See the AUTHORS file for a complete list.\n\n" "See the AUTHORS file for a complete list.\n\n"
"tinc comes with ABSOLUTELY NO WARRANTY. This is free software,\n" "tinc comes with ABSOLUTELY NO WARRANTY. This is free software,\n"

2
src/version.c
View file

@ -18,9 +18,7 @@
*/ */
#include "version.h" #include "version.h"
#include "version_git.h"
/* This file is always rebuilt (even if there are no changes) so that the following is updated */ /* This file is always rebuilt (even if there are no changes) so that the following is updated */
const char* const BUILD_DATE = __DATE__; const char* const BUILD_DATE = __DATE__;
const char* const BUILD_TIME = __TIME__; const char* const BUILD_TIME = __TIME__;
const char* const BUILD_VERSION = GIT_DESCRIPTION;

1
src/version.h
View file

@ -22,6 +22,5 @@
extern const char* const BUILD_DATE; extern const char* const BUILD_DATE;
extern const char* const BUILD_TIME; extern const char* const BUILD_TIME;
extern const char* const BUILD_VERSION;
#endif /* __TINC_VERSION_H__ */ #endif /* __TINC_VERSION_H__ */