Changeset 11451


Ignore:
Timestamp:
12/15/08 22:11:00 (12 years ago)
Author:
astalla
Message:

Compatibility with Java 5: using the ANT-based build, the JSR-223 support is excluded from the build. Also removed a @Override annotation that prevented compiling ABCL with Java 5.

Location:
branches/scripting/j
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/scripting/j/build.xml

    r11362 r11451  
    2121        value="${dist.dir}/j.jar"/>
    2222
     23    <condition property="abcl.java.version15">
     24    <matches string="${java.version}" pattern="1\.5"/>
     25    </condition>
     26 
    2327    <target name="help">
    2428      <echo>Main Ant targets:
     
    101105    <patternset id="abcl.source.java">
    102106      <include name="org/armedbear/lisp/*.java"/>
    103       <include name="org/armedbear/lisp/scripting/*.java"/>
    104       <include name="org/armedbear/lisp/scripting/util/*.java"/>
     107      <include name="org/armedbear/lisp/scripting/*.java" unless="abcl.java.version15"/>
     108      <include name="org/armedbear/lisp/scripting/util/*.java" unless="abcl.java.version15"/>
    105109      <include name="org/armedbear/Main.java"/>
    106110    </patternset>
     
    111115      <include name="org/armedbear/lisp/java/awt/*.lisp"/>
    112116      <include name="org/armedbear/lisp/java/awt/*.java"/>
    113       <include name="org/armedbear/lisp/scripting/lisp/*.lisp"/>
     117      <include name="org/armedbear/lisp/scripting/lisp/*.lisp" unless="abcl.java.version15"/>
    114118    </patternset>
    115119
     
    119123      <include name="org/armedbear/lisp/top-level.lisp"/>
    120124      <include name="org/armedbear/lisp/*.lisp"/>
    121     <include name="org/armedbear/lisp/scripting/lisp/*.lisp"/>
     125    <include name="org/armedbear/lisp/scripting/lisp/*.lisp" unless="abcl.java.version15"/>
    122126    </patternset>
    123127
     
    126130      <include name="org/armedbear/lisp/*.cls"/>
    127131      <include name="org/armedbear/lisp/*.abcl"/>
    128       <include name="org/armedbear/lisp/scripting/*.class"/>
    129       <include name="org/armedbear/lisp/scripting/util/*.class"/>
     132      <include name="org/armedbear/lisp/scripting/*.class" unless="abcl.java.version15"/>
     133      <include name="org/armedbear/lisp/scripting/util/*.class" unless="abcl.java.version15"/>
    130134      <patternset refid="abcl.source.lisp.dist"/>
    131135    </patternset>
     
    199203      <exec executable="hostname" os="Linux" outputproperty="hostname"/>
    200204
    201       <condition property="abcl.java.version">
    202   <matches string="${java.version}" pattern="1\.5"/>
    203       </condition>
    204205      <echo>java.version: ${java.version}</echo>
    205206    </target>
    206207   
    207     <target name="abcl.java.warning" unless="abcl.java.version">
     208    <target name="abcl.java.warning" unless="abcl.java.version15">
    208209      <echo>WARNING: Java version ${java.version} not recommended.</echo>
    209210    </target>
  • branches/scripting/j/src/org/armedbear/lisp/JProxy.java

    r11450 r11451  
    151151      }
    152152     
    153     @Override
    154153    public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
    155154        if(hashCodeMethod.equals(method)) {
Note: See TracChangeset for help on using the changeset viewer.