Windows scripts: bump to 1.6.0_35

7 files changed, 16 insertions, 16 deletions

diff --git a/make/scripts/java-win32-dbg.bat b/make/scripts/java-win32-dbg.bat
index 5735797bf..c592efccf 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_30_x32

-set JAVA_HOME=c:\jdk1.6.0_30_x32

+set J2RE_HOME=c:\jre1.6.0_35_x32

+set JAVA_HOME=c:\jdk1.6.0_35_x32

 set ANT_PATH=C:\apache-ant-1.8.2

 

 set PROJECT_ROOT=D:\projects\jogamp\jogl

diff --git a/make/scripts/java-win32.bat b/make/scripts/java-win32.bat
index a4d631075..bf7437146 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_30_x32

-set JAVA_HOME=c:\jdk1.6.0_30_x32

+set J2RE_HOME=c:\jre1.6.0_35_x32

+set JAVA_HOME=c:\jdk1.6.0_35_x32

 set ANT_PATH=C:\apache-ant-1.8.2

 

 set PROJECT_ROOT=D:\projects\jogamp\jogl

diff --git a/make/scripts/java-win64-dbg.bat b/make/scripts/java-win64-dbg.bat
index c8a90454d..510ebf4dc 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_30_x64

-set JAVA_HOME=c:\jdk1.6.0_30_x64

+set J2RE_HOME=c:\jre1.6.0_35_x64

+set JAVA_HOME=c:\jdk1.6.0_35_x64

 set ANT_PATH=C:\apache-ant-1.8.2

 

 set PROJECT_ROOT=D:\projects\jogamp\jogl

@@ -32,12 +32,12 @@ REM set D_ARGS="-Djogl.debug.GLContext" "-Djogl.debug.ExtensionAvailabilityCache
 REM set D_ARGS="-Djogl.debug.GraphicsConfiguration"

 REM set D_ARGS="-Djogamp.debug.JNILibLoader=true" "-Djogamp.debug.NativeLibrary=true" "-Djogamp.debug.NativeLibrary.Lookup=true" "-Djogl.debug.GLProfile=true"

 REM set D_ARGS="-Djogl.debug=all" "-Dnewt.debug=all" "-Dnativewindow.debug=all" "-Djogamp.debug.Lock" "-Djogamp.debug.Lock.TraceLock"

-REM set D_ARGS="-Djogl.debug=all" "-Dnativewindow.debug=all"

+set D_ARGS="-Djogl.debug=all" "-Dnativewindow.debug=all"

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

 REM set D_ARGS="-Djogl.debug.GLCanvas" "-Djogl.debug.Animator" "-Djogl.debug.GLContext" "-Djogl.debug.GLContext.TraceSwitch" "-Djogl.debug.DebugGL" "-Djogl.debug.TraceGL"

 REM set D_ARGS="-Djogl.debug.GLCanvas" "-Djogl.debug.Animator" "-Djogl.debug.GLContext" "-Djogl.debug.GLContext.TraceSwitch" "-Djogl.windows.useWGLVersionOf5WGLGDIFuncSet"

 REM set D_ARGS="-Djogl.debug.GLCanvas" "-Djogl.debug.Animator" "-Djogl.debug.GLContext" "-Djogl.debug.GLContext.TraceSwitch"

-set D_ARGS="-Dnewt.debug.Window" "-Dnewt.debug.Display"

+REM set D_ARGS="-Dnewt.debug.Window" "-Dnewt.debug.Display"

 REM set D_ARGS="-Djogl.debug.GLDebugMessageHandler" "-Djogl.debug.DebugGL" "-Djogl.debug.TraceGL"

 REM set D_ARGS="-Djogl.debug.DebugGL" "-Djogl.debug.GLDebugMessageHandler" "-Djogl.debug.GLSLCode"

 REM set D_ARGS="-Djogl.debug.GLContext" "-Dnewt.debug=all"

diff --git a/make/scripts/java-win64.bat b/make/scripts/java-win64.bat
index 2c09feedc..99f9bdcef 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_30_x64

-set JAVA_HOME=c:\jdk1.6.0_30_x64

+set J2RE_HOME=c:\jre1.6.0_35_x64

+set JAVA_HOME=c:\jdk1.6.0_35_x64

 set ANT_PATH=C:\apache-ant-1.8.2

 

 REM 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 52ea33a33..c4c80a75b 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_30_x32

-set JAVA_HOME=c:\jdk1.6.0_30_x32

+set J2RE_HOME=c:\jre1.6.0_35_x32

+set JAVA_HOME=c:\jdk1.6.0_35_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 e1d258cca..7355c6a1a 100755
--- a/make/scripts/make.jogl.all.win64.bat
+++ b/make/scripts/make.jogl.all.win64.bat
@@ -1,10 +1,10 @@
 set THISDIR="C:\JOGL"

 

-set J2RE_HOME=c:\jre1.6.0_30_x64

-set JAVA_HOME=c:\jdk1.6.0_30_x64

+set J2RE_HOME=c:\jre1.6.0_35_x64

+set JAVA_HOME=c:\jdk1.6.0_35_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%

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

 

 set LIB_GEN=%THISDIR%\lib

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

diff --git a/make/scripts/tests-javaws-x64.bat b/make/scripts/tests-javaws-x64.bat
index 40f118268..deef4ca37 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_30_x64\bin
+set JRE_PATH=C:\jre1.6.0_35_x64\bin
 set LOG_PATH=%USERPROFILE%\AppData\LocalLow\Sun\Java\Deployment\log
 
 %JRE_PATH%\javaws -uninstall