Changeset 15378

Timestamp:

09/19/20 14:02:17 (3 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:

• .travis.yml (modified) (1 diff)
• build.xml (modified) (1 diff)
• ci/create-abcl-properties.bash (modified) (1 diff)
• ci/install-adoptjdk.bash (modified) (3 diffs)
• src/org/armedbear/lisp/Lisp.java (modified) (1 diff)

trunk/abcl/.travis.yml

@@ -34 +34 @@
   - ABCL_JDK=openjdk8  ABCL_ROOT=${TRAVIS_BUILD_DIR}
   - ABCL_JDK=openjdk11 ABCL_ROOT=${TRAVIS_BUILD_DIR}
-  - ABCL_JDK=openjdk14 ABCL_ROOT=${TRAVIS_BUILD_DIR}
+  - ABCL_JDK=openjdk15 ABCL_ROOT=${TRAVIS_BUILD_DIR}
 
 install:

trunk/abcl/build.xml

@@ -1271 +1271 @@
       </exec>
     </target>
-  
+
+    <target name="abcl.properties.autoconfigure.openjdk.15">
+      <exec executable="/usr/bin/env">
+        <arg value="bash"/>
+        <arg value="ci/create-abcl-properties.bash"/>
+        <arg value="openjdk15"/>
+      </exec>
+    </target>
+
     <import file="etc/ant/netbeans-build.xml"
             optional="true"/> 

trunk/abcl/ci/create-abcl-properties.bash

@@ -53 +53 @@
   abcl_javac_source=1.8
         ;;
+    15|openjdk15)
+        options="-XX:CompileThreshold=10 ${zgc}"
+  abcl_javac_target=15
+  abcl_javac_source=1.8
+        ;;
 esac
 

trunk/abcl/ci/install-adoptjdk.bash

@@ -29 +29 @@
                     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"
                     ;;
-            esac
+                openjdk15)
+                    topdir=jdk-15+36
+                    dist="https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15%2B36/OpenJDK15U-jdk_x64_mac_hotspot_15_36.tar.gz"
+                    ;;
+esac
             ;;
         Linux)
@@ -45 +49 @@
                     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"
                     ;;
-            esac
+                openjdk15)
+                    topdir=jdk-15+36
+                    dist="https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15%2B36/OpenJDK15U-jdk_x64_linux_hotspot_15_36.tar.gz"
+                    ;;
+esac
             ;;
         *)
@@ -82 +90 @@
 
 jenv doctor
-
-
-
-
-
-
-

trunk/abcl/src/org/armedbear/lisp/Lisp.java

@@ -2416 +2416 @@
         } else {
           int i = javaVersion.indexOf(".");
-          platformVersion = javaVersion.substring(0, i);
+          if (i >= 0) {
+            platformVersion = javaVersion.substring(0, i);
+          } else {
+            platformVersion = javaVersion;
+          }
       }
       featureList = featureList.push(internKeyword("JAVA-" + platformVersion));