Changeset 15259

Timestamp:

04/28/20 06:37:35 (3 years ago)

Author:

Mark Evenson

Message:

build: support abcl.properties creation openjdk{6,7,8,11,13,14}

Additionally add test for openjdk14 to the Travis-CI build.

Improve script for creating build properties, which may be invoked
like:

bash ci/create-abcl-properties.bash openjdk8

Currently this script has baked-in "knowledge" of options for various
platforms for now, but will eventually directly transcribe from the
"facts" in <file:abcl.rdf>.

• * *

Update RDF

Location:

trunk/abcl

Files:

• .travis.yml (modified) (1 diff)
• README (modified) (1 diff)
• abcl.properties.in (modified) (1 diff)
• abcl.rdf (modified) (1 diff)
• build.xml (modified) (1 diff)
• ci/create-abcl-properties.bash (modified) (2 diffs)
• ci/install-adoptjdk.bash (modified) (2 diffs)

trunk/abcl/.travis.yml

@@ -28 +28 @@
   - ABCL_JDK=openjdk8
   - ABCL_JDK=openjdk11
+  - ABCL_JDK=openjdk14
 
 install:

trunk/abcl/README

@@ -142 +142 @@
 64bit desktop/server machine running Java 8 or 11.  The file contains
 incomplete documentation on how it may be edited for subsequent
-customization.
+customization.  As an alternative to copying the prototype, if one has
+a version of bash locally, one may issue via Ant
+
+    ant abcl.properties.autoconfigure.openjdk.11
+
+or from the shell as
+
+    bash ci/create-abcl-properties.bash openjdk11
+
+Currently upported platforms are 'openjdk6', 'openjdk7', 'openjdk8',
+'openjdk11', 'openjdk13', and 'openjdk14'.
 
 

trunk/abcl/abcl.properties.in

@@ -27 +27 @@
 
 #<>
+# <java/runtime> ( openjdk11, openjdk13, openjdk14 ) ;
+#
+#java.options=-XX:+UnlockExperimentalVMOptions -XX:+UseZGC -Xmx<size> -Xlog:gc
+
+#<>
 #  <java/runtime> openjdk11 ;
 #  rdfs:seeAlso <https://blog.gceasy.io/2020/03/18/7-jvm-arguments-of-highly-effective-applications/> ;
-#java.options=-XX:+UseZGC
+#java.options=-XX:CompileThreshold=10
 
 #<>

trunk/abcl/abcl.rdf

@@ -179 +179 @@
 [abcl:run _:supported]
   a rdf:Bag ;
-  rdf:_6   java:6 ;
-  rdf:_7   java:7 ;
-  rdf:_8   java:8 ;
-  rdf:_11  java:11 ;
-
-rdfs:comment """
-Compatible Java runtimes.
-""" .
+  rdf:_6   openjdk:6 ;
+  rdf:_7   openjdk:7 ;
+  rdf:_8   openjdk:8 ;
+  rdf:_11  openjdk:11 ;
+  rdf:_13  openjdk:13 ;
+  rdf:_14  openjdk:14 ;
+  rdfs:comment "Compatible Java runtimes" .
+
+[abcl:run _:options]
+  :base "-XShowSettings:vm -DFile.encoding="UTF-8";
+  openjdk:6 
+  openjdk:8 "-XX:+AggressiveOpts" ;
+  openjdk:11 "-XX:CompileThreshold=10" ;
+  openjdk:13 "-XX:CompileThreshold=10" ;
+  openjdk:14 "-XX:CompileThreshold=10" ;
+  rdfs:comment "Java platform runtime options" .
+
+[abcl:build _:options]
+   :target "1.8" ;
+   :source "1.6" ;
+   :encoding "UTF-8" ;
+   :debug "true" ;
+   rdfs:comment "Java build options" .
 
 [abcl:build _:supported]
   a rdf:Bag ;
-  rdf:_8   java:8 ;
-  rdf:_11  java:11 ;
-
-rdfs:comment """
-Platforms on which building is most supported.  
-""" .
+  rdf:_6   openjdk:6 ;
+  rdf:_6     :deprecated ;        
+  rdf:_7   openjdk:7 ;
+  rdf:_7     :deprecated ;        
+  rdf:_8   openjdk:8 ;
+  rdf:_8     :deprecated ;        
+  rdf:_11  openjdk:11 ;
+  rdf:_13  openjdk:13 ;
+  rdf:_14  openjdk:14 ;
+  rdfs:comment "Supported build platforms" .
+
 
   

trunk/abcl/build.xml

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

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

@@ -1 +1 @@
 #!/usr/bin/env bash
+DIR="$(cd -P "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 
 jdk=$1
@@ -6 +7 @@
 fi
 
+root="${DIR}/.."
+prop_in="${root}/abcl.properties.in"
+prop_out="${root}/abcl.properties"
+echo "Configuring for $jdk from <${prop_in}>."
+
+# Unused
+# zgc="-XX:+UnlockExperimentalVMOptions -XX:+UseZGC -Xmx<size> -Xlog:gc"
+
+abcl_javac_source=1.8
 case $jdk in
-    openjdk8)
+    6|openjdk6)
+        options="-d64 -XX:+CMSClassUnloadingEnabled -XX:MaxPermSize=1g -XX:+UseConcMarkSweepGC"
+        abcl_javac_source=1.6
+        ;;
+    7|openjdk7)
+  options="-d64 -XX:+UseG1GC"
+        abcl_javac_source=1.7
+  ;;
+    8|openjdk8)
         options="-XX:+UseG1GC -XX:+AggressiveOpts -XX:CompileThreshold=10"
         ;;
-    openjdk11)
+    11|openjdk11)
         options="-XX:CompileThreshold=10"
+        ;;
+    # untested: weakly unsupported 
+    12|openjdk12)
+        options="-XX:CompileThreshold=10"
+        ;;
+    13|openjdk13)
+        options="-XX:CompileThreshold=10"
+        ;;
+    14|openjdk14)
+        options="-XX:CompileThreshold=10 ${zgc}"
         ;;
 esac
 
-cat abcl.properties.in | awk -F = -v options="$options" '/^java.options/ {print $0 " " options; next}; {print $0}' > abcl.properties
+cat ${root}/abcl.properties.in | awk -F = -v options="$options" -v source="$abcl_javac_source" '/^java.options/ {print $0 " " options; next}; /^abcl.javac.source/ {print "abcl.javac.source=" source; next}; {print $0}' > ${root}/abcl.properties
 
+echo "Finished configuring for $jdk into <${prop_out}>."

trunk/abcl/ci/install-adoptjdk.bash

@@ -25 +25 @@
                     dist="https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.6%2B10/OpenJDK11U-jdk_x64_mac_hotspot_11.0.6_10.tar.gz"
                     ;;
+                openjdk14)
+                    topdir=jdk-14.0.1+7
+                    dist="https://github.com/AdoptOpenJDK/openjdk14-binaries/releases/download/jdk-14.0.1%2B7/OpenJDK14U-jdk_x64_mac_hotspot_14.0.1_7.tar.gz"
+                    ;;
             esac
             ;;
@@ -36 +40 @@
                     topdir=jdk-11.0.6+10
                     dist="https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.6%2B10/OpenJDK11U-jdk_x64_linux_hotspot_11.0.6_10.tar.gz"
+                    ;;
+                openjdk14)
+                    topdir=jdk-14.0.1+7
+                    dist="https://github.com/AdoptOpenJDK/openjdk14-binaries/releases/download/jdk-14.0.1%2B7/OpenJDK14U-jdk_x64_linux_hotspot_14.0.1_7.tar.gz"
                     ;;
             esac