Changeset 13988


Ignore:
Timestamp:
06/29/12 18:17:13 (8 years ago)
Author:
Mark Evenson
Message:

build: generalized corrected version of JDK version match.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/abcl/build.xml

    r13987 r13988  
    145145      <condition property="abcl.java.version.p">
    146146        <or>
    147           <matches string="${java.version}" pattern="1\.5"/>
     147          <matches string="${java.version}"
     148                   pattern="1\.5"/>
    148149          <!-- Don't use 1.6.0_09 or earlier. -->
    149           <matches string="${java.version}" pattern="1\.6\.0_[1-9][0-9]"/>
    150           <!-- 1.7.0_04 works much better. FIXME: will break at jdk-1.7.0_99 -->
    151           <matches string="${java.version}" pattern="1\.7\.0_[3-9][0-9]"/>
     150          <matches string="${java.version}"
     151                   pattern="1\.6\.0_[1-9][0-9]"/>
     152          <!-- 1.7.0_04 works much better. -->
     153          <matches string="${java.version}"
     154                   pattern="1\.7\.0_([0-9][3-9])|([1-9][0-9])"/>
    152155        </or> 
    153156      </condition>
Note: See TracChangeset for help on using the changeset viewer.