[armedbear-cvs] r13479 - branches/0.26.x/abcl

[mevenson at common-lisp.net]

Author: mevenson
Date: Fri Aug 12 22:36:29 2011
New Revision: 13479

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

Modified:
   branches/0.26.x/abcl/build.xml

Modified: branches/0.26.x/abcl/build.xml
==============================================================================
--- branches/0.26.x/abcl/build.xml	Fri Aug 12 22:35:07 2011	(r13478)
+++ branches/0.26.x/abcl/build.xml	Fri Aug 12 22:36:29 2011	(r13479)
@@ -296,7 +296,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>
@@ -304,7 +304,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>
@@ -312,6 +312,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}"/>