From 8f6ffa4e3f158509f3ed8c74c88a3e46723a6e0f Mon Sep 17 00:00:00 2001 From: Sven Gothel Date: Wed, 3 Apr 2019 10:55:00 +0200 Subject: Windows scripts: Use JDK/JRE 1.8.0_121 --- make/scripts/make.jogl.all.win32.bat | 6 +++--- make/scripts/make.jogl.all.win64.bat | 6 +++--- make/scripts/test-win32-smb_share.bat | 6 +++--- make/scripts/tests-javaws-x64.bat | 4 ++-- 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 +++--- make/scripts/tests.sh | 8 ++++---- 9 files changed, 27 insertions(+), 27 deletions(-) (limited to 'make/scripts') diff --git a/make/scripts/make.jogl.all.win32.bat b/make/scripts/make.jogl.all.win32.bat index 738d91931..fde4a19e5 100755 --- a/make/scripts/make.jogl.all.win32.bat +++ b/make/scripts/make.jogl.all.win32.bat @@ -1,10 +1,10 @@ set THISDIR="C:\JOGL" -set J2RE_HOME=c:\jre1.8.0_66_x32 -set JAVA_HOME=c:\jdk1.8.0_66_x32 +set J2RE_HOME=c:\jre1.8.0_121_x32 +set JAVA_HOME=c:\jdk1.8.0_121_x32 set ANT_PATH=C:\apache-ant-1.9.4 -set PATH=%JAVA_HOME%\bin;%ANT_PATH%\bin;c:\mingw\bin;%PATH% +set PATH=%J2RE_HOME%\bin;%JAVA_HOME%\bin;%ANT_PATH%\bin;c:\mingw\bin;%PATH% REM set LIB_GEN=%THISDIR%\lib REM set CLASSPATH=.;%THISDIR%\build-win32\classes diff --git a/make/scripts/make.jogl.all.win64.bat b/make/scripts/make.jogl.all.win64.bat index 5440d2290..a647466c1 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.8.0_66_x64 -set JAVA_HOME=c:\jdk1.8.0_66_x64 +set J2RE_HOME=c:\jre1.8.0_121_x64 +set JAVA_HOME=c:\jdk1.8.0_121_x64 set ANT_PATH=C:\apache-ant-1.9.4 -set PATH=%JAVA_HOME%\bin;%ANT_PATH%\bin;c:\mingw64\bin;%PATH% +set PATH=%J2RE_HOME%\bin;%JAVA_HOME%\bin;%ANT_PATH%\bin;c:\mingw64\bin;%PATH% REM set LIB_GEN=%THISDIR%\lib REM set CLASSPATH=.;%THISDIR%\build-win64\classes diff --git a/make/scripts/test-win32-smb_share.bat b/make/scripts/test-win32-smb_share.bat index 24a7e908a..8940a1560 100755 --- a/make/scripts/test-win32-smb_share.bat +++ b/make/scripts/test-win32-smb_share.bat @@ -2,8 +2,8 @@ set SMB_ROOT=\\risa.goethel.localnet\deployment\test\jogamp set BLD_SUB=build-win32 -set J2RE_HOME=c:\jre1.8.0_66_x32 -set JAVA_HOME=c:\jdk1.8.0_66_x32 +set J2RE_HOME=c:\jre1.8.0_121_x32 +set JAVA_HOME=c:\jdk1.8.0_121_x32 set ANT_PATH=C:\apache-ant-1.9.4 set PROJECT_ROOT=%SMB_ROOT%\jogl @@ -17,7 +17,7 @@ REM set PATH=%JAVA_HOME%\bin;%ANT_PATH%\bin;%PATH% REM set PATH=%JAVA_HOME%\bin;%ANT_PATH%\bin;%PROJECT_ROOT%\make\lib\external\angle\win32\20120127;%PATH% REM set PATH=%JAVA_HOME%\bin;%ANT_PATH%\bin;%PROJECT_ROOT%\make\lib\external\angle\win32\20121010-chrome;%PATH% REM set PATH=%JAVA_HOME%\bin;%ANT_PATH%\bin;%PROJECT_ROOT%\make\lib\external\PVRVFrame\OGLES-2.0\Windows_x86_32;%PATH% -set PATH=%JAVA_HOME%\bin;%ANT_PATH%\bin;%FFMPEG_LIB%;%PATH% +set PATH=%J2RE_HOME%\bin;%JAVA_HOME%\bin;%ANT_PATH%\bin;%FFMPEG_LIB%;%PATH% set D_ARGS="-Djogamp.debug=all" diff --git a/make/scripts/tests-javaws-x64.bat b/make/scripts/tests-javaws-x64.bat index 8b051912d..428d9ad6d 100755 --- a/make/scripts/tests-javaws-x64.bat +++ b/make/scripts/tests-javaws-x64.bat @@ -1,4 +1,4 @@ -set JRE_HOME=c:\jre1.8.0_66_x64\bin +set JRE_HOME=c:\jre1.8.0_121_x64 set LOG_PATH=%USERPROFILE%\AppData\LocalLow\Sun\Java\Deployment\log %JRE_PATH%\javaws -uninstall @@ -14,5 +14,5 @@ REM set X_FLAGS="-J-Dsun.java2d.noddraw=true" "-J-Dsun.awt.noerasebackground=tru REM set X_FLAGS="-J-verbose:jni" set X_FLAGS= -%JRE_PATH%\javaws %X_FLAGS% %D_FLAGS% http://risa/deployment/test/jau01s/jogl-demos/%JNLP% > tests-javaws.log 2>&1 +%JRE_HOME%\bin\javaws %X_FLAGS% %D_FLAGS% http://risa/deployment/test/jau01s/jogl-demos/%JNLP% > tests-javaws.log 2>&1 diff --git a/make/scripts/tests-x32-dbg.bat b/make/scripts/tests-x32-dbg.bat index 60a028e0a..bd5383a7b 100755 --- a/make/scripts/tests-x32-dbg.bat +++ b/make/scripts/tests-x32-dbg.bat @@ -5,8 +5,8 @@ REM set TEMP=C:\Documents and Settings\jogamp\temp REM set TMP=C:\Documents and Settings\jogamp\temp set BLD_SUB=build-win32 -set J2RE_HOME=c:\jre1.8.0_66_x32 -set JAVA_HOME=c:\jdk1.8.0_66_x32 +set J2RE_HOME=c:\jre1.8.0_121_x32 +set JAVA_HOME=c:\jdk1.8.0_121_x32 set ANT_PATH=C:\apache-ant-1.9.4 set PROJECT_ROOT=D:\projects\jogamp\jogl @@ -20,7 +20,7 @@ REM set PATH=%JAVA_HOME%\bin;%ANT_PATH%\bin;%PATH% REM set PATH=%JAVA_HOME%\bin;%ANT_PATH%\bin;%PROJECT_ROOT%\make\lib\external\angle\win32\20120127;%PATH% REM set PATH=%JAVA_HOME%\bin;%ANT_PATH%\bin;%PROJECT_ROOT%\make\lib\external\angle\win32\20121010-chrome;%PATH% REM set PATH=%JAVA_HOME%\bin;%ANT_PATH%\bin;%PROJECT_ROOT%\make\lib\external\PVRVFrame\OGLES-2.0\Windows_x86_32;%PATH% -set PATH=%JAVA_HOME%\bin;%ANT_PATH%\bin;%FFMPEG_LIB%;%PATH% +set PATH=%J2RE_HOME%\bin;%JAVA_HOME%\bin;%ANT_PATH%\bin;%FFMPEG_LIB%;%PATH% REM set LIB_DIR=%BLD_DIR%\lib;..\..\gluegen\%BLD_SUB%\obj set LIB_DIR= diff --git a/make/scripts/tests-x32.bat b/make/scripts/tests-x32.bat index 9c1f66926..54b085fad 100755 --- a/make/scripts/tests-x32.bat +++ b/make/scripts/tests-x32.bat @@ -1,7 +1,7 @@ set BLD_SUB=build-win32 -set J2RE_HOME=c:\jre1.8.0_66_x32 -set JAVA_HOME=c:\jdk1.8.0_66_x32 +set J2RE_HOME=c:\jre1.8.0_121_x32 +set JAVA_HOME=c:\jdk1.8.0_121_x32 set ANT_PATH=C:\apache-ant-1.9.4 REM set TEMP=C:\Documents and Settings\jogamp\temp @@ -20,7 +20,7 @@ REM set PATH=%JAVA_HOME%\bin;%ANT_PATH%\bin;%PATH% REM set PATH=%JAVA_HOME%\bin;%ANT_PATH%\bin;%PROJECT_ROOT%\make\lib\external\angle\win32\20120127;%PATH% REM set PATH=%JAVA_HOME%\bin;%ANT_PATH%\bin;%PROJECT_ROOT%\make\lib\external\angle\win32\20121010-chrome;%PATH% REM set PATH=%JAVA_HOME%\bin;%ANT_PATH%\bin;%PROJECT_ROOT%\make\lib\external\PVRVFrame\OGLES-2.0\Windows_x86_32;%PATH% -set PATH=%JAVA_HOME%\bin;%ANT_PATH%\bin;%FFMPEG_LIB%;%PATH% +set PATH=%J2RE_HOME%\bin;%JAVA_HOME%\bin;%ANT_PATH%\bin;%FFMPEG_LIB%;%PATH% set BLD_DIR=..\%BLD_SUB% REM set LIB_DIR=..\..\gluegen\%BLD_SUB%\obj;%BLD_DIR%\lib diff --git a/make/scripts/tests-x64-dbg.bat b/make/scripts/tests-x64-dbg.bat index 947aa987f..ce0754cfa 100755 --- a/make/scripts/tests-x64-dbg.bat +++ b/make/scripts/tests-x64-dbg.bat @@ -5,8 +5,8 @@ REM set TEMP=C:\Documents and Settings\jogamp\temp REM set TMP=C:\Documents and Settings\jogamp\temp set BLD_SUB=build-win64 -set J2RE_HOME=c:\jre1.8.0_66_x64 -set JAVA_HOME=c:\jdk1.8.0_66_x64 +set J2RE_HOME=c:\jre1.8.0_121_x64 +set JAVA_HOME=c:\jdk1.8.0_121_x64 set ANT_PATH=C:\apache-ant-1.9.4 set PROJECT_ROOT=D:\projects\jogamp\jogl @@ -19,7 +19,7 @@ REM set FFMPEG_LIB=C:\ffmpeg_libav\lavc54_lavf54_lavu52_lavr01-libav\x64 REM set PATH=%JAVA_HOME%\bin;%ANT_PATH%\bin;c:\mingw\bin;%PATH% REM set PATH=%JAVA_HOME%\bin;%ANT_PATH%\bin;%PROJECT_ROOT%\make\lib\external\PVRVFrame\OGLES-2.0\Windows_x86_64;%PATH% -set PATH=%JAVA_HOME%\bin;%ANT_PATH%\bin;%FFMPEG_LIB%;%PATH% +set PATH=%J2RE_HOME%\bin;%JAVA_HOME%\bin;%ANT_PATH%\bin;%FFMPEG_LIB%;%PATH% set CP_ALL=.;%BLD_DIR%\jar\jogl-all.jar;%BLD_DIR%\jar\atomic\oculusvr.jar;%BLD_DIR%\jar\jogl-test.jar;..\..\joal\%BLD_SUB%\joal.jar;..\..\gluegen\%BLD_SUB%\gluegen-rt.jar;..\..\gluegen\%BLD_SUB%\gluegen-test-util.jar;..\..\gluegen\make\lib\junit.jar;%ANT_PATH%\lib\ant.jar;%ANT_PATH%\lib\ant-junit.jar;%BLD_DIR%\..\make\lib\swt\win32-win32-x86_64\swt-debug.jar diff --git a/make/scripts/tests-x64.bat b/make/scripts/tests-x64.bat index 1d33bbc57..1b01a3748 100755 --- a/make/scripts/tests-x64.bat +++ b/make/scripts/tests-x64.bat @@ -1,7 +1,7 @@ set BLD_SUB=build-win64 -set J2RE_HOME=c:\jre1.8.0_66_x64 -set JAVA_HOME=c:\jdk1.8.0_66_x64 +set J2RE_HOME=c:\jre1.8.0_121_x64 +set JAVA_HOME=c:\jdk1.8.0_121_x64 set ANT_PATH=C:\apache-ant-1.9.4 REM set TEMP=C:\Documents and Settings\jogamp\temp @@ -15,7 +15,7 @@ set FFMPEG_LIB=C:\ffmpeg_libav\lavc55_lavf55_lavu52-ffmpeg-2013-10-09\x64 REM set FFMPEG_LIB=C:\ffmpeg_libav\lavc54_lavf54_lavu52_lavr01-libav\x64 REM set PATH=%JAVA_HOME%\bin;%ANT_PATH%\bin;%PROJECT_ROOT%\make\lib\external\PVRVFrame\OGLES-2.0\Windows_x86_64;%PATH% -set PATH=%JAVA_HOME%\bin;%ANT_PATH%\bin;%FFMPEG_LIB%;%PATH% +set PATH=%J2RE_HOME%\bin;%JAVA_HOME%\bin;%ANT_PATH%\bin;%FFMPEG_LIB%;%PATH% set BLD_DIR=..\%BLD_SUB% REM set LIB_DIR=%BLD_DIR%\lib;..\..\gluegen\%BLD_SUB%\obj diff --git a/make/scripts/tests.sh b/make/scripts/tests.sh index 7dc9354ec..50c010f2c 100644 --- a/make/scripts/tests.sh +++ b/make/scripts/tests.sh @@ -145,7 +145,7 @@ function jrun() { #D_ARGS="-Djogl.debug.GLSLCode -Djogl.debug.TraceGL" #D_ARGS="-Djogl.debug.GLSLCode -Djogl.debug.DebugGL" #D_ARGS="-Djogl.debug.GLContext -Dnativewindow.debug.JAWT -Dnewt.debug.Window" - #D_ARGS="-Dnativewindow.debug.JAWT -Djogl.debug.GLCanvas" + D_ARGS="-Dnativewindow.debug.JAWT -Djogl.debug.GLCanvas" #D_ARGS="-Dnativewindow.debug.JAWT -Djogamp.debug.TaskBase.TraceSource" #D_ARGS="-Dnativewindow.debug.JAWT" #D_ARGS="-Djogl.debug.GLContext.TraceSwitch" @@ -247,7 +247,7 @@ function jrun() { #D_ARGS="-Dnewt.debug.Window -Djogl.debug.Animator -Dnewt.debug.Screen" #D_ARGS="-Dnativewindow.debug.JAWT -Dnewt.debug.Window -Djogl.debug.GLJPanel -Djogl.debug.GLCanvas -Djogamp.debug.TempJarCache" #D_ARGS="-Dnewt.debug.Window.KeyEvent" - D_ARGS="-Dnewt.debug.Window.MouseEvent" + #D_ARGS="-Dnewt.debug.Window.MouseEvent" #D_ARGS="-Dnewt.debug.Window.MouseEvent -Dnewt.debug.Window.KeyEvent" #D_ARGS="-Dnewt.debug.Window -Dnativewindow.debug=all" #D_ARGS="-Dnewt.debug.Window -Dnativewindow.debug.JAWT -Djogl.debug.Animator" @@ -846,9 +846,9 @@ function testawtswt() { # JavaFX (testjfx) # #testjfx com.jogamp.opengl.test.junit.jogl.javafx.JFXStageGLChild01 $* -#testjfx com.jogamp.opengl.test.junit.jogl.javafx.TestNewtCanvasJFXGLn $* +testjfx com.jogamp.opengl.test.junit.jogl.javafx.TestNewtCanvasJFXGLn $* #testawt com.jogamp.opengl.test.junit.jogl.demos.es2.newt.TestGearsES2NewtCanvasAWT $* -testnoawt com.jogamp.opengl.test.junit.jogl.demos.es2.newt.TestGearsES2NEWT $* +#testnoawt com.jogamp.opengl.test.junit.jogl.demos.es2.newt.TestGearsES2NEWT $* #testawt com.jogamp.opengl.test.junit.jogl.demos.es2.awt.TestGearsES2AWT $* # -- cgit v1.2.3