From 235a64d1f2354fa15805d1759ff0b46c71338b4f Mon Sep 17 00:00:00 2001 From: Sven Gothel Date: Fri, 12 Dec 2014 17:18:42 +0100 Subject: test scripts: Bump JRE, add TEMP/TMP settings --- make/scripts/java-win32.bat | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) (limited to 'make/scripts/java-win32.bat') diff --git a/make/scripts/java-win32.bat b/make/scripts/java-win32.bat index 4cae57e..2441740 100755 --- a/make/scripts/java-win32.bat +++ b/make/scripts/java-win32.bat @@ -1,21 +1,23 @@ 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_25_x32 +set JAVA_HOME=c:\jdk1.8.0_25_x32 set ANT_PATH=C:\apache-ant-1.9.4 set BLD_DIR=..\%BLD_SUB% REM set LIB_DIR=..\%BLD_SUB%\obj;..\%BLD_SUB%\test\build\natives -set LIB_DIR=..\%BLD_SUB%\test\build\natives +REM set LIB_DIR=..\%BLD_SUB%\test\build\natives -set PATH=%JAVA_HOME%\bin;%ANT_PATH%\bin;c:\mingw\bin;%LIB_DIR%;%PATH% +REM set PATH=%JAVA_HOME%\bin;%ANT_PATH%\bin;c:\mingw\bin;%LIB_DIR%;%PATH% +set PATH=%JAVA_HOME%\bin;%ANT_PATH%\bin;c:\mingw\bin;%PATH% set CP_ALL=.;lib\junit.jar;%ANT_PATH%\lib\ant.jar;%ANT_PATH%\lib\ant-junit.jar;lib/semantic-versioning/semver.jar;%BLD_DIR%\gluegen-rt.jar;%BLD_DIR%\gluegen.jar;%BLD_DIR%\gluegen-test-util.jar;%BLD_DIR%\test\build\gluegen-test.jar echo CP_ALL %CP_ALL% -set D_ARGS="-Djogamp.debug.Platform" "-Djogamp.debug.NativeLibrary" +REM set D_ARGS="-Djogamp.debug.Platform" "-Djogamp.debug.NativeLibrary" REM set D_ARGS="-Djogamp.debug.IOUtil" -REM set D_ARGS="-Djogamp.debug=all" +set D_ARGS="-Djogamp.debug=all" -%J2RE_HOME%\bin\java -classpath %CP_ALL% %D_ARGS% "-Djava.library.path=%LIB_DIR%" "-Dsun.java2d.noddraw=true" "-Dsun.awt.noerasebackground=true" %1 %2 %3 %4 %5 %6 %7 %8 %9 > java-win32.log 2>&1 +REM %J2RE_HOME%\bin\java -classpath %CP_ALL% %D_ARGS% "-Djava.library.path=%LIB_DIR%" "-Dsun.java2d.noddraw=true" "-Dsun.awt.noerasebackground=true" %1 %2 %3 %4 %5 %6 %7 %8 %9 > java-win32.log 2>&1 +%J2RE_HOME%\bin\java -classpath %CP_ALL% %D_ARGS% "-Dsun.java2d.noddraw=true" "-Dsun.awt.noerasebackground=true" %1 %2 %3 %4 %5 %6 %7 %8 %9 > java-win32.log 2>&1 -- cgit v1.2.3