Changeset 13317


Ignore:
Timestamp:
06/09/11 15:24:31 (10 years ago)
Author:
Mark Evenson
Message:

Make abcl-contrib.jar part of the default and release targets.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/abcl/build.xml

    r13303 r13317  
    431431   
    432432    <target name="abcl.wrapper"
    433             depends="abcl.jar,abcl.wrapper.unix,abcl.wrapper.windows">
     433            depends="abcl.jar,abcl.contrib,abcl.wrapper.unix,abcl.wrapper.windows">
    434434      <description>
    435435        Creates in-place exectuable shell wrapper in '${abcl.wrapper.file}'
     
    470470    </target>
    471471
    472     <target name="abcl.contrib">
    473       <jar destfile="dist/abcl-contrib.jar"
     472    <property name="abcl-contrib.jar"
     473              value="${dist.dir}/abcl-contrib.jar"/>
     474    <condition property="abcl.contrib.uptodate.p">
     475      <uptodate targetfile="${abcl-contrib.jar}">
     476        <srcfiles dir="contrib">
     477          <include name="**/*.asd"/>
     478          <include name="**/*.lisp"/>
     479        </srcfiles>
     480      </uptodate>
     481    </condition>
     482
     483    <target name="abcl.contrib" unless="abcl.contrib.uptodate.p">
     484      <jar destfile="${abcl-contrib.jar}"
    474485           compress="true"
    475486           basedir="contrib">
     
    480491      </jar>
    481492      <echo>
    482 Packaged contribs in ${dist.dir}/abcl-contrib.jar.
    483 
    484 To use contribs, ensure that 'abcl-contrib.jar' is in the same
    485 directory as 'abcl.jar', then
     493Packaged contribs in ${abcl-contrib.jar}. To use contribs, ensure that
     494this file is in the same directory as 'abcl.jar', and then
    486495
    487496  CL-USER> (require 'abcl-contrib)
    488497
    489 will place all the contribs in the ASDF registry path.
     498will place all the contribs in the ASDF registry.
    490499
    491500To load a contrib, something like
     
    712721    </target>
    713722
    714     <target name="abcl.binary.prepare" depends="abcl.jar,abcl.stamp.version">
     723    <target name="abcl.binary.prepare" depends="abcl.jar,abcl.contrib,abcl.stamp.version">
    715724      <property name="abcl.build.binary.dir"
    716725                value="${build.dir}/abcl-bin-${abcl.version}"/>
     
    721730          <patternset>
    722731            <include name="abcl.jar"/>
     732            <include name="abcl-contrib.jar"/>
    723733          </patternset>
    724734        </fileset>
Note: See TracChangeset for help on using the changeset viewer.