Changeset 15378


Ignore:
Timestamp:
09/19/20 14:02:17 (2 years ago)
Author:
Mark Evenson
Message:

Patches and CI changes for running on openjdk15

Use openjdk15 as latest version instead of openjdk14 under Travis CI.

Allow for java.version that reports an integer without a patchlevel
which is needed for running openjdk15.

Location:
trunk/abcl
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • trunk/abcl/.travis.yml

    r15324 r15378  
    3434  - ABCL_JDK=openjdk8  ABCL_ROOT=${TRAVIS_BUILD_DIR}
    3535  - ABCL_JDK=openjdk11 ABCL_ROOT=${TRAVIS_BUILD_DIR}
    36   - ABCL_JDK=openjdk14 ABCL_ROOT=${TRAVIS_BUILD_DIR}
     36  - ABCL_JDK=openjdk15 ABCL_ROOT=${TRAVIS_BUILD_DIR}
    3737
    3838install:
  • trunk/abcl/build.xml

    r15360 r15378  
    12711271      </exec>
    12721272    </target>
    1273  
     1273
     1274    <target name="abcl.properties.autoconfigure.openjdk.15">
     1275      <exec executable="/usr/bin/env">
     1276        <arg value="bash"/>
     1277        <arg value="ci/create-abcl-properties.bash"/>
     1278        <arg value="openjdk15"/>
     1279      </exec>
     1280    </target>
     1281
    12741282    <import file="etc/ant/netbeans-build.xml"
    12751283            optional="true"/>
  • trunk/abcl/ci/create-abcl-properties.bash

    r15281 r15378  
    5353  abcl_javac_source=1.8
    5454        ;;
     55    15|openjdk15)
     56        options="-XX:CompileThreshold=10 ${zgc}"
     57  abcl_javac_target=15
     58  abcl_javac_source=1.8
     59        ;;
    5560esac
    5661
  • trunk/abcl/ci/install-adoptjdk.bash

    r15355 r15378  
    2929                    dist="https://github.com/AdoptOpenJDK/openjdk14-binaries/releases/download/jdk-14.0.2%2B12/OpenJDK14U-jdk_x64_mac_hotspot_14.0.2_12.tar.gz"
    3030                    ;;
    31             esac
     31                openjdk15)
     32                    topdir=jdk-15+36
     33                    dist="https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15%2B36/OpenJDK15U-jdk_x64_mac_hotspot_15_36.tar.gz"
     34                    ;;
     35esac
    3236            ;;
    3337        Linux)
     
    4549                    dist="https://github.com/AdoptOpenJDK/openjdk14-binaries/releases/download/jdk-14.0.2%2B12/OpenJDK14U-jdk_x64_linux_hotspot_14.0.2_12.tar.gz"
    4650                    ;;
    47             esac
     51                openjdk15)
     52                    topdir=jdk-15+36
     53                    dist="https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15%2B36/OpenJDK15U-jdk_x64_linux_hotspot_15_36.tar.gz"
     54                    ;;
     55esac
    4856            ;;
    4957        *)
     
    8290
    8391jenv doctor
    84 
    85 
    86 
    87 
    88 
    89 
    90 
  • trunk/abcl/src/org/armedbear/lisp/Lisp.java

    r15371 r15378  
    24162416        } else {
    24172417          int i = javaVersion.indexOf(".");
    2418           platformVersion = javaVersion.substring(0, i);
     2418          if (i >= 0) {
     2419            platformVersion = javaVersion.substring(0, i);
     2420          } else {
     2421            platformVersion = javaVersion;
     2422          }
    24192423      }
    24202424      featureList = featureList.push(internKeyword("JAVA-" + platformVersion));
Note: See TracChangeset for help on using the changeset viewer.