[armedbear-cvs] r13988 - trunk/abcl

[mevenson at common-lisp.net]

Author: mevenson
Date: Fri Jun 29 11:17:13 2012
New Revision: 13988

Log:
build: generalized corrected version of JDK version match.

Modified:
   trunk/abcl/build.xml

Modified: trunk/abcl/build.xml
==============================================================================
--- trunk/abcl/build.xml	Fri Jun 29 11:14:07 2012	(r13987)
+++ trunk/abcl/build.xml	Fri Jun 29 11:17:13 2012	(r13988)
@@ -144,11 +144,14 @@
       <echo>java.version: ${java.version}</echo>
       <condition property="abcl.java.version.p">
         <or>
-          <matches string="${java.version}" pattern="1\.5"/>
+          <matches string="${java.version}" 
+                   pattern="1\.5"/>
           <!-- Don't use 1.6.0_09 or earlier. -->
-          <matches string="${java.version}" pattern="1\.6\.0_[1-9][0-9]"/>
-          <!-- 1.7.0_04 works much better. FIXME: will break at jdk-1.7.0_99 -->
-          <matches string="${java.version}" pattern="1\.7\.0_[3-9][0-9]"/>
+          <matches string="${java.version}" 
+                   pattern="1\.6\.0_[1-9][0-9]"/>
+          <!-- 1.7.0_04 works much better. -->
+          <matches string="${java.version}" 
+                   pattern="1\.7\.0_([0-9][3-9])|([1-9][0-9])"/>
         </or>  
       </condition>