Ignore:
Timestamp:
2023-07-27T14:42:51+02:00 (16 months ago)
Author:
stoecker
Message:

proper java 20 detection (first 2 regexp could be shortened, but this is easier to understand)

File:
1 edited

Legend:

Unmodified
Added
Removed

  • applications/editors/josm/plugins/build-common.xml

    r36033 r36105  
    5656    <condition property="isMac"><os family="Mac"/></condition>
    5757    <!-- For Java specific stuff by version -->
    58     <condition property="isJava9"><matches string="${ant.java.version}" pattern="(1.)?(9|1[0-9])" /></condition>
    59     <condition property="isJava10"><matches string="${ant.java.version}" pattern="1[0-9]" /></condition>
    60     <condition property="isJava11"><matches string="${ant.java.version}" pattern="1[1-9]" /></condition>
    61     <condition property="isJava12"><matches string="${ant.java.version}" pattern="1[2-9]" /></condition>
    62     <condition property="isJava13"><matches string="${ant.java.version}" pattern="1[3-9]" /></condition>
    63     <condition property="isJava14"><matches string="${ant.java.version}" pattern="1[4-9]" /></condition>
    64     <condition property="isJava15"><matches string="${ant.java.version}" pattern="1[5-9]" /></condition>
    65     <condition property="isJava16"><matches string="${ant.java.version}" pattern="1[6-9]" /></condition>
     58    <condition property="isJava9"><matches string="${ant.java.version}" pattern="(1.)?(9|1[0-9]|2[0-9])" /></condition>
     59    <condition property="isJava10"><matches string="${ant.java.version}" pattern="1[0-9]|2[0-9]" /></condition>
     60    <condition property="isJava11"><matches string="${ant.java.version}" pattern="1[1-9]|2[0-9]" /></condition>
     61    <condition property="isJava12"><matches string="${ant.java.version}" pattern="1[2-9]|2[0-9]" /></condition>
     62    <condition property="isJava13"><matches string="${ant.java.version}" pattern="1[3-9]|2[0-9]" /></condition>
     63    <condition property="isJava14"><matches string="${ant.java.version}" pattern="1[4-9]|2[0-9]" /></condition>
     64    <condition property="isJava15"><matches string="${ant.java.version}" pattern="1[5-9]|2[0-9]" /></condition>
     65    <condition property="isJava16"><matches string="${ant.java.version}" pattern="1[6-9]|2[0-9]" /></condition>
    6666    <condition property="isJava20"><matches string="${ant.java.version}" pattern="2[0-9]" /></condition>
    6767    <!-- Disable jacoco on Java 20+ (Jacoco does not yet support Java 20+) -->
Note: See TracChangeset for help on using the changeset viewer.