From bf194a19e2994cbf813e2808fac3e23d05698436 Mon Sep 17 00:00:00 2001
From: lizzardo <lizzardo@romraider.forum>
Date: Tue, 30 Dec 2008 06:13:34 +0000
Subject: [PATCH] Use SVN revision as buildnumber if available, default to zero
 if that fails.  Zero isn't really a valid build number, but this allows a
 full build if working offline.

git-svn-id: https://svn2.assembla.com/svn/romraider/trunk@202 38686702-15cf-42e4-a595-3071df8bf5ea
---
 build.xml          | 14 ++++++++++----
 version.properties |  2 +-
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/build.xml b/build.xml
index 9f9b0799..157bf3b5 100644
--- a/build.xml
+++ b/build.xml
@@ -77,11 +77,17 @@
         <property name="optimize" value="on"/>
         <property name="deprecation" value="on"/>
 
-        <!-- get the current svn revision (needed by version.properties) -->
+        <!-- get the current svn revision (needed by version.properties) - if repository is unavailable, this will be zero -->
         <macro_svn_revision repository="https://svn2.assembla.com/svn/romraider" property="svn.revision"/>
 
-        <!-- version properties are set in this file, both for the product itself and
-		    for some of the external dependencies (jar files and such) -->
+        <!-- Set the buildnumber to be the revision fetched from the repository, but default to zero for 
+                offline work -->
+    	<condition property="buildnumber" value="${svn.revision}" else="0">
+    		<isset property="svn.revision"/>
+    	</condition>
+
+    	<!-- version properties are set in this file, both for the product itself and
+		        for some of the external dependencies (jar files and such) -->
         <property file="version.properties"/>
 
         <!-- basic project properties -->
@@ -240,7 +246,7 @@
         <attribute name="property"/>
         <sequential>
             <tempfile property="svninfo.log"/>
-            <exec executable="svn" output="${svninfo.log}">
+            <exec executable="svn" output="${svninfo.log}" failonerror="false">
                 <arg line="info @{repository}"/>
             </exec>
             <loadfile property="@{property}" srcFile="${svninfo.log}">
diff --git a/version.properties b/version.properties
index 5e38edff..a806467d 100644
--- a/version.properties
+++ b/version.properties
@@ -20,7 +20,7 @@ release_notes=release_notes.txt
 version.major=0
 version.minor=5
 version.patch=1
-version.buildnumber=${svn.revision}
+version.buildnumber=${buildnumber}
 version.extra=Beta
 version.extra1=