[Xfce4-commits] <thunar:xfce-4.6> Make build suitable for GIT.

[Nick Schermer]

Updating branch refs/heads/xfce-4.6
         to bb8fe6a93e3557bd41933b711c2a98ea3d30f020 (commit)
       from 4a284c2e39c0593f1fe15f56f6b17838ace2426e (commit)

commit bb8fe6a93e3557bd41933b711c2a98ea3d30f020
Author: Nick Schermer <nick at xfce.org>
Date:   Wed May 12 22:59:53 2010 +0200

    Make build suitable for GIT.

 autogen.sh      |   14 +++++++++++++-
 configure.in.in |    8 ++++----
 2 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/autogen.sh b/autogen.sh
index 9bbd678..ca8cf53 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -29,7 +29,19 @@ EOF
 
 # substitute revision and linguas
 linguas=`sed -e '/^#/d' po/LINGUAS`
-revision=`LC_ALL=C svn info $0 | awk '/^Revision: / {printf "%05d\n", $2}'`
+if test -d .git/svn; then
+    revision=`git svn find-rev trunk 2>/dev/null ||
+              git svn find-rev origin/trunk 2>/dev/null ||
+              git svn find-rev HEAD 2>/dev/null ||
+              git svn find-rev master 2>/dev/null`
+elif test -d .git; then
+    revision=`git rev-parse --short HEAD`
+elif test -d .svn; then
+    revision=`LC_ALL=C svn info $0 | $AWK '/^Revision: / {printf "%05d\n", $2}'`
+fi
+if test "x$revision" = "x"; then
+    revision="UNKNOWN"
+fi
 sed -e "s/@LINGUAS@/${linguas}/g" \
     -e "s/@REVISION@/${revision}/g" \
     < "configure.in.in" > "configure.in"
diff --git a/configure.in.in b/configure.in.in
index 0db12a8..56e0021 100644
--- a/configure.in.in
+++ b/configure.in.in
@@ -15,14 +15,14 @@ m4_define([thunar_version_major], [1])
 m4_define([thunar_version_minor], [0])
 m4_define([thunar_version_micro], [1])
 m4_define([thunar_version_nano], [])
-m4_define([thunar_version_build], [r at REVISION@])
+m4_define([thunar_version_build], [@REVISION@])
 m4_define([thunar_version_tag], [])
-m4_define([thunar_version], [thunar_version_major().thunar_version_minor().thunar_version_micro()ifelse(thunar_version_nano(), [], [], [.thunar_version_nano()])ifelse(thunar_version_tag(), [svn], [thunar_version_tag()-thunar_version_build()], [thunar_version_tag()])])
+m4_define([thunar_version], [thunar_version_major().thunar_version_minor().thunar_version_micro()ifelse(thunar_version_nano(), [], [], [.thunar_version_nano()])ifelse(thunar_version_tag(), [git], [thunar_version_tag()-thunar_version_build()], [thunar_version_tag()])])
 
 dnl *******************************************
-dnl *** Debugging support for SVN snapshots ***
+dnl *** Debugging support for GIT snapshots ***
 dnl *******************************************
-m4_define([thunar_debug_default], [ifelse(thunar_version_tag(), [svn], [yes], [minimum])])
+m4_define([thunar_debug_default], [ifelse(thunar_version_tag(), [git], [yes], [minimum])])
 
 dnl ***************************
 dnl *** Initialize autoconf ***