[Xfce4-commits] <xfce4-panel:devel> * Add git revision support.

[Nick Schermer]

Updating branch refs/heads/devel
         to 04ff29f35acb1a3c71c20b73202ab19bf3d839d7 (commit)
       from a72af8586ae2a8718f03e37059d1e2ec2261fb92 (commit)

commit 04ff29f35acb1a3c71c20b73202ab19bf3d839d7
Author: Nick Schermer <nick at xfce.org>
Date:   Mon Dec 29 15:42:27 2008 +0100

    * Add git revision support.

 autogen.sh      |    2 ++
 configure.in.in |    6 +++---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/autogen.sh b/autogen.sh
index 22ae172..a0957c2 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -31,6 +31,8 @@ EOF
 linguas=`sed -e '/^#/d' po/LINGUAS`
 if test -d .git/svn; then
  revision=`LC_ALL=C git-svn find-rev HEAD`
+elif test -d .git; then
+ revision=`LC_ALL=C git rev-parse --short HEAD`
 else
  revision=`LC_ALL=C svn info $0 | awk '/^Revision: / {printf "%05d\n",
 $2}'`
diff --git a/configure.in.in b/configure.in.in
index 568703f..7253310 100644
--- a/configure.in.in
+++ b/configure.in.in
@@ -14,9 +14,9 @@ m4_define([xfce4_panel_version_major], [4])
 m4_define([xfce4_panel_version_minor], [7])
 m4_define([xfce4_panel_version_micro], [0])
 m4_define([xfce4_panel_version_nano],  []) dnl leave this empty to have no nano version
-m4_define([xfce4_panel_version_build], [r at REVISION@])
-m4_define([xfce4_panel_version_tag],   [svn])
-m4_define([xfce4_panel_version], [xfce4_panel_version_major().xfce4_panel_version_minor().xfce4_panel_version_micro()ifelse(xfce4_panel_version_nano(), [], [], [.xfce4_panel_version_nano()])ifelse(xfce4_panel_version_tag(), [svn], [xfce4_panel_version_tag()-xfce4_panel_version_build()], [xfce4_panel_version_tag()])])
+m4_define([xfce4_panel_version_build], [@REVISION@])
+m4_define([xfce4_panel_version_tag],   [git])
+m4_define([xfce4_panel_version], [xfce4_panel_version_major().xfce4_panel_version_minor().xfce4_panel_version_micro()ifelse(xfce4_panel_version_nano(), [], [], [.xfce4_panel_version_nano()])ifelse(xfce4_panel_version_tag(), [git], [xfce4_panel_version_tag()-xfce4_panel_version_build()], [xfce4_panel_version_tag()])])
 
 dnl *******************************************
 dnl *** Debugging support for SVN snapshots ***