[Xfce4-commits] <libxfcegui4:xfce-4.6> new git revision substitution; add 'git' revision tag

[Brian J. Tarricone]

Updating branch refs/heads/xfce-4.6
         to 644325fb171d63c0ec778c33d0421a6930ce056d (commit)
       from 566ec31d14b78f0d13e21b7beed70ac27e4c5a90 (commit)

commit 644325fb171d63c0ec778c33d0421a6930ce056d
Author: Brian J. Tarricone <brian at tarricone.org>
Date:   Mon Aug 17 12:36:38 2009 -0700

    new git revision substitution; add 'git' revision tag

 autogen.sh      |   12 ++++--------
 configure.in.in |    4 ++--
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/autogen.sh b/autogen.sh
index 3dd5cd2..a2febe3 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -29,14 +29,10 @@ EOF
 
 # substitute revision and linguas
 linguas=`sed -e '/^#/d' po/LINGUAS`
-if [ -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 [ -d .svn ]; then
-  revision=$(LC_ALL=C svn info $0 | awk '/^Revision: /{ printf "%05d\n", $2; }')
-else
+if [ -d .git ]; then
+  revision=$(git rev-parse --short HEAD)
+fi
+if [ -z "$revision" ]; then
   revision=UNKNOWN
 fi
 
diff --git a/configure.in.in b/configure.in.in
index d947bd0..1a75c5c 100644
--- a/configure.in.in
+++ b/configure.in.in
@@ -14,8 +14,8 @@ m4_define([libxfcegui4_version_minor], [6])
 m4_define([libxfcegui4_version_micro], [1])
 m4_define([libxfcegui4_version_nano], [])   dnl leave this empty to have no nano version
 m4_define([libxfcegui4_version_build], [r at REVISION@])
-m4_define([libxfcegui4_version_tag], [])
-m4_define([libxfcegui4_version], [libxfcegui4_version_major().libxfcegui4_version_minor().libxfcegui4_version_micro()ifelse(libxfcegui4_version_nano(), [], [], [.libxfcegui4_version_nano()])ifelse(libxfcegui4_version_tag(), [svn], [libxfcegui4_version_tag()-libxfcegui4_version_build()], [libxfcegui4_version_tag()])])
+m4_define([libxfcegui4_version_tag], [git])
+m4_define([libxfcegui4_version], [libxfcegui4_version_major().libxfcegui4_version_minor().libxfcegui4_version_micro()ifelse(libxfcegui4_version_nano(), [], [], [.libxfcegui4_version_nano()])ifelse(libxfcegui4_version_tag(), [git], [libxfcegui4_version_tag()-libxfcegui4_version_build()], [libxfcegui4_version_tag()])])
 
 
 dnl # DO NOT MODIFY ANYTHING BELOW THIS LINE, UNLESS YOU KNOW WHAT