[armedbear-cvs] r13199 - trunk/abcl

[Mark Evenson]

Author: mevenson
Date: Mon Jan 31 02:25:12 2011
New Revision: 13199

Log:
Fix ad infinitum appending of 'svnversion' results in incremental builds.

The 'version' file is now removed during each invocation of
'abcl.stamp.version' which adds a bit of time to each build, but at
least implement the correct semantics (i.e. always produce an accurate
svnversion result).  An optimization might be to conditionally compare
the contents of 'version' with the results of running a fresh
'svnversion', but to do this with Ant's tiny little insect brain
requires more effort than this mammal deems wise to exert.

Modified:
   trunk/abcl/build.xml

Modified: trunk/abcl/build.xml
==============================================================================
--- trunk/abcl/build.xml	(original)
+++ trunk/abcl/build.xml	Mon Jan 31 02:25:12 2011
@@ -298,8 +298,6 @@
           searchpath="true" />
     </target>
 
-
-
     <target name="abcl.version.src.1" depends="abcl.version.src.0">
       <exec 
           executable="svnversion"
@@ -328,8 +326,12 @@
     <property name="abcl.version.path"
 	      value="${build.classes.dir}/org/armedbear/lisp/version"/>
 
+    <target name="abcl.clean.version">
+      <delete file="${abcl.version.path}"/>
+    </target>
+
     <target name="abcl.stamp.version" 
-            depends="abcl.version.src,abcl.stamp.version.1,abcl.stamp.version.2">
+            depends="abcl.clean.version,abcl.version.src,abcl.stamp.version.1,abcl.stamp.version.2">
       <mkdir dir="${abcl.version.path}/.."/>
       <echo>ABCL implementation version: ${abcl.implementation.version}</echo>
       <echo file="${abcl.version.path}">${abcl.implementation.version}</echo>