Bump scripts to jre1.8.0_66

9 files changed, 19 insertions, 17 deletions

diff --git a/make/scripts/make.jogl.all.win32.bat b/make/scripts/make.jogl.all.win32.bat
index a62edda4f..738d91931 100755
--- a/make/scripts/make.jogl.all.win32.bat
+++ b/make/scripts/make.jogl.all.win32.bat
@@ -1,7 +1,7 @@
 set THISDIR="C:\JOGL"

 

-set J2RE_HOME=c:\jre1.8.0_60_x32

-set JAVA_HOME=c:\jdk1.8.0_60_x32

+set J2RE_HOME=c:\jre1.8.0_66_x32

+set JAVA_HOME=c:\jdk1.8.0_66_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.jogl.all.win64.bat b/make/scripts/make.jogl.all.win64.bat
index 57f3d750b..5440d2290 100755
--- a/make/scripts/make.jogl.all.win64.bat
+++ b/make/scripts/make.jogl.all.win64.bat
@@ -1,7 +1,7 @@
 set THISDIR="C:\JOGL"

 

-set J2RE_HOME=c:\jre1.8.0_60_x64

-set JAVA_HOME=c:\jdk1.8.0_60_x64

+set J2RE_HOME=c:\jre1.8.0_66_x64

+set JAVA_HOME=c:\jdk1.8.0_66_x64

 set ANT_PATH=C:\apache-ant-1.9.4

 

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

diff --git a/make/scripts/test-win32-smb_share.bat b/make/scripts/test-win32-smb_share.bat
index ff4b7dd76..24a7e908a 100755
--- a/make/scripts/test-win32-smb_share.bat
+++ b/make/scripts/test-win32-smb_share.bat
@@ -2,9 +2,9 @@
 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 ANT_PATH=C:\apache-ant-1.8.2

+set J2RE_HOME=c:\jre1.8.0_66_x32

+set JAVA_HOME=c:\jdk1.8.0_66_x32

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

 

 set PROJECT_ROOT=%SMB_ROOT%\jogl

 set BLD_DIR=%PROJECT_ROOT%\%BLD_SUB%

diff --git a/make/scripts/tests-javaws-x64.bat b/make/scripts/tests-javaws-x64.bat
index 86974b767..8b051912d 100755
--- a/make/scripts/tests-javaws-x64.bat
+++ b/make/scripts/tests-javaws-x64.bat
@@ -1,4 +1,4 @@
-set JRE_PATH=C:\jre1.8.0_60_x64\bin
+set JRE_HOME=c:\jre1.8.0_66_x64\bin
 set LOG_PATH=%USERPROFILE%\AppData\LocalLow\Sun\Java\Deployment\log
 
 %JRE_PATH%\javaws -uninstall
diff --git a/make/scripts/tests-x32-dbg.bat b/make/scripts/tests-x32-dbg.bat
index ffcf9e19f..60a028e0a 100755
--- a/make/scripts/tests-x32-dbg.bat
+++ b/make/scripts/tests-x32-dbg.bat
@@ -5,8 +5,8 @@ REM set TEMP=C:\Documents and Settings\jogamp\temp
 REM set TMP=C:\Documents and Settings\jogamp\temp

 

 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:\jre1.8.0_66_x32

+set JAVA_HOME=c:\jdk1.8.0_66_x32

 set ANT_PATH=C:\apache-ant-1.9.4

 

 set PROJECT_ROOT=D:\projects\jogamp\jogl

diff --git a/make/scripts/tests-x32.bat b/make/scripts/tests-x32.bat
index a2655e115..9c1f66926 100755
--- a/make/scripts/tests-x32.bat
+++ b/make/scripts/tests-x32.bat
@@ -1,7 +1,7 @@
 

 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:\jre1.8.0_66_x32

+set JAVA_HOME=c:\jdk1.8.0_66_x32

 set ANT_PATH=C:\apache-ant-1.9.4

 

 REM set TEMP=C:\Documents and Settings\jogamp\temp

diff --git a/make/scripts/tests-x64-dbg.bat b/make/scripts/tests-x64-dbg.bat
index 40188a54d..0bb7d24da 100755
--- a/make/scripts/tests-x64-dbg.bat
+++ b/make/scripts/tests-x64-dbg.bat
@@ -5,8 +5,8 @@ REM set TEMP=C:\Documents and Settings\jogamp\temp
 REM set TMP=C:\Documents and Settings\jogamp\temp

 

 set BLD_SUB=build-win64

-set J2RE_HOME=c:\jre1.8.0_60_x64

-set JAVA_HOME=c:\jdk1.8.0_60_x64

+set J2RE_HOME=c:\jre1.8.0_66_x64

+set JAVA_HOME=c:\jdk1.8.0_66_x64

 set ANT_PATH=C:\apache-ant-1.9.4

 

 set PROJECT_ROOT=D:\projects\jogamp\jogl

diff --git a/make/scripts/tests-x64.bat b/make/scripts/tests-x64.bat
index 1a7f8a4b9..1d33bbc57 100755
--- a/make/scripts/tests-x64.bat
+++ b/make/scripts/tests-x64.bat
@@ -1,7 +1,7 @@
 

 set BLD_SUB=build-win64

-set J2RE_HOME=c:\jre1.8.0_60_x64

-set JAVA_HOME=c:\jdk1.8.0_60_x64

+set J2RE_HOME=c:\jre1.8.0_66_x64

+set JAVA_HOME=c:\jdk1.8.0_66_x64

 set ANT_PATH=C:\apache-ant-1.9.4

 

 REM set TEMP=C:\Documents and Settings\jogamp\temp

diff --git a/make/scripts/tests.sh b/make/scripts/tests.sh
index d721def3f..a5ac7c844 100644
--- a/make/scripts/tests.sh
+++ b/make/scripts/tests.sh
@@ -317,7 +317,9 @@ function jrun() {
     #D_ARGS="-Djogamp.debug.IOUtil -Djogl.debug.GLSLCode -Djogl.debug.GLMediaPlayer"
     #D_ARGS="-Djogl.debug.AudioSink -Djoal.openal.lib=system"
     #D_ARGS="-Djogl.debug.AudioSink -Djogl.debug.AudioSink.trace"
-    #D_ARGS="-Djogl.debug.AudioSink -Djogl.debug.GLMediaPlayer"
+    #D_ARGS="-Djogamp.debug.NativeLibrary -Djogamp.debug.NativeLibrary.Lookup -Djogamp.debug.JNILibLoader -Djogl.debug.AudioSink -Djogl.debug.GLMediaPlayer"
+    #D_ARGS="-Djogamp.debug.NativeLibrary -Djogl.debug.AudioSink"
+    #D_ARGS="-Djogamp.debug.NativeLibrary -Djogl.debug.AudioSink -Djoal.openal.lib=system"
     #D_ARGS="-Djogl.debug.GLMediaPlayer -Djogl.debug.GLMediaPlayer.Native"
     #D_ARGS="-Djogl.debug.GLMediaPlayer -Djogl.debug.GLSLCode"
     #D_ARGS="-Djogl.debug.GLMediaPlayer.StreamWorker.delay=25 -Djogl.debug.GLMediaPlayer"