From 7d6f3f6da4edf52bd8f101d13de67964c3793af5 Mon Sep 17 00:00:00 2001 From: Sven Gothel Date: Thu, 28 Aug 2014 07:00:13 +0200 Subject: Scripts: Bump to java 1.7.0_67 and apache-ant 1.9.4 --- make/scripts/make.jocl.all.win32.bat | 6 +++--- make/scripts/make.jocl.all.win64.bat | 6 +++--- make/scripts/tests-x32.bat | 6 +++--- make/scripts/tests-x64.bat | 6 +++--- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/make/scripts/make.jocl.all.win32.bat b/make/scripts/make.jocl.all.win32.bat index d75d5e70..a8626e28 100755 --- a/make/scripts/make.jocl.all.win32.bat +++ b/make/scripts/make.jocl.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.jocl.all.win64.bat b/make/scripts/make.jocl.all.win64.bat index 56e200a0..9d8fc487 100755 --- a/make/scripts/make.jocl.all.win64.bat +++ b/make/scripts/make.jocl.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;c:\mingw\bin;%PATH% diff --git a/make/scripts/tests-x32.bat b/make/scripts/tests-x32.bat index 6aebd5a7..f6436a0d 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.bat b/make/scripts/tests-x64.bat index 2a480d9a..37c77537 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