From cc09440d275cba7b8e747845045632f2f395317d Mon Sep 17 00:00:00 2001 From: zodiac Date: Tue, 17 Feb 2009 05:26:58 +0000 Subject: [PATCH] Include Subversion revision number in user-visible version number. git-svn-id: https://shellinabox.googlecode.com/svn/trunk@67 0da03de8-d603-11dd-86c2-0f8696b7b6f9 --- Makefile.am | 3 +- Makefile.in | 4 ++- config.h | 3 ++ config.h.in | 3 ++ configure | 59 ++++++++++++++++++++++---------------- configure.ac | 4 +++ shellinabox/shellinaboxd.c | 2 +- 7 files changed, 50 insertions(+), 28 deletions(-) diff --git a/Makefile.am b/Makefile.am index 8e80e74..e17ae64 100644 --- a/Makefile.am +++ b/Makefile.am @@ -195,7 +195,8 @@ clean-local: -e t \ -e d "$<"`" \ -e "s/^#/\/\/ #/" \ - -e "s/VERSION/\"@VERSION@\"/g" "$<" >"$@.pre" && \ + -e "s/VERSION/\"@VERSION@ (revision @VCS_REVISION@)\"/g" \ + "$<" >"$@.pre" && \ objcopy \ -I binary `echo $(host_cpu) | \ grep -q '^i[0-9]86$$' && \ diff --git a/Makefile.in b/Makefile.in index 7104031..57f7d78 100644 --- a/Makefile.in +++ b/Makefile.in @@ -182,6 +182,7 @@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +VCS_REVISION = @VCS_REVISION@ VERSION = @VERSION@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ @@ -1107,7 +1108,8 @@ clean-local: -e t \ -e d "$<"`" \ -e "s/^#/\/\/ #/" \ - -e "s/VERSION/\"@VERSION@\"/g" "$<" >"$@.pre" && \ + -e "s/VERSION/\"@VERSION@ (revision @VCS_REVISION@)\"/g" \ + "$<" >"$@.pre" && \ objcopy \ -I binary `echo $(host_cpu) | \ grep -q '^i[0-9]86$$' && \ diff --git a/config.h b/config.h index fe89c7b..44e09cb 100644 --- a/config.h +++ b/config.h @@ -94,6 +94,9 @@ /* Define to 1 if you have the ANSI C header files. */ #define STDC_HEADERS 1 +/* Most recent revision number in the version control system */ +#define VCS_REVISION "66" + /* Version number of package */ #define VERSION "2.4" diff --git a/config.h.in b/config.h.in index 14dcee1..e720f4a 100644 --- a/config.h.in +++ b/config.h.in @@ -93,6 +93,9 @@ /* Define to 1 if you have the ANSI C header files. */ #undef STDC_HEADERS +/* Most recent revision number in the version control system */ +#undef VCS_REVISION + /* Version number of package */ #undef VERSION diff --git a/configure b/configure index afdfb98..01385ca 100755 --- a/configure +++ b/configure @@ -805,6 +805,7 @@ LIBS build_alias host_alias target_alias +VCS_REVISION INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA @@ -1949,6 +1950,13 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $ ac_compiler_gnu=$ac_cv_c_compiler_gnu +VCS_REVISION=`echo '$Revision: 66$'|sed 's/.Revision: \(.*\)./\1/'` + + +cat >>confdefs.h <<_ACEOF +#define VCS_REVISION "${VCS_REVISION}" +_ACEOF + am__api_version='1.10' @@ -4412,7 +4420,7 @@ ia64-*-hpux*) ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 4415 "configure"' > conftest.$ac_ext + echo '#line 4423 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -7469,11 +7477,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7472: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7480: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:7476: \$? = $ac_status" >&5 + echo "$as_me:7484: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -7759,11 +7767,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7762: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7770: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:7766: \$? = $ac_status" >&5 + echo "$as_me:7774: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -7863,11 +7871,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7866: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7874: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:7870: \$? = $ac_status" >&5 + echo "$as_me:7878: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -10240,7 +10248,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext < conftest.$ac_ext <&5) + (eval echo "\"\$as_me:12752: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:12748: \$? = $ac_status" >&5 + echo "$as_me:12756: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -12845,11 +12853,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:12848: $lt_compile\"" >&5) + (eval echo "\"\$as_me:12856: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:12852: \$? = $ac_status" >&5 + echo "$as_me:12860: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -14443,11 +14451,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:14446: $lt_compile\"" >&5) + (eval echo "\"\$as_me:14454: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:14450: \$? = $ac_status" >&5 + echo "$as_me:14458: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -14547,11 +14555,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:14550: $lt_compile\"" >&5) + (eval echo "\"\$as_me:14558: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:14554: \$? = $ac_status" >&5 + echo "$as_me:14562: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -16767,11 +16775,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:16770: $lt_compile\"" >&5) + (eval echo "\"\$as_me:16778: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:16774: \$? = $ac_status" >&5 + echo "$as_me:16782: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -17057,11 +17065,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:17060: $lt_compile\"" >&5) + (eval echo "\"\$as_me:17068: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:17064: \$? = $ac_status" >&5 + echo "$as_me:17072: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -17161,11 +17169,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:17164: $lt_compile\"" >&5) + (eval echo "\"\$as_me:17172: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:17168: \$? = $ac_status" >&5 + echo "$as_me:17176: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -21967,6 +21975,7 @@ LIBS!$LIBS$ac_delim build_alias!$build_alias$ac_delim host_alias!$host_alias$ac_delim target_alias!$target_alias$ac_delim +VCS_REVISION!$VCS_REVISION$ac_delim INSTALL_PROGRAM!$INSTALL_PROGRAM$ac_delim INSTALL_SCRIPT!$INSTALL_SCRIPT$ac_delim INSTALL_DATA!$INSTALL_DATA$ac_delim @@ -22026,7 +22035,6 @@ CPP!$CPP$ac_delim CXX!$CXX$ac_delim CXXFLAGS!$CXXFLAGS$ac_delim ac_ct_CXX!$ac_ct_CXX$ac_delim -CXXDEPMODE!$CXXDEPMODE$ac_delim _ACEOF if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then @@ -22068,6 +22076,7 @@ _ACEOF ac_delim='%!_!# ' for ac_last_try in false false false false false :; do cat >conf$$subs.sed <<_ACEOF +CXXDEPMODE!$CXXDEPMODE$ac_delim am__fastdepCXX_TRUE!$am__fastdepCXX_TRUE$ac_delim am__fastdepCXX_FALSE!$am__fastdepCXX_FALSE$ac_delim CXXCPP!$CXXCPP$ac_delim @@ -22080,7 +22089,7 @@ LIBOBJS!$LIBOBJS$ac_delim LTLIBOBJS!$LTLIBOBJS$ac_delim _ACEOF - if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 10; then + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 11; then break elif $ac_last_try; then { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 diff --git a/configure.ac b/configure.ac index 1494f03..9a06e45 100644 --- a/configure.ac +++ b/configure.ac @@ -2,6 +2,10 @@ AC_PREREQ(2.57) dnl This is the one location where the authoritative version number is stored AC_INIT(shellinabox, 2.4, markus@shellinabox.com) +VCS_REVISION=`echo '$Revision: 66$'|sed 's/.Revision: \(.*\)./\1/'` +AC_SUBST(VCS_REVISION) +AC_DEFINE_UNQUOTED(VCS_REVISION, "${VCS_REVISION}", + [Most recent revision number in the version control system]) dnl Set up autoconf/automake for building C libraries and binaries with GCC AM_INIT_AUTOMAKE diff --git a/shellinabox/shellinaboxd.c b/shellinabox/shellinaboxd.c index 18ac50f..367c768 100644 --- a/shellinabox/shellinaboxd.c +++ b/shellinabox/shellinaboxd.c @@ -823,7 +823,7 @@ static void parseArgs(int argc, char * const argv[]) { logSetLogLevel(verbosity); } else if (!idx--) { // Version - message("ShellInABox version " VERSION); + message("ShellInABox version " VERSION " (revision " VCS_REVISION ")"); exit(0); } }