From b72ac8efaca45241a44dd631acb20a8c23ea2a7b Mon Sep 17 00:00:00 2001 From: Sven Gothel Date: Wed, 30 Nov 2011 12:05:56 +0100 Subject: Windows: Bump JVM to 6u29 --- make/scripts/java-win32-dbg.bat | 4 ++-- make/scripts/java-win32.bat | 4 ++-- make/scripts/java-win64-dbg.bat | 4 ++-- make/scripts/java-win64.bat | 4 ++-- make/scripts/make.jogl.all.win32.bat | 4 ++-- make/scripts/make.jogl.all.win64.bat | 4 ++-- make/scripts/tests-javaws-x64.bat | 2 +- 7 files changed, 13 insertions(+), 13 deletions(-) (limited to 'make/scripts') diff --git a/make/scripts/java-win32-dbg.bat b/make/scripts/java-win32-dbg.bat index c97dd20d1..09c70eb2e 100755 --- a/make/scripts/java-win32-dbg.bat +++ b/make/scripts/java-win32-dbg.bat @@ -1,7 +1,7 @@ set BLD_SUB=build-win32 -set J2RE_HOME=c:\jre1.6.0_26_x32 -set JAVA_HOME=c:\jdk1.6.0_26_x32 +set J2RE_HOME=c:\jre1.6.0_29_x32 +set JAVA_HOME=c:\jdk1.6.0_29_x32 set ANT_PATH=C:\apache-ant-1.8.2 set PATH=%JAVA_HOME%\bin;%ANT_PATH%\bin;c:\mingw\bin;%PATH% diff --git a/make/scripts/java-win32.bat b/make/scripts/java-win32.bat index 280818c67..536c3f2c6 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.6.0_26_x32 -set JAVA_HOME=c:\jdk1.6.0_26_x32 +set J2RE_HOME=c:\jre1.6.0_29_x32 +set JAVA_HOME=c:\jdk1.6.0_29_x32 set ANT_PATH=C:\apache-ant-1.8.2 set PATH=%JAVA_HOME%\bin;%ANT_PATH%\bin;c:\mingw\bin;%PATH% diff --git a/make/scripts/java-win64-dbg.bat b/make/scripts/java-win64-dbg.bat index 1c2ba1743..a195d7230 100755 --- a/make/scripts/java-win64-dbg.bat +++ b/make/scripts/java-win64-dbg.bat @@ -1,7 +1,7 @@ set BLD_SUB=build-win64 -set J2RE_HOME=c:\jre1.6.0_26_x64 -set JAVA_HOME=c:\jdk1.6.0_26_x64 +set J2RE_HOME=c:\jre1.6.0_29_x64 +set JAVA_HOME=c:\jdk1.6.0_29_x64 set ANT_PATH=C:\apache-ant-1.8.2 set PATH=%JAVA_HOME%\bin;%ANT_PATH%\bin;c:\mingw\bin;%PATH% diff --git a/make/scripts/java-win64.bat b/make/scripts/java-win64.bat index 5e9af91c1..d7d3b6afd 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.6.0_26_x64 -set JAVA_HOME=c:\jdk1.6.0_26_x64 +set J2RE_HOME=c:\jre1.6.0_29_x64 +set JAVA_HOME=c:\jdk1.6.0_29_x64 set ANT_PATH=C:\apache-ant-1.8.2 set PATH=%JAVA_HOME%\bin;%ANT_PATH%\bin;c:\mingw\bin;%PATH% diff --git a/make/scripts/make.jogl.all.win32.bat b/make/scripts/make.jogl.all.win32.bat index c9aac8331..5094f1afd 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.6.0_26_x32 -set JAVA_HOME=c:\jdk1.6.0_26_x32 +set J2RE_HOME=c:\jre1.6.0_29_x32 +set JAVA_HOME=c:\jdk1.6.0_29_x32 set ANT_PATH=C:\apache-ant-1.8.2 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 5b1b10a8e..de98972eb 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.6.0_26_x64 -set JAVA_HOME=c:\jdk1.6.0_26_x64 +set J2RE_HOME=c:\jre1.6.0_29_x64 +set JAVA_HOME=c:\jdk1.6.0_29_x64 set ANT_PATH=C:\apache-ant-1.8.2 set PATH=%JAVA_HOME%\bin;%ANT_PATH%\bin;c:\mingw64\bin;c:\mingw\bin;%PATH% diff --git a/make/scripts/tests-javaws-x64.bat b/make/scripts/tests-javaws-x64.bat index 23d01a2ff..1a67326e1 100755 --- a/make/scripts/tests-javaws-x64.bat +++ b/make/scripts/tests-javaws-x64.bat @@ -1,4 +1,4 @@ -set JRE_PATH=C:\jre1.6.0_26_x64\bin +set JRE_PATH=C:\jre1.6.0_29_x64\bin set LOG_PATH=%USERPROFILE%\AppData\LocalLow\Sun\Java\Deployment\log %JRE_PATH%\javaws -uninstall -- cgit v1.2.3