From 6dcfae7e8ddde4da972cd0dc077e95eec00d41ed Mon Sep 17 00:00:00 2001
From: Paul Phillips <paulp@improving.org>
Date: Wed, 20 Jan 2010 04:38:32 +0000
Subject: Took a slightly different tack on parsing the s...

Took a slightly different tack on parsing the svn version. No review.
---
 build.xml | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

(limited to 'build.xml')

diff --git a/build.xml b/build.xml
index c19f217cae..3ac90b57b5 100644
--- a/build.xml
+++ b/build.xml
@@ -213,7 +213,7 @@ INITIALISATION
     <condition property="os.win">
       <os family="windows"/>
     </condition>
-  <!-- Finding out SVN revision, svn style -->
+    <!-- Finding out SVN revision, svn style -->
     <exec executable="svn" outputproperty="svn.out"
       failifexecutionfails="false">
       <arg line=" info ${basedir}"/>
@@ -223,18 +223,22 @@ INITIALISATION
       regexp="Revision: ([0-9]+)"
       defaultValue="0"/>
 
+    <!-- Both clauses of the conditional set svn.number -->
     <if>
 	  <equals arg1="${svn.number.svn}" arg2="0" />
 	  <then>
         <!-- Finding SVN revision, git style -->
 	    <exec executable="bin/git-get-rev" outputproperty="svn.number.git" failifexecutionfails="false" />
-	    <condition property="svn.number" value="${svn.number.git}" >
-		  <isset property="svn.number.git" />
-	    </condition>
+	    <propertyregex
+	      property="svn.number" input="${svn.number.git}" select="\1"
+	      regexp="\D*?(\d+)"
+	      defaultValue="0"/>
 	  </then>
+	  <else>
+		<property name="svn.number" value="${svn.number.svn}" />
+	  </else>
     </if>
-	<!-- if svn failed and git succeeded, this will be ignored. -->
-	<property name="svn.number" value="${svn.number.svn}" />
+
     <property name="init.avail" value="yes"/>
 
   <!-- Generating version number -->
-- 
cgit v1.2.3