Changeset 13479

Timestamp:

08/13/11 05:36:29 (12 years ago)

Author:

Mark Evenson

Message:

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

File:

• branches/0.26.x/abcl/build.xml (modified) (3 diffs)

branches/0.26.x/abcl/build.xml

@@ -297 +297 @@
       <exec
           executable="svnversion.exe"
-          outputproperty="abcl.version.svn"
+          outputproperty="abcl.version.svn.raw"
           failifexecutionfails="false"
           searchpath="true" />
@@ -305 +305 @@
       <exec 
           executable="svnversion"
-          outputproperty="abcl.version.svn"
+          outputproperty="abcl.version.svn.raw"
           failifexecutionfails="false"
           searchpath="true" />
@@ -313 +313 @@
             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"