aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Veillard <veillard@src.gnome.org>2007-01-03 15:07:44 +0000
committerDaniel Veillard <veillard@src.gnome.org>2007-01-03 15:07:44 +0000
commit9cb1b64ddefdd832bee2fd49a7745c3d3f342318 (patch)
tree7a6ef8ac612e626ee4ec5e899230b3f5be6927f5
parent3b6acc93bf03bae282c71d4f63a9639b1bb7dc38 (diff)
downloadandroid_external_libxml2-9cb1b64ddefdd832bee2fd49a7745c3d3f342318.tar.gz
android_external_libxml2-9cb1b64ddefdd832bee2fd49a7745c3d3f342318.tar.bz2
android_external_libxml2-9cb1b64ddefdd832bee2fd49a7745c3d3f342318.zip
adapt the extra versioning code to SVN Daniel
* configure.in: adapt the extra versioning code to SVN Daniel svn path=/trunk/; revision=3570
-rw-r--r--ChangeLog4
-rw-r--r--configure.in10
2 files changed, 13 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index cc12ea00..e09172c6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Wed Jan 3 16:14:13 CET 2007 Daniel Veillard <daniel@veillard.com>
+
+ * configure.in: adapt the extra versioning code to SVN
+
Thu Dec 14 16:52:34 CET 2006 Daniel Veillard <daniel@veillard.com>
* python/generator.py python/libxml.py: apparently id() sometimes
diff --git a/configure.in b/configure.in
index b2174c61..f4e696f6 100644
--- a/configure.in
+++ b/configure.in
@@ -12,13 +12,21 @@ LIBXML_VERSION_INFO=`expr $LIBXML_MAJOR_VERSION + $LIBXML_MINOR_VERSION`:$LIBXML
LIBXML_VERSION_NUMBER=`expr $LIBXML_MAJOR_VERSION \* 10000 + $LIBXML_MINOR_VERSION \* 100 + $LIBXML_MICRO_VERSION`
-if test -f CVS/Entries; then
+if test -f CVS/Entries ; then
extra=`grep ChangeLog CVS/Entries | grep -v LIBXML | sed -e s\%/ChangeLog/1\.%% -e s\%/.*$%%`
echo extra=$extra
if test "$extra" != ""
then
LIBXML_VERSION_EXTRA="-CVS$extra"
fi
+else if test -d .svn ; then
+ extra=`svn info | grep Revision | sed 's+Revision: ++'`
+ echo extra=$extra
+ if test "$extra" != ""
+ then
+ LIBXML_VERSION_EXTRA="-SVN$extra"
+ fi
+fi
fi
AC_SUBST(LIBXML_MAJOR_VERSION)
AC_SUBST(LIBXML_MINOR_VERSION)