From 2ea5948b6133c4dc82533f9ce4a8fd56eb04eda2 Mon Sep 17 00:00:00 2001
From: Sven Gothel <sgothel@jausoft.com>
Date: Mon, 19 Aug 2019 09:38:02 +0200
Subject: Bug 1363: Java 11: bring back bootclasspath for java 8 target
 accuracy

Was removed mostly via commit 63e31d05ad9f1df99663997c2f04ad086f29c8fc

We have 2 choices building for java8 under java11:
1) use source, target and bootclasspath options
2) use release option

It is said that (2) is not yet accurate enough
and (1) shall be favored as it guarantees no java>8 class leak
from the build JDK.

This patch is isolated to allow removal of said bootclasspath
if desired by anybody
---
 make/build-jogl.xml         | 10 ++++++++++
 make/build-nativewindow.xml |  1 +
 make/build-newt.xml         | 10 ++++++++++
 make/build-oculusvr.xml     |  2 ++
 make/build-staticglgen.xml  |  6 ++++--
 make/build-test.xml         |  3 +++
 6 files changed, 30 insertions(+), 2 deletions(-)

diff --git a/make/build-jogl.xml b/make/build-jogl.xml
index 363ef8e42..49d6f8d5d 100644
--- a/make/build-jogl.xml
+++ b/make/build-jogl.xml
@@ -799,6 +799,7 @@
                encoding="UTF-8"
                source="${target.sourcelevel}" 
                target="${target.targetlevel}"
+               bootclasspath="${target.rt.jar}"
                debug="${javacdebug}" debuglevel="${javacdebuglevel}">
             <classpath refid="gluegen-gl.classpath"/>
             <src path="${src.java}" />
@@ -812,6 +813,7 @@
                encoding="UTF-8"
                source="${target.sourcelevel}" 
                target="${target.targetlevel}" 
+               bootclasspath="${target.rt.jar}"
                debug="${javacdebug}" debuglevel="${javacdebuglevel}">
             <classpath refid="gluegen-gl.classpath"/>
             <src path="${src.java}" />
@@ -1085,6 +1087,7 @@
                encoding="UTF-8"
                source="${target.sourcelevel}" 
                target="${target.targetlevel}"
+               bootclasspath="${target.rt.jar}"
                debug="${javacdebug}" debuglevel="${javacdebuglevel}">
             <classpath refid="nativewindow_gluegen.classpath"/>
             <include name="jogamp/opengl/GLDebugMessageHandler.java" />
@@ -1101,6 +1104,7 @@
                encoding="UTF-8"
                source="${target.sourcelevel}" 
                target="${target.targetlevel}"
+               bootclasspath="${target.rt.jar}"
                debug="${javacdebug}" debuglevel="${javacdebuglevel}">
             <classpath refid="nativewindow_gluegen.classpath"/>
             <include name="jogamp/opengl/util/av/impl/FFMPEGStaticNatives.java" />
@@ -1120,6 +1124,7 @@
                encoding="UTF-8"
                source="${target.sourcelevel}" 
                target="${target.targetlevel}"
+               bootclasspath="${target.rt.jar}"
                debug="${javacdebug}" debuglevel="${javacdebuglevel}">
             <classpath refid="nativewindow_gluegen.classpath"/>
             <include name="jogamp/opengl/util/av/impl/OMXGLMediaPlayer.java" />
@@ -1134,6 +1139,7 @@
                encoding="UTF-8"
                source="${target.sourcelevel}" 
                target="${target.targetlevel}" 
+               bootclasspath="${target.rt.jar}"
                debug="${javacdebug}" debuglevel="${javacdebuglevel}">
             <classpath refid="nativewindow_gluegen.classpath"/>
             <src path="${src.java}" />
@@ -1151,6 +1157,7 @@
                encoding="UTF-8"
                source="${target.sourcelevel}" 
                target="${target.targetlevel}" 
+               bootclasspath="${target.rt.jar}"
                debug="${javacdebug}" debuglevel="${javacdebuglevel}">
             <classpath refid="nativewindow_gluegen_joal.classpath"/>
             <src path="${src.java}" />
@@ -1168,6 +1175,7 @@
                encoding="UTF-8"
                source="${target.sourcelevel}" 
                target="${target.targetlevel}" 
+               bootclasspath="${target.rt.jar}"
                debug="${javacdebug}" debuglevel="${javacdebuglevel}">
             <classpath refid="nativewindow_gluegen.classpath"/>
             <src path="${src.java}" />
@@ -1185,6 +1193,7 @@
                encoding="UTF-8"
                source="${target.sourcelevel}" 
                target="${target.targetlevel}" 
+               bootclasspath="${target.rt.jar}"
                debug="${javacdebug}" debuglevel="${javacdebuglevel}">
             <classpath refid="nativewindow_gluegen_android.classpath"/>
             <src path="${src.java}" />
@@ -1205,6 +1214,7 @@
                encoding="UTF-8"
                source="${target.sourcelevel}" 
                target="${target.targetlevel}" 
+               bootclasspath="${target.rt.jar}"
                debug="${javacdebug}" debuglevel="${javacdebuglevel}">
             <classpath refid="nativewindow_gluegen.classpath"/>
             <src path="${src.java}" />
diff --git a/make/build-nativewindow.xml b/make/build-nativewindow.xml
index bbff2c9cb..46eab57ba 100644
--- a/make/build-nativewindow.xml
+++ b/make/build-nativewindow.xml
@@ -405,6 +405,7 @@
                encoding="UTF-8"
                source="${target.sourcelevel}" 
                target="${target.targetlevel}" 
+               bootclasspath="${target.rt.jar}"
                debug="${javacdebug}" debuglevel="${javacdebuglevel}">
             <classpath refid="swt_gluegen.classpath"/>
             <src path="${src.java}" />
diff --git a/make/build-newt.xml b/make/build-newt.xml
index ef4fcd2ab..9b0c94ec7 100644
--- a/make/build-newt.xml
+++ b/make/build-newt.xml
@@ -256,6 +256,7 @@
                encoding="UTF-8"
                source="${target.sourcelevel}" 
                target="${target.targetlevel}"
+               bootclasspath="${target.rt.jar}"
                debug="${javacdebug}" debuglevel="${javacdebuglevel}">
             <classpath refid="jogl_nativewindow_gluegen.classpath"/>
             <include name="jogamp/newt/driver/kd/WindowDriver.java" />
@@ -272,6 +273,7 @@
                encoding="UTF-8"
                source="${target.sourcelevel}" 
                target="${target.targetlevel}"
+               bootclasspath="${target.rt.jar}"
                debug="${javacdebug}" debuglevel="${javacdebuglevel}">
             <classpath refid="jogl_nativewindow_gluegen.classpath"/>
             <include name="jogamp/newt/driver/intel/gdl/DisplayDriver.java" />
@@ -290,6 +292,7 @@
                encoding="UTF-8"
                source="${target.sourcelevel}" 
                target="${target.targetlevel}"
+               bootclasspath="${target.rt.jar}"
                debug="${javacdebug}" debuglevel="${javacdebuglevel}">
             <classpath refid="jogl_nativewindow_gluegen.classpath"/>
             <include name="jogamp/newt/driver/bcm/egl/WindowDriver.java" />
@@ -306,6 +309,7 @@
                encoding="UTF-8"
                source="${target.sourcelevel}" 
                target="${target.targetlevel}"
+               bootclasspath="${target.rt.jar}"
                debug="${javacdebug}" debuglevel="${javacdebuglevel}">
             <classpath refid="jogl_nativewindow_gluegen.classpath"/>
             <include name="jogamp/newt/driver/bcm/vc/iv/DisplayDriver.java" />
@@ -324,6 +328,7 @@
                encoding="UTF-8"
                source="${target.sourcelevel}" 
                target="${target.targetlevel}"
+               bootclasspath="${target.rt.jar}"
                debug="${javacdebug}" debuglevel="${javacdebuglevel}">
             <classpath refid="jogl_nativewindow_gluegen.classpath"/>
             <include name="jogamp/newt/driver/windows/WindowDriver.java" />
@@ -342,6 +347,7 @@
                encoding="UTF-8"
                source="${target.sourcelevel}" 
                target="${target.targetlevel}"
+               bootclasspath="${target.rt.jar}"
                debug="${javacdebug}" debuglevel="${javacdebuglevel}">
             <classpath refid="jogl_nativewindow_gluegen.classpath"/>
             <include name="jogamp/newt/driver/macosx/WindowDriver.java" />
@@ -360,6 +366,7 @@
                encoding="UTF-8"
                source="${target.sourcelevel}" 
                target="${target.targetlevel}"
+               bootclasspath="${target.rt.jar}"
                debug="${javacdebug}" debuglevel="${javacdebuglevel}">
             <classpath refid="jogl_nativewindow_gluegen.classpath"/>
             <include name="jogamp/newt/driver/x11/WindowDriver.java" />
@@ -377,6 +384,7 @@
                encoding="UTF-8"
                source="${target.sourcelevel}" 
                target="${target.targetlevel}" 
+               bootclasspath="${target.rt.jar}"
                debug="${javacdebug}" debuglevel="${javacdebuglevel}">
             <src path="${src.java}" />
             <classpath refid="jogl_nativewindow_gluegen.classpath"/>
@@ -396,6 +404,7 @@
                encoding="UTF-8"
                source="${target.sourcelevel}" 
                target="${target.targetlevel}"
+               bootclasspath="${target.rt.jar}"
                debug="${javacdebug}" debuglevel="${javacdebuglevel}">
             <classpath refid="jogl_nativewindow_gluegen_android.classpath"/>
             <include name="jogamp/newt/driver/android/WindowDriver.java" />
@@ -409,6 +418,7 @@
                encoding="UTF-8"
                source="${target.sourcelevel}" 
                target="${target.targetlevel}" 
+               bootclasspath="${target.rt.jar}"
                debug="${javacdebug}" debuglevel="${javacdebuglevel}">
             <src path="${src.java}" />
             <classpath refid="jogl_nativewindow_gluegen_android.classpath"/>
diff --git a/make/build-oculusvr.xml b/make/build-oculusvr.xml
index b8dda8413..2fa7b16fa 100644
--- a/make/build-oculusvr.xml
+++ b/make/build-oculusvr.xml
@@ -191,6 +191,7 @@
                encoding="UTF-8"
                source="${target.sourcelevel}" 
                target="${target.targetlevel}" 
+               bootclasspath="${target.rt.jar}"
                debug="${javacdebug}" debuglevel="${javacdebuglevel}">
             <classpath refid="nativewindow_gluegen.classpath"/>
             <src path="${src.java}" />
@@ -205,6 +206,7 @@
                encoding="UTF-8"
                source="${target.sourcelevel}" 
                target="${target.targetlevel}" 
+               bootclasspath="${target.rt.jar}"
                debug="${javacdebug}" debuglevel="${javacdebuglevel}">
             <classpath refid="jogl_nativewindow_gluegen.classpath"/>
             <src path="${src.java}" />
diff --git a/make/build-staticglgen.xml b/make/build-staticglgen.xml
index 69785abee..697a52399 100644
--- a/make/build-staticglgen.xml
+++ b/make/build-staticglgen.xml
@@ -34,7 +34,8 @@
                memoryMaximumSize="${javac.memorymax}"
                encoding="UTF-8"
                source="${target.sourcelevel}" 
-               target="${target.targetlevel}">
+               target="${target.targetlevel}"
+               bootclasspath="${target.rt.jar}">
             <classpath refid="antlr.classpath" />
         </javac>
         
@@ -59,7 +60,8 @@
                memoryMaximumSize="${javac.memorymax}"
                encoding="UTF-8"
                source="${target.sourcelevel}" 
-               target="${target.targetlevel}">
+               target="${target.targetlevel}"
+               bootclasspath="${target.rt.jar}">
             <src path="${src.java}" />
             <classpath refid="classpath" />
         </javac>
diff --git a/make/build-test.xml b/make/build-test.xml
index df25c5a09..0b1c62d44 100644
--- a/make/build-test.xml
+++ b/make/build-test.xml
@@ -115,6 +115,7 @@
                encoding="UTF-8"
                source="${target.sourcelevel}" 
                target="${target.targetlevel}" 
+               bootclasspath="${target.rt.jar}"
                debug="${javacdebug}" debuglevel="${javacdebuglevel}">
             <classpath refid="junit_jogl_newt.compile.classpath"/>
             <src path="${src.test}" />
@@ -130,6 +131,7 @@
                encoding="UTF-8"
                source="${target.sourcelevel}" 
                target="${target.targetlevel}" 
+               bootclasspath="${target.rt.jar}"
                debug="${javacdebug}" debuglevel="${javacdebuglevel}">
             <classpath refid="junit_jogl_newt_oculusvr.compile.classpath"/>
             <src path="${src.test}" />
@@ -170,6 +172,7 @@
                encoding="UTF-8"
                source="${target.sourcelevel}" 
                target="${target.targetlevel}"
+               bootclasspath="${target.rt.jar}"
                debug="${javacdebug}" debuglevel="${javacdebuglevel}">
             <classpath refid="junit_jogl_newt_android.compile.classpath"/>
             <src path="${src.test}" />
-- 
cgit v1.2.3