Changeset 11451
- Timestamp:
- 12/15/08 22:11:00 (12 years ago)
- Location:
- branches/scripting/j
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/scripting/j/build.xml
r11362 r11451 21 21 value="${dist.dir}/j.jar"/> 22 22 23 <condition property="abcl.java.version15"> 24 <matches string="${java.version}" pattern="1\.5"/> 25 </condition> 26 23 27 <target name="help"> 24 28 <echo>Main Ant targets: … … 101 105 <patternset id="abcl.source.java"> 102 106 <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"/> 105 109 <include name="org/armedbear/Main.java"/> 106 110 </patternset> … … 111 115 <include name="org/armedbear/lisp/java/awt/*.lisp"/> 112 116 <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"/> 114 118 </patternset> 115 119 … … 119 123 <include name="org/armedbear/lisp/top-level.lisp"/> 120 124 <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"/> 122 126 </patternset> 123 127 … … 126 130 <include name="org/armedbear/lisp/*.cls"/> 127 131 <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"/> 130 134 <patternset refid="abcl.source.lisp.dist"/> 131 135 </patternset> … … 199 203 <exec executable="hostname" os="Linux" outputproperty="hostname"/> 200 204 201 <condition property="abcl.java.version">202 <matches string="${java.version}" pattern="1\.5"/>203 </condition>204 205 <echo>java.version: ${java.version}</echo> 205 206 </target> 206 207 207 <target name="abcl.java.warning" unless="abcl.java.version ">208 <target name="abcl.java.warning" unless="abcl.java.version15"> 208 209 <echo>WARNING: Java version ${java.version} not recommended.</echo> 209 210 </target> -
branches/scripting/j/src/org/armedbear/lisp/JProxy.java
r11450 r11451 151 151 } 152 152 153 @Override154 153 public Object invoke(Object proxy, Method method, Object[] args) throws Throwable { 155 154 if(hashCodeMethod.equals(method)) {
Note: See TracChangeset
for help on using the changeset viewer.