Bug 1363: Java 11: Adapt build scripts for java11

17 files changed, 79 insertions, 87 deletions

diff --git a/make/scripts/make.jogl.all.android-aarch64-cross.sh b/make/scripts/make.jogl.all.android-aarch64-cross.sh
index 7f85b4e1a..429f083c1 100755
--- a/make/scripts/make.jogl.all.android-aarch64-cross.sh
+++ b/make/scripts/make.jogl.all.android-aarch64-cross.sh
@@ -26,12 +26,11 @@ export TARGET_ADB_PORT=5555
 export TARGET_ROOT=/data/projects
 export TARGET_ANT_HOME=/usr/share/ant
 
-export ANDROID_VERSION=21
-export SOURCE_LEVEL=1.6
-export TARGET_LEVEL=1.6
-export TARGET_RT_JAR=/opt-share/jre1.6.0_30/lib/rt.jar
+export ANDROID_VERSION=24
+export SOURCE_LEVEL=1.8
+export TARGET_LEVEL=1.8
+export TARGET_RT_JAR=/opt-share/jre1.8.0_212/lib/rt.jar
 
-#export GCC_VERSION=4.4.3
 export GCC_VERSION=4.9
 HOST_ARCH=linux-x86_64
 export TARGET_TRIPLE=aarch64-linux-android
diff --git a/make/scripts/make.jogl.all.android-armv6-cross.sh b/make/scripts/make.jogl.all.android-armv6-cross.sh
index e9f8cc8b5..0253765ac 100755
--- a/make/scripts/make.jogl.all.android-armv6-cross.sh
+++ b/make/scripts/make.jogl.all.android-armv6-cross.sh
@@ -26,13 +26,12 @@ export TARGET_ADB_PORT=5555
 export TARGET_ROOT=/data/projects
 export TARGET_ANT_HOME=/usr/share/ant
 
-export ANDROID_VERSION=9
-export SOURCE_LEVEL=1.6
-export TARGET_LEVEL=1.6
-export TARGET_RT_JAR=/opt-share/jre1.6.0_30/lib/rt.jar
+export ANDROID_VERSION=24
+export SOURCE_LEVEL=1.8
+export TARGET_LEVEL=1.8
+export TARGET_RT_JAR=/opt-share/jre1.8.0_212/lib/rt.jar
 
-#export GCC_VERSION=4.4.3
-export GCC_VERSION=4.8
+export GCC_VERSION=4.9
 HOST_ARCH=linux-x86_64
 export TARGET_TRIPLE=arm-linux-androideabi
 
diff --git a/make/scripts/make.jogl.all.android-x86-cross.sh b/make/scripts/make.jogl.all.android-x86-cross.sh
index 79c3af29a..9fc9e10dc 100755
--- a/make/scripts/make.jogl.all.android-x86-cross.sh
+++ b/make/scripts/make.jogl.all.android-x86-cross.sh
@@ -69,13 +69,12 @@ elif [ ! -e $ANDROID_HOME ] ; then
 fi
 export ANDROID_HOME
 
-export ANDROID_VERSION=9
-export SOURCE_LEVEL=1.6
-export TARGET_LEVEL=1.6
-export TARGET_RT_JAR=/opt-share/jre1.6.0_30/lib/rt.jar
+export ANDROID_VERSION=24
+export SOURCE_LEVEL=1.8
+export TARGET_LEVEL=1.8
+export TARGET_RT_JAR=/opt-share/jre1.8.0_212/lib/rt.jar
 
-#export GCC_VERSION=4.4.3
-export GCC_VERSION=4.7
+export GCC_VERSION=4.9
 HOST_ARCH=linux-x86
 export TARGET_TRIPLE=i686-linux-android
 export TOOLCHAIN_NAME=x86
diff --git a/make/scripts/make.jogl.all.generic.sh b/make/scripts/make.jogl.all.generic.sh
index 9a2cbf4d9..de46ac9de 100755
--- a/make/scripts/make.jogl.all.generic.sh
+++ b/make/scripts/make.jogl.all.generic.sh
@@ -16,9 +16,9 @@
 #    -Dsetup.addNativeKD=true \
 
 
-export SOURCE_LEVEL=1.6
-export TARGET_LEVEL=1.6
-export TARGET_RT_JAR=/opt-share/jre1.6.0_30/lib/rt.jar
+export SOURCE_LEVEL=1.8
+export TARGET_LEVEL=1.8
+export TARGET_RT_JAR=/opt-share/jre1.8.0_212/lib/rt.jar
 
 #export JOGAMP_JAR_CODEBASE="Codebase: *.jogamp.org"
 export JOGAMP_JAR_CODEBASE="Codebase: *.goethel.localnet"
diff --git a/make/scripts/make.jogl.all.ios.amd64.sh b/make/scripts/make.jogl.all.ios.amd64.sh
index 8ea91b984..733103712 100755
--- a/make/scripts/make.jogl.all.ios.amd64.sh
+++ b/make/scripts/make.jogl.all.ios.amd64.sh
@@ -16,15 +16,15 @@ fi
 export SDKROOT=iphonesimulator12.2
 xcrun --show-sdk-path
 
-JAVA_HOME=`/usr/libexec/java_home -version 1.8`
+JAVA_HOME=`/usr/libexec/java_home -version 11`
 PATH=$JAVA_HOME/bin:$PATH
 export JAVA_HOME PATH
 which java
 java -version 
 
-export SOURCE_LEVEL=1.6
-export TARGET_LEVEL=1.6
-export TARGET_RT_JAR=/opt-share/jre1.6.0_30/lib/rt.jar
+export SOURCE_LEVEL=1.8
+export TARGET_LEVEL=1.8
+export TARGET_RT_JAR=/opt-share/jre1.8.0_212/lib/rt.jar
 
 #export JOGAMP_JAR_CODEBASE="Codebase: *.jogamp.org"
 export JOGAMP_JAR_CODEBASE="Codebase: *.goethel.localnet"
diff --git a/make/scripts/make.jogl.all.ios.arm64.sh b/make/scripts/make.jogl.all.ios.arm64.sh
index 8a101adf2..3349262cd 100755
--- a/make/scripts/make.jogl.all.ios.arm64.sh
+++ b/make/scripts/make.jogl.all.ios.arm64.sh
@@ -16,15 +16,15 @@ fi
 export SDKROOT=iphoneos12.2
 xcrun --show-sdk-path
 
-JAVA_HOME=`/usr/libexec/java_home -version 1.8`
+JAVA_HOME=`/usr/libexec/java_home -version 11`
 PATH=$JAVA_HOME/bin:$PATH
 export JAVA_HOME PATH
 which java
 java -version 
 
-export SOURCE_LEVEL=1.6
-export TARGET_LEVEL=1.6
-export TARGET_RT_JAR=/opt-share/jre1.6.0_30/lib/rt.jar
+export SOURCE_LEVEL=1.8
+export TARGET_LEVEL=1.8
+export TARGET_RT_JAR=/opt-share/jre1.8.0_212/lib/rt.jar
 
 #export JOGAMP_JAR_CODEBASE="Codebase: *.jogamp.org"
 export JOGAMP_JAR_CODEBASE="Codebase: *.goethel.localnet"
diff --git a/make/scripts/make.jogl.all.linux-aarch64-cross.sh b/make/scripts/make.jogl.all.linux-aarch64-cross.sh
index a688044fe..1b808d679 100755
--- a/make/scripts/make.jogl.all.linux-aarch64-cross.sh
+++ b/make/scripts/make.jogl.all.linux-aarch64-cross.sh
@@ -27,9 +27,9 @@ export GLUEGEN_CPPTASKS_FILE="../../gluegen/make/lib/gluegen-cpptasks-linux-aarc
 #export JUNIT_DISABLED="true"
 #export JUNIT_RUN_ARG0="-Dnewt.test.Screen.disableScreenMode"
 
-export SOURCE_LEVEL=1.6
-export TARGET_LEVEL=1.6
-export TARGET_RT_JAR=/opt-share/jre1.6.0_30/lib/rt.jar
+export SOURCE_LEVEL=1.8
+export TARGET_LEVEL=1.8
+export TARGET_RT_JAR=/opt-share/jre1.8.0_212/lib/rt.jar
 
 #export JOGAMP_JAR_CODEBASE="Codebase: *.jogamp.org"
 export JOGAMP_JAR_CODEBASE="Codebase: *.goethel.localnet"
diff --git a/make/scripts/make.jogl.all.linux-armv6hf-cross.sh b/make/scripts/make.jogl.all.linux-armv6hf-cross.sh
index 8f12a6863..10cbf3f79 100755
--- a/make/scripts/make.jogl.all.linux-armv6hf-cross.sh
+++ b/make/scripts/make.jogl.all.linux-armv6hf-cross.sh
@@ -39,9 +39,9 @@ export GLUEGEN_CPPTASKS_FILE="../../gluegen/make/lib/gluegen-cpptasks-linux-armv
 #export JUNIT_DISABLED="true"
 export JUNIT_RUN_ARG0="-Dnewt.test.Screen.disableScreenMode"
 
-export SOURCE_LEVEL=1.6
-export TARGET_LEVEL=1.6
-export TARGET_RT_JAR=/opt-share/jre1.6.0_30/lib/rt.jar
+export SOURCE_LEVEL=1.8
+export TARGET_LEVEL=1.8
+export TARGET_RT_JAR=/opt-share/jre1.8.0_212/lib/rt.jar
 
 #export JOGAMP_JAR_CODEBASE="Codebase: *.jogamp.org"
 export JOGAMP_JAR_CODEBASE="Codebase: *.goethel.localnet"
diff --git a/make/scripts/make.jogl.all.linux-x86-clang.sh b/make/scripts/make.jogl.all.linux-x86-clang.sh
index b76997d1e..aaf9029db 100755
--- a/make/scripts/make.jogl.all.linux-x86-clang.sh
+++ b/make/scripts/make.jogl.all.linux-x86-clang.sh
@@ -41,9 +41,9 @@ echo LIBGL_DEBUG: $LIBGL_DEBUG 2>&1 | tee -a $LOGF
 #    -Dgluegen-cpptasks.file=`pwd`/../../gluegen/make/lib/gluegen-cpptasks-linux-32bit.xml \
 #
 
-export SOURCE_LEVEL=1.6
-export TARGET_LEVEL=1.6
-export TARGET_RT_JAR=/opt-share/jre1.6.0_30/lib/rt.jar
+export SOURCE_LEVEL=1.8
+export TARGET_LEVEL=1.8
+export TARGET_RT_JAR=/opt-share/jre1.8.0_212/lib/rt.jar
 
 export GLUEGEN_PROPERTIES_FILE="../../gluegen/make/lib/gluegen-clang.properties"
 # or -Dgcc.compat.compiler=clang
diff --git a/make/scripts/make.jogl.all.linux-x86.sh b/make/scripts/make.jogl.all.linux-x86.sh
index f3ae281c8..984accde6 100755
--- a/make/scripts/make.jogl.all.linux-x86.sh
+++ b/make/scripts/make.jogl.all.linux-x86.sh
@@ -41,9 +41,9 @@ echo LIBGL_DEBUG: $LIBGL_DEBUG 2>&1 | tee -a $LOGF
 #    -Dgluegen-cpptasks.file=`pwd`/../../gluegen/make/lib/gluegen-cpptasks-linux-32bit.xml \
 #
 
-export SOURCE_LEVEL=1.6
-export TARGET_LEVEL=1.6
-export TARGET_RT_JAR=/opt-share/jre1.6.0_30/lib/rt.jar
+export SOURCE_LEVEL=1.8
+export TARGET_LEVEL=1.8
+export TARGET_RT_JAR=/opt-share/jre1.8.0_212/lib/rt.jar
 
 #export JOGAMP_JAR_CODEBASE="Codebase: *.jogamp.org"
 export JOGAMP_JAR_CODEBASE="Codebase: *.goethel.localnet"
diff --git a/make/scripts/make.jogl.all.linux-x86_64-clang.sh b/make/scripts/make.jogl.all.linux-x86_64-clang.sh
index 8a684b7d3..cd23b7654 100755
--- a/make/scripts/make.jogl.all.linux-x86_64-clang.sh
+++ b/make/scripts/make.jogl.all.linux-x86_64-clang.sh
@@ -25,10 +25,6 @@ fi
 #    -DisLinuxAMD64=true \
 #    -DisX11=true \
 #
-#    -Dtarget.sourcelevel=1.6 \
-#    -Dtarget.targetlevel=1.6 \
-#    -Dtarget.rt.jar=/opt-share/jre1.6.0_30/lib/rt.jar \
-#
 #    -Dsetup.addNativeOpenMAX=true \
 #    -Dsetup.addNativeKD=true \
 
@@ -45,9 +41,9 @@ echo LIBXCB_ALLOW_SLOPPY_LOCK: $LIBXCB_ALLOW_SLOPPY_LOCK 2>&1 | tee -a $LOGF
 echo LIBGL_DRIVERS_PATH: $LIBGL_DRIVERS_PATH 2>&1 | tee -a $LOGF
 echo LIBGL_DEBUG: $LIBGL_DEBUG 2>&1 | tee -a $LOGF
 
-export SOURCE_LEVEL=1.6
-export TARGET_LEVEL=1.6
-export TARGET_RT_JAR=/opt-share/jre1.6.0_30/lib/rt.jar
+export SOURCE_LEVEL=1.8
+export TARGET_LEVEL=1.8
+export TARGET_RT_JAR=/opt-share/jre1.8.0_212/lib/rt.jar
 
 export GLUEGEN_PROPERTIES_FILE="../../gluegen/make/lib/gluegen-clang.properties"
 # or -Dgcc.compat.compiler=clang
diff --git a/make/scripts/make.jogl.all.linux-x86_64.sh b/make/scripts/make.jogl.all.linux-x86_64.sh
index bb6bdf047..dd01bfed7 100755
--- a/make/scripts/make.jogl.all.linux-x86_64.sh
+++ b/make/scripts/make.jogl.all.linux-x86_64.sh
@@ -2,12 +2,6 @@
 
 SDIR=`dirname $0` 
 
-#J2RE_HOME=/opt-linux-x86_64/jre1.7.0_45
-#JAVA_HOME=/opt-linux-x86_64/jdk1.7.0_45
-#J2RE_HOME=/opt-linux-x86_64/jre7
-#JAVA_HOME=/opt-linux-x86_64/j2se7
-#export J2RE_HOME JAVA_HOME
-
 if [ -e $SDIR/../../../gluegen/make/scripts/setenv-build-jogl-x86_64.sh ] ; then
     . $SDIR/../../../gluegen/make/scripts/setenv-build-jogl-x86_64.sh
 fi
@@ -32,10 +26,6 @@ fi
 #    -DisLinuxAMD64=true \
 #    -DisX11=true \
 #
-#    -Dtarget.sourcelevel=1.6 \
-#    -Dtarget.targetlevel=1.6 \
-#    -Dtarget.rt.jar=/opt-share/jre1.6.0_30/lib/rt.jar \
-#
 #    -Dsetup.addNativeOpenMAX=true \
 #    -Dsetup.addNativeKD=true \
 
@@ -52,9 +42,9 @@ echo LIBXCB_ALLOW_SLOPPY_LOCK: $LIBXCB_ALLOW_SLOPPY_LOCK 2>&1 | tee -a $LOGF
 echo LIBGL_DRIVERS_PATH: $LIBGL_DRIVERS_PATH 2>&1 | tee -a $LOGF
 echo LIBGL_DEBUG: $LIBGL_DEBUG 2>&1 | tee -a $LOGF
 
-export SOURCE_LEVEL=1.6
-export TARGET_LEVEL=1.6
-export TARGET_RT_JAR=/opt-share/jre1.6.0_30/lib/rt.jar
+export SOURCE_LEVEL=1.8
+export TARGET_LEVEL=1.8
+export TARGET_RT_JAR=/opt-share/jre1.8.0_212/lib/rt.jar
 
 #export JOGAMP_JAR_CODEBASE="Codebase: *.jogamp.org"
 export JOGAMP_JAR_CODEBASE="Codebase: *.goethel.localnet"
diff --git a/make/scripts/make.jogl.all.macosx.sh b/make/scripts/make.jogl.all.macosx.sh
index d9db72045..e46aee628 100755
--- a/make/scripts/make.jogl.all.macosx.sh
+++ b/make/scripts/make.jogl.all.macosx.sh
@@ -8,9 +8,8 @@ fi
 # export SDKROOT=macosx10.6
 
 #JAVA_HOME=`/usr/libexec/java_home`
-JAVA_HOME=`/usr/libexec/java_home -version 1.8`
-#JAVA_HOME=`/usr/libexec/java_home -version 1.7`
-#JAVA_HOME=`/usr/libexec/java_home -version 1.6`
+JAVA_HOME=`/usr/libexec/java_home -version 1.11`
+#JAVA_HOME=`/usr/libexec/java_home -version 1.8`
 PATH=$JAVA_HOME/bin:$PATH
 export JAVA_HOME PATH
 
@@ -20,9 +19,9 @@ export JAVA_HOME PATH
 #    -Djavacdebuglevel="source,lines,vars" \
 #
 
-export SOURCE_LEVEL=1.6
-export TARGET_LEVEL=1.6
-export TARGET_RT_JAR=/opt-share/jre1.6.0_30/lib/rt.jar
+export SOURCE_LEVEL=1.8
+export TARGET_LEVEL=1.8
+export TARGET_RT_JAR=/opt-share/jre1.8.0_212/lib/rt.jar
 
 #export JOGAMP_JAR_CODEBASE="Codebase: *.jogamp.org"
 export JOGAMP_JAR_CODEBASE="Codebase: *.goethel.localnet"
diff --git a/make/scripts/make.jogl.all.solaris-x86.sh b/make/scripts/make.jogl.all.solaris-x86.sh
index d1a767cdd..a43205146 100755
--- a/make/scripts/make.jogl.all.solaris-x86.sh
+++ b/make/scripts/make.jogl.all.solaris-x86.sh
@@ -41,9 +41,9 @@ echo LIBGL_DEBUG: $LIBGL_DEBUG 2>&1 | tee -a $LOGF
 #    -Djavacdebug="true" \
 #    -Djavacdebuglevel="source,lines,vars" \
 
-export SOURCE_LEVEL=1.6
-export TARGET_LEVEL=1.6
-export TARGET_RT_JAR=/opt-share/jre1.6.0_30/lib/rt.jar
+export SOURCE_LEVEL=1.8
+export TARGET_LEVEL=1.8
+export TARGET_RT_JAR=/opt-share/jre1.8.0_212/lib/rt.jar
 
 #export JOGAMP_JAR_CODEBASE="Codebase: *.jogamp.org"
 export JOGAMP_JAR_CODEBASE="Codebase: *.goethel.localnet"
diff --git a/make/scripts/make.jogl.all.solaris-x86_64.sh b/make/scripts/make.jogl.all.solaris-x86_64.sh
index 9dc492e25..42f155460 100755
--- a/make/scripts/make.jogl.all.solaris-x86_64.sh
+++ b/make/scripts/make.jogl.all.solaris-x86_64.sh
@@ -41,9 +41,9 @@ echo LIBGL_DEBUG: $LIBGL_DEBUG 2>&1 | tee -a $LOGF
 #    -Djavacdebug="true" \
 #    -Djavacdebuglevel="source,lines,vars" \
 
-export SOURCE_LEVEL=1.6
-export TARGET_LEVEL=1.6
-export TARGET_RT_JAR=/opt-share/jre1.6.0_30/lib/rt.jar
+export SOURCE_LEVEL=1.8
+export TARGET_LEVEL=1.8
+export TARGET_RT_JAR=/opt-share/jre1.8.0_212/lib/rt.jar
 
 #export JOGAMP_JAR_CODEBASE="Codebase: *.jogamp.org"
 export JOGAMP_JAR_CODEBASE="Codebase: *.goethel.localnet"
diff --git a/make/scripts/make.jogl.all.win32.bat b/make/scripts/make.jogl.all.win32.bat
index fde4a19e5..bcce8cde8 100755
--- a/make/scripts/make.jogl.all.win32.bat
+++ b/make/scripts/make.jogl.all.win32.bat
@@ -1,10 +1,15 @@
-set THISDIR="C:\JOGL"

+set THISDIR="C:\JogAmp"

 

-set J2RE_HOME=c:\jre1.8.0_121_x32

-set JAVA_HOME=c:\jdk1.8.0_121_x32

-set ANT_PATH=C:\apache-ant-1.9.4

+set J2RE_HOME=c:\jre-11.0.4+11_x32

+set JAVA_HOME=c:\jdk-11.0.4+11_x32

+set ANT_PATH=C:\apache-ant-1.10.5

+set GIT_PATH=C:\cygwin\bin

+set SEVENZIP=C:\Program Files\7-Zip

 

-set PATH=%J2RE_HOME%\bin;%JAVA_HOME%\bin;%ANT_PATH%\bin;c:\mingw\bin;%PATH%

+set CMAKE_PATH=C:\cmake-3.15.2-win32-x86

+set CMAKE_C_COMPILER=c:\mingw32\bin\gcc

+

+set PATH=%JAVA_HOME%\bin;%ANT_PATH%\bin;c:\mingw32\bin;%CMAKE_PATH%\bin;%GIT_PATH%;%SEVENZIP%;%PATH%

 

 REM set LIB_GEN=%THISDIR%\lib

 REM set CLASSPATH=.;%THISDIR%\build-win32\classes

@@ -12,9 +17,9 @@ REM    -Dc.compiler.debug=true
 REM    -Dsetup.addNativeOpenMAX=true 

 REM    -Dsetup.addNativeKD=true

 

-set SOURCE_LEVEL=1.6

-set TARGET_LEVEL=1.6

-set TARGET_RT_JAR=c:\jre1.6.0_30\lib\rt.jar

+set SOURCE_LEVEL=1.8

+set TARGET_LEVEL=1.8

+set TARGET_RT_JAR=C:\jre1.8.0_212\lib\rt.jar

 

 REM set JOGAMP_JAR_CODEBASE=Codebase: *.jogamp.org

 set JOGAMP_JAR_CODEBASE=Codebase: *.goethel.localnet

diff --git a/make/scripts/make.jogl.all.win64.bat b/make/scripts/make.jogl.all.win64.bat
index a647466c1..d25bbae39 100755
--- a/make/scripts/make.jogl.all.win64.bat
+++ b/make/scripts/make.jogl.all.win64.bat
@@ -1,10 +1,15 @@
 set THISDIR="C:\JOGL"

 

-set J2RE_HOME=c:\jre1.8.0_121_x64

-set JAVA_HOME=c:\jdk1.8.0_121_x64

-set ANT_PATH=C:\apache-ant-1.9.4

+set J2RE_HOME=c:\jre-11.0.4+11_x64

+set JAVA_HOME=c:\jdk-11.0.4+11_x64

+set ANT_PATH=C:\apache-ant-1.10.5

+set GIT_PATH=C:\cygwin\bin

+set SEVENZIP=C:\Program Files\7-Zip

 

-set PATH=%J2RE_HOME%\bin;%JAVA_HOME%\bin;%ANT_PATH%\bin;c:\mingw64\bin;%PATH%

+set CMAKE_PATH=C:\cmake-3.15.2-win64-x64

+set CMAKE_C_COMPILER=c:\mingw64\bin\gcc

+

+set PATH=%J2RE_HOME%\bin;%JAVA_HOME%\bin;%ANT_PATH%\bin;c:\mingw64\bin;%CMAKE_PATH%\bin;%GIT_PATH%;%SEVENZIP%;%PATH%

 

 REM set LIB_GEN=%THISDIR%\lib

 REM set CLASSPATH=.;%THISDIR%\build-win64\classes

@@ -12,9 +17,9 @@ REM    -Dc.compiler.debug=true
 REM    -Dsetup.addNativeOpenMAX=true 

 REM    -Dsetup.addNativeKD=true

 

-set SOURCE_LEVEL=1.6

-set TARGET_LEVEL=1.6

-set TARGET_RT_JAR=c:\jre1.6.0_30\lib\rt.jar

+set SOURCE_LEVEL=1.8

+set TARGET_LEVEL=1.8

+set TARGET_RT_JAR=C:\jre1.8.0_212\lib\rt.jar

 

 REM set JOGAMP_JAR_CODEBASE=Codebase: *.jogamp.org

 set JOGAMP_JAR_CODEBASE=Codebase: *.goethel.localnet