[armedbear-cvs] r11386 - trunk/j

[Erik Huelsmann]

Author: ehuelsmann
Date: Sun Nov  9 11:05:24 2008
New Revision: 11386

Log:
Don't warn about Java 1.6.0_10, as it seems to resolve our 1.6 performance issues.

Patch by: mevenson


Modified:
   trunk/j/build.xml

Modified: trunk/j/build.xml
==============================================================================
--- trunk/j/build.xml	(original)
+++ trunk/j/build.xml	Sun Nov  9 11:05:24 2008
@@ -191,12 +191,17 @@
       <exec executable="hostname" os="Linux" outputproperty="hostname"/>
 
       <condition property="abcl.java.version">
-	<matches string="${java.version}" pattern="1\.5"/>
+	<or>
+	  <matches string="${java.version}" pattern="1\.5"/>
+	  <matches string="${java.version}" pattern="1\.6\.0_1[0-9]"/>
+	</or>  
       </condition>
       <echo>java.version: ${java.version}</echo>
     </target>
     
-    <target name="abcl.java.warning" unless="abcl.java.version">
+    <target name="abcl.java.warning" 
+	    depends="abcl.pre-compile"
+	    unless="abcl.java.version">
       <echo>WARNING: Java version ${java.version} not recommended.</echo>
     </target>