From bb3235a2b6f5521040e96da30a6cf122940cd539 Mon Sep 17 00:00:00 2001
From: Paul Phillips <paulp@improving.org>
Date: Fri, 26 Nov 2010 23:53:37 +0000
Subject: Moved the painful-in-ant git/svn revision getti...

Moved the painful-in-ant git/svn revision getting logic into bash
where it's at least somewhat less painful. Made it more flexible for
easy use in more places since we presently have all kinds of revision
figuring logic variations in other build files (sbaz, installer,
scala-documentation, scala-tool-support, etc.) No review.
---
 build.xml | 25 ++++---------------------
 1 file changed, 4 insertions(+), 21 deletions(-)

(limited to 'build.xml')

diff --git a/build.xml b/build.xml
index e7d4fad6c5..f5b3571994 100644
--- a/build.xml
+++ b/build.xml
@@ -221,27 +221,10 @@ INITIALISATION
     <condition property="os.win">
       <os family="windows"/>
     </condition>
-    <!-- Finding out SVN revision, svn style -->
-    <exec executable="svn" outputproperty="svn.out"
-      failifexecutionfails="false">
-      <arg line=" info ${basedir}"/>
-    </exec>
-    <propertyregex
-      property="svn.number.svn" input="${svn.out}" select="\1"
-      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 osfamily="unix" executable="tools/get-git-svn-rev" outputproperty="svn.number" failifexecutionfails="false" />
-      </then>
-      <else>
-        <property name="svn.number" value="${svn.number.svn}" />
-      </else>
-    </if>
+    
+    <exec osfamily="unix" executable="tools/get-scala-revision" outputproperty="svn.number" failifexecutionfails="false" />
+    <!-- some default in case something went wrong getting the revision -->
+    <property name="svn.number" value="0"/>
 
     <property name="init.avail" value="yes"/>
 
-- 
cgit v1.2.3