[armedbear-cvs] r13439 - trunk/abcl

[mevenson at common-lisp.net]

Author: mevenson
Date: Fri Aug  5 06:05:58 2011
New Revision: 13439

Log:
Fix #131: Don't include ':' in the version string.

Modified:
   trunk/abcl/build.xml

Modified: trunk/abcl/build.xml
==============================================================================
--- trunk/abcl/build.xml	Fri Aug  5 02:30:50 2011	(r13438)
+++ trunk/abcl/build.xml	Fri Aug  5 06:05:58 2011	(r13439)
@@ -297,7 +297,7 @@
     <target name="abcl.version.src.0" if="windows">
       <exec
           executable="svnversion.exe"
-          outputproperty="abcl.version.svn"
+          outputproperty="abcl.version.svn.raw"
           failifexecutionfails="false"
           searchpath="true" />
     </target>
@@ -305,7 +305,7 @@
     <target name="abcl.version.src.1" depends="abcl.version.src.0">
       <exec 
           executable="svnversion"
-          outputproperty="abcl.version.svn"
+          outputproperty="abcl.version.svn.raw"
           failifexecutionfails="false"
           searchpath="true" />
     </target>
@@ -313,6 +313,16 @@
     <target name="abcl.version.src.2" 
             depends="abcl.version.src.1"
             if="abcl.version.svn.p">
+
+      <!-- Transform all occurances of ":" ==> "-" in the version string -->
+      <tempfile property="version-tmp.path"/>
+      <echo message="${abcl.version.svn.raw}"
+            file="${version-tmp.path}"/>
+      <replace file="${version-tmp.path}"
+               token=":" value="-"/>
+      <loadfile property="abcl.version.svn" srcFile="${version-tmp.path}"/>
+      <delete file="${version-tmp.path}"/>
+
       <echo>abcl.version.svn: ${abcl.version.svn}</echo>
       <property name="abcl.version.src"
                 value="svn-${abcl.version.svn}"/>