Changeset 11451

Timestamp:

12/15/08 22:11:00 (13 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:

• build.xml (modified) (6 diffs)
• src/org/armedbear/lisp/JProxy.java (modified) (1 diff)

branches/scripting/j/build.xml

@@ -21 +21 @@
         value="${dist.dir}/j.jar"/>
 
+    <condition property="abcl.java.version15">
+    <matches string="${java.version}" pattern="1\.5"/>
+    </condition>
+  
     <target name="help">
       <echo>Main Ant targets:
@@ -101 +105 @@
     <patternset id="abcl.source.java">
       <include name="org/armedbear/lisp/*.java"/>
-      <include name="org/armedbear/lisp/scripting/*.java"/>
-      <include name="org/armedbear/lisp/scripting/util/*.java"/>
+      <include name="org/armedbear/lisp/scripting/*.java" unless="abcl.java.version15"/>
+      <include name="org/armedbear/lisp/scripting/util/*.java" unless="abcl.java.version15"/>
       <include name="org/armedbear/Main.java"/>
     </patternset>
@@ -111 +115 @@
       <include name="org/armedbear/lisp/java/awt/*.lisp"/>
       <include name="org/armedbear/lisp/java/awt/*.java"/>
-      <include name="org/armedbear/lisp/scripting/lisp/*.lisp"/>
+      <include name="org/armedbear/lisp/scripting/lisp/*.lisp" unless="abcl.java.version15"/>
     </patternset>
 
@@ -119 +123 @@
       <include name="org/armedbear/lisp/top-level.lisp"/>
       <include name="org/armedbear/lisp/*.lisp"/> 
-    <include name="org/armedbear/lisp/scripting/lisp/*.lisp"/>
+    <include name="org/armedbear/lisp/scripting/lisp/*.lisp" unless="abcl.java.version15"/>
     </patternset>
 
@@ -126 +130 @@
       <include name="org/armedbear/lisp/*.cls"/> 
       <include name="org/armedbear/lisp/*.abcl"/>
-      <include name="org/armedbear/lisp/scripting/*.class"/>
-      <include name="org/armedbear/lisp/scripting/util/*.class"/>
+      <include name="org/armedbear/lisp/scripting/*.class" unless="abcl.java.version15"/>
+      <include name="org/armedbear/lisp/scripting/util/*.class" unless="abcl.java.version15"/>
       <patternset refid="abcl.source.lisp.dist"/>
     </patternset>
@@ -199 +203 @@
       <exec executable="hostname" os="Linux" outputproperty="hostname"/>
 
-      <condition property="abcl.java.version">
-  <matches string="${java.version}" pattern="1\.5"/>
-      </condition>
       <echo>java.version: ${java.version}</echo>
     </target>
     
-    <target name="abcl.java.warning" unless="abcl.java.version">
+    <target name="abcl.java.warning" unless="abcl.java.version15">
       <echo>WARNING: Java version ${java.version} not recommended.</echo>
     </target>

branches/scripting/j/src/org/armedbear/lisp/JProxy.java

@@ -151 +151 @@
       }
       
-    @Override
     public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
         if(hashCodeMethod.equals(method)) {