From e3226d16fc147dcad77e172538d09b62eee7e6d9 Mon Sep 17 00:00:00 2001 From: Sven Gothel Date: Thu, 28 Aug 2014 05:57:29 +0200 Subject: Scripts: Bump to java 1.7.0_67 and apache-ant 1.9.4 --- make/scripts/make.jogl.all.win32.bat | 6 +++--- make/scripts/make.jogl.all.win64.bat | 6 +++--- make/scripts/tests-javaws-x64.bat | 2 +- make/scripts/tests-win.bat | 6 +++--- make/scripts/tests-x32-dbg.bat | 6 +++--- make/scripts/tests-x32.bat | 6 +++--- make/scripts/tests-x64-dbg.bat | 6 +++--- make/scripts/tests-x64.bat | 6 +++--- 8 files changed, 22 insertions(+), 22 deletions(-) (limited to 'make/scripts') diff --git a/make/scripts/make.jogl.all.win32.bat b/make/scripts/make.jogl.all.win32.bat index 3e84d01af..97611d09c 100755 --- a/make/scripts/make.jogl.all.win32.bat +++ b/make/scripts/make.jogl.all.win32.bat @@ -1,8 +1,8 @@ set THISDIR="C:\JOGL" -set J2RE_HOME=c:\jre1.7.0_45_x32 -set JAVA_HOME=c:\jdk1.7.0_45_x32 -set ANT_PATH=C:\apache-ant-1.8.2 +set J2RE_HOME=c:\jre1.7.0_67_x32 +set JAVA_HOME=c:\jdk1.7.0_67_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 6efa62b61..ca480a708 100755 --- a/make/scripts/make.jogl.all.win64.bat +++ b/make/scripts/make.jogl.all.win64.bat @@ -1,8 +1,8 @@ set THISDIR="C:\JOGL" -set J2RE_HOME=c:\jre1.7.0_45_x64 -set JAVA_HOME=c:\jdk1.7.0_45_x64 -set ANT_PATH=C:\apache-ant-1.8.2 +set J2RE_HOME=c:\jre1.7.0_67_x64 +set JAVA_HOME=c:\jdk1.7.0_67_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/tests-javaws-x64.bat b/make/scripts/tests-javaws-x64.bat index 6186bc501..11e15754e 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_45_x64\bin +set JRE_PATH=C:\jre1.7.0_67_x64\bin set LOG_PATH=%USERPROFILE%\AppData\LocalLow\Sun\Java\Deployment\log %JRE_PATH%\javaws -uninstall diff --git a/make/scripts/tests-win.bat b/make/scripts/tests-win.bat index fb6e84773..a4561e984 100755 --- a/make/scripts/tests-win.bat +++ b/make/scripts/tests-win.bat @@ -1,5 +1,5 @@ REM scripts\java-win.bat jogamp.newt.awt.opengl.VersionApplet -REM scripts\java-win.bat com.jogamp.newt.opengl.GLWindow +scripts\java-win.bat com.jogamp.newt.opengl.GLWindow REM scripts\java-win.bat javax.media.opengl.awt.GLCanvas REM scripts\java-win.bat com.jogamp.opengl.test.junit.jogl.acore.TestMainVersionGLWindowNEWT %* REM scripts\java-win.bat com.jogamp.oculusvr.OVRVersion %* @@ -77,7 +77,7 @@ REM scripts\java-win.bat com.jogamp.opengl.test.junit.jogl.acore.TestFBOAutoDraw REM scripts\java-win.bat com.jogamp.opengl.test.junit.jogl.acore.TestGLProfile01NEWT %* REM scripts\java-win.bat com.jogamp.opengl.test.junit.jogl.acore.TestGLProfile02NEWT %* -scripts\java-win.bat com.jogamp.opengl.test.junit.jogl.acore.glels.TestGLContextDrawableSwitch02AWT %* +REM scripts\java-win.bat com.jogamp.opengl.test.junit.jogl.acore.glels.TestGLContextDrawableSwitch02AWT %* REM scripts\java-win.bat com.jogamp.opengl.test.junit.jogl.acore.TestGLContextDrawableSwitch01NEWT %* REM scripts\java-win.bat com.jogamp.opengl.test.junit.jogl.acore.TestGLContextDrawableSwitch11NEWT %* REM scripts\java-win.bat com.jogamp.opengl.test.junit.jogl.acore.TestGLDebug00NEWT %* @@ -184,7 +184,7 @@ REM scripts\java-win.bat testawt com.jogamp.opengl.test.junit.jogl.caps.TestMult REM scripts\java-win.bat testnoawt com.jogamp.opengl.test.junit.jogl.caps.TestMultisampleES1NEWT %* REM scripts\java-win.bat testnoawt com.jogamp.opengl.test.junit.jogl.caps.TestMultisampleES2NEWT %* REM scripts\java-win.bat testawt com.jogamp.opengl.test.junit.jogl.caps.TestTranslucencyAWT %* -scripts\java-win.bat com.jogamp.opengl.test.junit.jogl.caps.TestTranslucencyNEWT %* +REM scripts\java-win.bat com.jogamp.opengl.test.junit.jogl.caps.TestTranslucencyNEWT %* REM scripts\java-win.bat com.jogamp.opengl.test.junit.newt.parenting.TestTranslucentChildWindowBug632NEWT %* REM scripts\java-win.bat com.jogamp.opengl.test.junit.jogl.awt.TestBug461OffscreenSupersamplingSwingAWT diff --git a/make/scripts/tests-x32-dbg.bat b/make/scripts/tests-x32-dbg.bat index a37dd7b7b..01266effe 100755 --- a/make/scripts/tests-x32-dbg.bat +++ b/make/scripts/tests-x32-dbg.bat @@ -1,8 +1,8 @@ set BLD_SUB=build-win32 -set J2RE_HOME=c:\jre1.7.0_45_x32 -set JAVA_HOME=c:\jdk1.7.0_45_x32 -set ANT_PATH=C:\apache-ant-1.8.2 +set J2RE_HOME=c:\jre1.7.0_67_x32 +set JAVA_HOME=c:\jdk1.7.0_67_x32 +set ANT_PATH=C:\apache-ant-1.9.4 set PROJECT_ROOT=D:\projects\jogamp\jogl set BLD_DIR=..\%BLD_SUB% diff --git a/make/scripts/tests-x32.bat b/make/scripts/tests-x32.bat index 4111385eb..4fdf320ae 100755 --- a/make/scripts/tests-x32.bat +++ b/make/scripts/tests-x32.bat @@ -1,8 +1,8 @@ set BLD_SUB=build-win32 -set J2RE_HOME=c:\jre1.7.0_45_x32 -set JAVA_HOME=c:\jdk1.7.0_45_x32 -set ANT_PATH=C:\apache-ant-1.8.2 +set J2RE_HOME=c:\jre1.7.0_67_x32 +set JAVA_HOME=c:\jdk1.7.0_67_x32 +set ANT_PATH=C:\apache-ant-1.9.4 set PROJECT_ROOT=D:\projects\jogamp\jogl set BLD_DIR=..\%BLD_SUB% diff --git a/make/scripts/tests-x64-dbg.bat b/make/scripts/tests-x64-dbg.bat index f18072b4b..ed7f8c89e 100755 --- a/make/scripts/tests-x64-dbg.bat +++ b/make/scripts/tests-x64-dbg.bat @@ -1,8 +1,8 @@ set BLD_SUB=build-win64 -set J2RE_HOME=c:\jre1.7.0_45_x64 -set JAVA_HOME=c:\jdk1.7.0_45_x64 -set ANT_PATH=C:\apache-ant-1.8.2 +set J2RE_HOME=c:\jre1.7.0_67_x64 +set JAVA_HOME=c:\jdk1.7.0_67_x64 +set ANT_PATH=C:\apache-ant-1.9.4 set PROJECT_ROOT=D:\projects\jogamp\jogl set BLD_DIR=..\%BLD_SUB% diff --git a/make/scripts/tests-x64.bat b/make/scripts/tests-x64.bat index f13ea2e6e..0a6365444 100755 --- a/make/scripts/tests-x64.bat +++ b/make/scripts/tests-x64.bat @@ -1,8 +1,8 @@ set BLD_SUB=build-win64 -set J2RE_HOME=c:\jre1.7.0_45_x64 -set JAVA_HOME=c:\jdk1.7.0_45_x64 -set ANT_PATH=C:\apache-ant-1.8.2 +set J2RE_HOME=c:\jre1.7.0_67_x64 +set JAVA_HOME=c:\jdk1.7.0_67_x64 +set ANT_PATH=C:\apache-ant-1.9.4 REM set FFMPEG_LIB=C:\ffmpeg_libav\lavc53_lavf53_lavu51-ffmpeg\x64 REM set FFMPEG_LIB=C:\ffmpeg_libav\lavc55_lavf55_lavu52-ffmpeg\x64 -- cgit v1.2.3