Changeset 13279

Timestamp:

05/20/11 12:48:16 (12 years ago)

Author:

Mark Evenson

Message:

Fix part of uptodate check for abcl.jar based on Version.java.

File:

• trunk/abcl/build.xml (modified) (5 diffs)

trunk/abcl/build.xml

@@ -331 +331 @@
     </target>
 
+    <target name="abcl.stamp.version.uptodate">
+      <uptodate property="abcl.stamp.version.uptodate.p" 
+                targetfile="${abcl.version.path}"
+                srcfile="${build.classes.dir}/org/armedbear/lisp/Version.class"/>
+    </target>
+
     <target name="abcl.stamp.version" 
-            depends="abcl.clean.version,abcl.version.src,abcl.stamp.version.1,abcl.stamp.version.2">
+            depends="abcl.version.src,abcl.stamp.version.1,abcl.stamp.version.2"
+            unless="abcl.stamp.version.uptodate.p">
       <mkdir dir="${abcl.version.path}/.."/>
       <echo>ABCL implementation version: ${abcl.implementation.version}</echo>
@@ -338 +345 @@
     </target>
     
-    <target name="abcl.stamp.version.0" 
-            depends="abcl.compile.java">
+    <target name="abcl.stamp.version.generate" 
+            depends="abcl.compile.java"
+            unless="abcl.stamp.version.uptodate.p">
       <java fork="true"
       classpath="${build.classes.dir}"
@@ -346 +354 @@
             logerror="yes"/> <!-- Don't catch stderr output -->
     </target>
+
+    <target name="abcl.stamp.version.0" 
+            depends="abcl.stamp.version.uptodate,abcl.stamp.version.generate"/>
 
     <target name="abcl.stamp.version.1"
@@ -383 +394 @@
     </target>
 
-    <target name="abcl.jar.uptodate" depends="abcl.compile">
+    <target name="abcl.jar.uptodate" depends="abcl.compile,abcl.stamp">
       <uptodate property="abcl.jar.uptodate.p" targetfile="${abcl.jar.path}">
         <srcfiles dir="${build.classes.dir}">
@@ -391 +402 @@
     </target>
 
-    <target name="abcl.jar" depends="abcl.stamp,abcl.jar.uptodate"
+    <target name="abcl.jar" depends="abcl.jar.uptodate"
       unless="abcl.jar.uptodate.p">
       <mkdir dir="${dist.dir}"/>
       <loadfile property="abcl.version"
-      srcFile="${abcl.version.path}"/>
+                srcFile="${abcl.version.path}"/>
       <jar destfile="${abcl.jar.path}"
      compress="true"