Changeset 13279


Ignore:
Timestamp:
05/20/11 12:48:16 (10 years ago)
Author:
Mark Evenson
Message:

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

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/abcl/build.xml

    r13212 r13279  
    331331    </target>
    332332
     333    <target name="abcl.stamp.version.uptodate">
     334      <uptodate property="abcl.stamp.version.uptodate.p"
     335                targetfile="${abcl.version.path}"
     336                srcfile="${build.classes.dir}/org/armedbear/lisp/Version.class"/>
     337    </target>
     338
    333339    <target name="abcl.stamp.version"
    334             depends="abcl.clean.version,abcl.version.src,abcl.stamp.version.1,abcl.stamp.version.2">
     340            depends="abcl.version.src,abcl.stamp.version.1,abcl.stamp.version.2"
     341            unless="abcl.stamp.version.uptodate.p">
    335342      <mkdir dir="${abcl.version.path}/.."/>
    336343      <echo>ABCL implementation version: ${abcl.implementation.version}</echo>
     
    338345    </target>
    339346   
    340     <target name="abcl.stamp.version.0"
    341             depends="abcl.compile.java">
     347    <target name="abcl.stamp.version.generate"
     348            depends="abcl.compile.java"
     349            unless="abcl.stamp.version.uptodate.p">
    342350      <java fork="true"
    343351      classpath="${build.classes.dir}"
     
    346354            logerror="yes"/> <!-- Don't catch stderr output -->
    347355    </target>
     356
     357    <target name="abcl.stamp.version.0"
     358            depends="abcl.stamp.version.uptodate,abcl.stamp.version.generate"/>
    348359
    349360    <target name="abcl.stamp.version.1"
     
    383394    </target>
    384395
    385     <target name="abcl.jar.uptodate" depends="abcl.compile">
     396    <target name="abcl.jar.uptodate" depends="abcl.compile,abcl.stamp">
    386397      <uptodate property="abcl.jar.uptodate.p" targetfile="${abcl.jar.path}">
    387398        <srcfiles dir="${build.classes.dir}">
     
    391402    </target>
    392403
    393     <target name="abcl.jar" depends="abcl.stamp,abcl.jar.uptodate"
     404    <target name="abcl.jar" depends="abcl.jar.uptodate"
    394405      unless="abcl.jar.uptodate.p">
    395406      <mkdir dir="${dist.dir}"/>
    396407      <loadfile property="abcl.version"
    397       srcFile="${abcl.version.path}"/>
     408                srcFile="${abcl.version.path}"/>
    398409      <jar destfile="${abcl.jar.path}"
    399410     compress="true"
Note: See TracChangeset for help on using the changeset viewer.