Changeset 11590 for trunk/abcl/build.xml


Ignore:
Timestamp:
01/25/09 23:34:24 (12 years ago)
Author:
astalla
Message:

Merged the scripting branch, providing JSR-223 support and other new
features. JSR-233 is only built if the necessary javax.script.* classes
are found in the CLASSPATH.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/abcl/build.xml

    r11570 r11590  
    2020    <property name="abcl.ext.dir"
    2121        value="${basedir}/ext"/>
    22 
     22 
    2323    <target name="help">
    2424      <echo>Main Ant targets:
     
    3838    </target>
    3939
     40    <!-- Checks if JSR-223 support is available - thanks to Mark Everson -->
     41    <available property="abcl.jsr-223.p"
     42         classname="javax.script.ScriptEngine"/>
     43
    4044    <patternset id="abcl.source.java">
    4145      <include name="org/armedbear/lisp/*.java"/>
    4246      <include name="org/armedbear/lisp/util/*.java"/>
     47      <include name="org/armedbear/lisp/scripting/*.java" if="abcl.jsr-223.p"/>
     48      <include name="org/armedbear/lisp/scripting/util/*.java" if="abcl.jsr-223.p"/>
     49      <include name="org/armedbear/Main.java"/>
    4350    </patternset>
    4451
     
    4754      <include name="org/armedbear/lisp/tests/*.lisp"/>
    4855      <exclude name="org/armedbear/lisp/j.lisp"/>
     56      <include name="org/armedbear/lisp/scripting/lisp/*.lisp" if="abcl.jsr-223.p"/>
    4957    </patternset>
    5058
     
    6169    <patternset id="abcl.source.lisp.dist">
    6270      <include name="org/armedbear/lisp/boot.lisp"/>
     71    <include name="org/armedbear/lisp/scripting/lisp/*.lisp" if="abcl.jsr-223.p"/>
    6372    </patternset>
    6473
     
    6877      <include name="org/armedbear/lisp/*.cls"/>
    6978      <include name="org/armedbear/lisp/*.abcl"/>
     79      <include name="org/armedbear/lisp/scripting/*.class" if="abcl.jsr-223.p"/>
     80      <include name="org/armedbear/lisp/scripting/util/*.class" if="abcl.jsr-223.p"/>
    7081      <patternset refid="abcl.source.lisp.dist"/>
    7182    </patternset>
     
    128139    </target>
    129140 
     141    <target name="abcl.jsr-223.notice"
     142      depends="abcl.init"
     143      unless="abcl.jsr-223.p">
     144      <echo>Notice: JSR-223 support won't be built since it is not supported, neither natively by your JVM nor by libraries in the CLASSPATH.</echo>
     145    </target>
     146
    130147    <target name="abcl.compile.java"
    131       depends="abcl.init,abcl.java.warning">
     148      depends="abcl.init,abcl.java.warning,abcl.jsr-223.notice">
    132149      <mkdir dir="${build.dir}"/>
    133150      <mkdir dir="${build.classes.dir}"/>
     
    237254    </section>
    238255  </manifest>
     256        <metainf dir="${src.dir}/META-INF">
     257        </metainf>
    239258      </jar>
    240259    </target>
Note: See TracChangeset for help on using the changeset viewer.