Windows Scripts: Bump JVM to 1.8.0_60

8 files changed, 15 insertions, 15 deletions

diff --git a/make/scripts/make.jogl.all.win32.bat b/make/scripts/make.jogl.all.win32.bat
index 0f1198c10..a62edda4f 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_25_x32

-set JAVA_HOME=c:\jdk1.8.0_25_x32

+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.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 6b20a710d..57f3d750b 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_25_x64

-set JAVA_HOME=c:\jdk1.8.0_25_x64

+set J2RE_HOME=c:\jre1.8.0_60_x64

+set JAVA_HOME=c:\jdk1.8.0_60_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 d0166768a..ff4b7dd76 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.7.0_45_x32

-set JAVA_HOME=c:\jdk1.7.0_45_x32

+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 PROJECT_ROOT=%SMB_ROOT%\jogl

diff --git a/make/scripts/tests-javaws-x64.bat b/make/scripts/tests-javaws-x64.bat
index 11e15754e..86974b767 100755
--- a/make/scripts/tests-javaws-x64.bat
+++ b/make/scripts/tests-javaws-x64.bat
@@ -1,4 +1,4 @@
-set JRE_PATH=C:\jre1.7.0_67_x64\bin
+set JRE_PATH=C:\jre1.8.0_60_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 c89eee449..ffcf9e19f 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.7.0_67_x32

-set JAVA_HOME=c:\jdk1.7.0_67_x32

+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.9.4

 

 set PROJECT_ROOT=D:\projects\jogamp\jogl

diff --git a/make/scripts/tests-x32.bat b/make/scripts/tests-x32.bat
index 893215fce..a2655e115 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.7.0_67_x32

-set JAVA_HOME=c:\jdk1.7.0_67_x32

+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.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 5b522672a..40188a54d 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.7.0_67_x64

-set JAVA_HOME=c:\jdk1.7.0_67_x64

+set J2RE_HOME=c:\jre1.8.0_60_x64

+set JAVA_HOME=c:\jdk1.8.0_60_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 049dc1d99..1a7f8a4b9 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.7.0_67_x64

-set JAVA_HOME=c:\jdk1.7.0_67_x64

+set J2RE_HOME=c:\jre1.8.0_60_x64

+set JAVA_HOME=c:\jdk1.8.0_60_x64

 set ANT_PATH=C:\apache-ant-1.9.4

 

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