OpenJDK8 Script Usage: Linux: Favor Debian default; Windows: Use AdoptOpenJDK8

7 files changed, 31 insertions, 11 deletions

diff --git a/make/scripts/java-win32.bat b/make/scripts/java-win32.bat
index c1afa47..ba4888e 100755
--- a/make/scripts/java-win32.bat
+++ b/make/scripts/java-win32.bat
@@ -1,7 +1,7 @@
 

 set BLD_SUB=build-win32

-set J2RE_HOME=c:\jre1.8.0_66_x32

-set JAVA_HOME=c:\jdk1.8.0_66_x32

+set J2RE_HOME=c:\jre8u202-b08_x32

+set JAVA_HOME=c:\jdk8u202-b08_x32

 set ANT_PATH=C:\apache-ant-1.9.4

 

 set BLD_DIR=..\%BLD_SUB%

diff --git a/make/scripts/java-win64.bat b/make/scripts/java-win64.bat
index ee854cf..8b34531 100755
--- a/make/scripts/java-win64.bat
+++ b/make/scripts/java-win64.bat
@@ -1,7 +1,7 @@
 

 set BLD_SUB=build-win64

-set J2RE_HOME=c:\jre1.8.0_66_x64

-set JAVA_HOME=c:\jdk1.8.0_66_x64

+set J2RE_HOME=c:\jre8u202-b08_x64

+set JAVA_HOME=c:\jdk8u202-b08_x64

 set ANT_PATH=C:\apache-ant-1.9.4

 

 set BLD_DIR=..\%BLD_SUB%

@@ -20,7 +20,7 @@ REM set D_ARGS="-Djogamp.debug.IOUtil" "-Djogamp.debug.JNILibLoader" "-Djogamp.d
 REM set D_ARGS="-Djogamp.debug.Platform" "-Djogamp.debug.NativeLibrary" "-Djogamp.debug.IOUtil"

 REM set D_ARGS="-Djogamp.debug.IOUtil" "-Djogamp.debug.IOUtil.Exe" "-Djogamp.debug.IOUtil.Exe.NoStream"

 REM set D_ARGS="-Djogamp.debug.IOUtil" "-Djogamp.debug.TempFileCache" "-Djogamp.debug.TempJarCache" "-Djogamp.debug.IOUtil.Exe" "-Djogamp.gluegen.UseNativeExeFile=true" "-Djava.io.tmpdir=c:\temp_noexec"

-set D_ARGS="-Djogamp.debug.IOUtil" "-Djogamp.debug.TempFileCache" "-Djogamp.debug.TempJarCache" "-Djava.io.tmpdir=c:\temp_noexec"

+REM set D_ARGS="-Djogamp.debug.IOUtil" "-Djogamp.debug.TempFileCache" "-Djogamp.debug.TempJarCache" "-Djava.io.tmpdir=c:\temp_noexec"

 REM set D_ARGS="-Djogamp.debug=all"

 

 REM %J2RE_HOME%\bin\java -classpath %CP_ALL% %X_ARGS% %D_ARGS% "-Djava.library.path=%LIB_DIR%" "-Dsun.java2d.noddraw=true" "-Dsun.awt.noerasebackground=true" %1 %2 %3 %4 %5 %6 %7 %8 %9 > java-win64.log 2>&1

diff --git a/make/scripts/make.gluegen.all.win32.bat b/make/scripts/make.gluegen.all.win32.bat
index 32b75c2..69ba4c3 100755
--- a/make/scripts/make.gluegen.all.win32.bat
+++ b/make/scripts/make.gluegen.all.win32.bat
@@ -1,7 +1,7 @@
 set THISDIR="C:\JOGL"

 

-set J2RE_HOME=c:\jre1.8.0_66_x32

-set JAVA_HOME=c:\jdk1.8.0_66_x32

+set J2RE_HOME=c:\jre8u202-b08_x32

+set JAVA_HOME=c:\jdk8u202-b08_x32

 set ANT_PATH=C:\apache-ant-1.9.4

 

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

diff --git a/make/scripts/make.gluegen.all.win64.bat b/make/scripts/make.gluegen.all.win64.bat
index 65429b5..41ed3d8 100755
--- a/make/scripts/make.gluegen.all.win64.bat
+++ b/make/scripts/make.gluegen.all.win64.bat
@@ -1,7 +1,7 @@
 set THISDIR="C:\JOGL"

 

-set J2RE_HOME=c:\jre1.8.0_66_x64

-set JAVA_HOME=c:\jdk1.8.0_66_x64

+set J2RE_HOME=c:\jre8u202-b08_x64

+set JAVA_HOME=c:\jdk8u202-b08_x64

 set ANT_PATH=C:\apache-ant-1.9.4

 set GIT_PATH=C:\cygwin\bin

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

diff --git a/make/scripts/setenv-build-jogl-x86.sh b/make/scripts/setenv-build-jogl-x86.sh
index 5c7bf65..61ad2e3 100644
--- a/make/scripts/setenv-build-jogl-x86.sh
+++ b/make/scripts/setenv-build-jogl-x86.sh
@@ -28,6 +28,16 @@ if [ ! -z "$J2RE_HOME" -a ! -z "$JAVA_HOME" ] ; then
 fi 
 
 if [ -z "$FOUND_JAVA" ] ; then
+    if [ -e /usr/lib/jvm/java-8-openjdk-i386 -a -e /usr/lib/jvm/java-8-openjdk-i386/jre ] ; then
+        J2RE_HOME=/usr/lib/jvm/java-8-openjdk-i386/jre
+        JAVA_HOME=/usr/lib/jvm/java-8-openjdk-i386
+        PATH=$J2RE_HOME/bin:$JAVA_HOME/bin:$PATH
+        export J2RE_HOME JAVA_HOME
+        FOUND_JAVA=1
+    fi 
+fi 
+
+if [ -z "$FOUND_JAVA" ] ; then
     if [ -e /opt-linux-x86/jre8 -a -e /opt-linux-x86/j2se8 ] ; then
         J2RE_HOME=/opt-linux-x86/jre8
         JAVA_HOME=/opt-linux-x86/j2se8
diff --git a/make/scripts/setenv-build-jogl-x86_64.sh b/make/scripts/setenv-build-jogl-x86_64.sh
index 6a009c5..8578cba 100644
--- a/make/scripts/setenv-build-jogl-x86_64.sh
+++ b/make/scripts/setenv-build-jogl-x86_64.sh
@@ -28,6 +28,16 @@ if [ ! -z "$J2RE_HOME" -a ! -z "$JAVA_HOME" ] ; then
 fi 
 
 if [ -z "$FOUND_JAVA" ] ; then
+    if [ -e /usr/lib/jvm/java-8-openjdk-amd64 -a -e /usr/lib/jvm/java-8-openjdk-amd64/jre ] ; then
+        J2RE_HOME=/usr/lib/jvm/java-8-openjdk-amd64/jre
+        JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64
+        PATH=$J2RE_HOME/bin:$JAVA_HOME/bin:$PATH
+        export J2RE_HOME JAVA_HOME
+        FOUND_JAVA=1
+    fi 
+fi 
+
+if [ -z "$FOUND_JAVA" ] ; then
     if [ -e /opt-linux-x86_64/jre8 -a -e /opt-linux-x86_64/j2se8 ] ; then
         J2RE_HOME=/opt-linux-x86_64/jre8
         JAVA_HOME=/opt-linux-x86_64/j2se8
diff --git a/make/scripts/test-win32-smb_share.bat b/make/scripts/test-win32-smb_share.bat
index ba04fb3..ce1ab1f 100755
--- a/make/scripts/test-win32-smb_share.bat
+++ b/make/scripts/test-win32-smb_share.bat
@@ -2,8 +2,8 @@
 set SMB_ROOT=\\risa.goethel.localnet\deployment\test\jogamp

 

 set BLD_SUB=build-win32

-set J2RE_HOME=c:\jre1.8.0_60_x32

-set JAVA_HOME=c:\jdk1.8.0_60_x32

+set J2RE_HOME=c:\jre8u202-b08_x32

+set JAVA_HOME=c:\jdk8u202-b08_x32

 set ANT_PATH=C:\apache-ant-1.9.4

 

 set PROJECT_ROOT=%SMB_ROOT%\gluegen