Updating branch refs/heads/master
to a547938cabfc7066dc9a9381653f7404785e75d4 (commit)
from 5450fe4aee7738ccda97085a67277edd2ae1d9e2 (commit)
commit a547938cabfc7066dc9a9381653f7404785e75d4
Author: Brian J. Tarricone <[email protected]>
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], [...@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
_______________________________________________
Xfce4-commits mailing list
[email protected]
http://foo-projects.org/mailman/listinfo/xfce4-commits
