diff options
| author | Nick Mathewson <nickm@torproject.org> | 2007-04-18 19:28:47 +0000 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2007-04-18 19:28:47 +0000 |
| commit | addf2987c58b86aa98b1771200d724e514adb7cb (patch) | |
| tree | f9227b3b8a0bd993f35ca8c99b968a54b4cc5d27 | |
| parent | a97361183454f69afc370e5f5a4a723094a7f95a (diff) | |
| download | tor-addf2987c58b86aa98b1771200d724e514adb7cb.tar.gz tor-addf2987c58b86aa98b1771200d724e514adb7cb.zip | |
r12429@catbus: nickm | 2007-04-18 15:28:41 -0400
Make svn revision number visible in version even if building from a .tar.gz. This was remarkably painless.
svn:r9988
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | src/or/Makefile.am | 24 |
2 files changed, 16 insertions, 14 deletions
@@ -23,8 +23,10 @@ Changes in version 0.2.0.1-alpha - 2007-??-?? - When warning about missing headers, tell the user to let us know if the compile succeeds anyway, so we can downgrade the warning. - - If we're building from a subversion checkout or an SVK mirror, include - the current SVN revision as part of the version string. + - Include the current subversion revision as part of the version + string: either fetch it directly if we're in an SVN checkout, do + some magic to guess it if we're in an SVK checkout, or use + the last-detected version if we're building from a .tar.gz. o Minor features (logging): - Always prepend "Bug: " to any log message about a bug. diff --git a/src/or/Makefile.am b/src/or/Makefile.am index ff24a5ffeb..5e8ba27897 100644 --- a/src/or/Makefile.am +++ b/src/or/Makefile.am @@ -26,38 +26,38 @@ test_SOURCES = buffers.c circuitbuild.c circuitlist.c \ test_LDADD = ../common/libor.a ../common/libor-crypto.a -noinst_HEADERS = or.h eventdns.h eventdns_tor.h +noinst_HEADERS = or.h eventdns.h eventdns_tor.h micro-revision.i tor_main.o: micro-revision.i micro-revision.i: FORCE - rm -f micro-revision.i; \ if test -d ../../.svn ; then \ svn info ../.. | \ sed -n 's/^Revision: \([0-9][0-9]*\).*/"\1"/p' > micro-revision.i \ - || true; \ + || true; \ fi; \ if test ! -f micro-revision.i -a x`which svk` != x; then\ location=../..; \ rev=x; \ - while test x$$rev = xx; do \ - x=`svk info $$location | \ + while test x$$rev = xx; do \ + x=`svk info $$location | \ sed -n 's/^Mirrored From:.*, Rev\. \([0-9][0-9]*\)/\1/p'`; \ - if test x$$x != x; then \ - rev=$$x; \ + if test x$$x != x; then \ + rev=$$x; \ break; \ else \ - loc=`svk info $$location | \ + loc=`svk info $$location | \ sed -n 's/^Copied From: \(.*\), Rev\. [0-9][0-9]*/\1/p'`; \ - if test x$$loc == x; then \ - rev=""; \ + if test x$$loc = x; then \ break; \ else \ - location=/$$loc; \ + location=/$$loc; \ fi; \ fi; \ done; \ - echo \"$$rev\" > micro-revision.i; \ + if test x$$rev != x; then \ + echo \"$$rev\" > micro-revision.i; \ + fi; \ fi; \ if test ! -f micro-revision.i; then \ echo '""' > micro-revision.i; \ |