aboutsummaryrefslogtreecommitdiffstats
path: root/make/scripts
diff options
context:
space:
mode:
Diffstat (limited to 'make/scripts')
-rwxr-xr-xmake/scripts/junit-linux-armv6hf-console.sh1
-rwxr-xr-xmake/scripts/junit-linux-x86_64-console.sh1
-rwxr-xr-xmake/scripts/make.jogl.all.linux-x86_64.sh1
-rwxr-xr-xmake/scripts/make.jogl.all.macosx.sh1
-rwxr-xr-xmake/scripts/make.jogl.all.win32.bat27
-rwxr-xr-xmake/scripts/make.jogl.all.win64.bat6
-rwxr-xr-xmake/scripts/test-win32-smb_share.bat33
-rwxr-xr-xmake/scripts/tests-javaws-x64.bat4
-rwxr-xr-xmake/scripts/tests-osx-aarch64.sh2
-rwxr-xr-xmake/scripts/tests-osx-x64.sh2
-rwxr-xr-xmake/scripts/tests-x32-dbg.bat60
-rwxr-xr-xmake/scripts/tests-x32.bat33
-rwxr-xr-xmake/scripts/tests-x64-dbg.bat8
-rwxr-xr-xmake/scripts/tests-x64.bat10
-rw-r--r--make/scripts/tests.sh24
15 files changed, 37 insertions, 176 deletions
diff --git a/make/scripts/junit-linux-armv6hf-console.sh b/make/scripts/junit-linux-armv6hf-console.sh
index 2c825e527..3cf6ab7bb 100755
--- a/make/scripts/junit-linux-armv6hf-console.sh
+++ b/make/scripts/junit-linux-armv6hf-console.sh
@@ -26,7 +26,6 @@ ant \
-Dsetup.noAWT=true \
-Dsetup.noSWT=true \
-Drootrel.build=build-linux-armv6hf \
- -Djunit.run.arg0="--illegal-access=warn" \
-Dsetup.addNativeKD=true \
-Dsetup.addNativeOpenMAX=true \
-Dsetup.addNativeBroadcom=true \
diff --git a/make/scripts/junit-linux-x86_64-console.sh b/make/scripts/junit-linux-x86_64-console.sh
index 2ef6a50d5..2f2d129e4 100755
--- a/make/scripts/junit-linux-x86_64-console.sh
+++ b/make/scripts/junit-linux-x86_64-console.sh
@@ -24,6 +24,5 @@ ant \
-Dsetup.noAWT=true \
-Dsetup.noSWT=true \
-Drootrel.build=build-x86_64 \
- -Djunit.run.arg0="--illegal-access=warn" \
$TARGET 2>&1 | tee -a $LOGF
diff --git a/make/scripts/make.jogl.all.linux-x86_64.sh b/make/scripts/make.jogl.all.linux-x86_64.sh
index 0b809aa18..f43112d25 100755
--- a/make/scripts/make.jogl.all.linux-x86_64.sh
+++ b/make/scripts/make.jogl.all.linux-x86_64.sh
@@ -61,6 +61,5 @@ export JOGAMP_JAR_CODEBASE="Codebase: *.goethel.localnet"
ant \
$CUSTOMLIBDIR \
-Drootrel.build=build-x86_64 \
- -Djunit.run.arg0="--illegal-access=warn" \
$* 2>&1 | tee -a $LOGF
diff --git a/make/scripts/make.jogl.all.macosx.sh b/make/scripts/make.jogl.all.macosx.sh
index 730be7028..2f470b6a9 100755
--- a/make/scripts/make.jogl.all.macosx.sh
+++ b/make/scripts/make.jogl.all.macosx.sh
@@ -24,5 +24,4 @@ export JOGAMP_JAR_CODEBASE="Codebase: *.goethel.localnet"
# BUILD_ARCHIVE=true \
ant \
-Drootrel.build=build-macosx \
- -Djunit.run.arg0="--illegal-access=warn" \
$* 2>&1 | tee make.jogl.all.macosx.log
diff --git a/make/scripts/make.jogl.all.win32.bat b/make/scripts/make.jogl.all.win32.bat
deleted file mode 100755
index 87cbab76f..000000000
--- a/make/scripts/make.jogl.all.win32.bat
+++ /dev/null
@@ -1,27 +0,0 @@
-set THISDIR="C:\JogAmp"
-
-set J2RE_HOME=c:\jre-17
-set JAVA_HOME=c:\jdk-17
-set ANT_PATH=C:\apache-ant-1.10.5
-set GIT_PATH=C:\cygwin64\bin
-set SEVENZIP=C:\Program Files\7-Zip
-
-set CMAKE_PATH=C:\cmake-3.15.2-win32-x86
-set CMAKE_C_COMPILER=c:\mingw32\bin\gcc
-
-set PATH=%J2RE_HOME%\bin;%JAVA_HOME%\bin;%ANT_PATH%\bin;c:\mingw32\bin;%CMAKE_PATH%\bin;%GIT_PATH%;%SEVENZIP%;%PATH%
-
-REM set LIB_GEN=%THISDIR%\lib
-REM set CLASSPATH=.;%THISDIR%\build-win32\classes
-REM -Dc.compiler.debug=true
-REM -Dsetup.addNativeOpenMAX=true
-REM -Dsetup.addNativeKD=true
-
-set SOURCE_LEVEL=1.8
-set TARGET_LEVEL=1.8
-set TARGET_RT_JAR=C:\jre1.8.0_212\lib\rt.jar
-
-REM set JOGAMP_JAR_CODEBASE=Codebase: *.jogamp.org
-set JOGAMP_JAR_CODEBASE=Codebase: *.goethel.localnet
-
-ant -Drootrel.build=build-win32 %1 %2 %3 %4 %5 %6 %7 %8 %9 > make.jogl.all.win32.log 2>&1
diff --git a/make/scripts/make.jogl.all.win64.bat b/make/scripts/make.jogl.all.win64.bat
index d9e404370..0bad3f6be 100755
--- a/make/scripts/make.jogl.all.win64.bat
+++ b/make/scripts/make.jogl.all.win64.bat
@@ -1,6 +1,6 @@
-set THISDIR="C:\JOGL"
+set THISDIR="C:\JogAmp"
-set J2RE_HOME=c:\jre-17
+set J2RE_HOME=c:\jdk-17
set JAVA_HOME=c:\jdk-17
set ANT_PATH=C:\apache-ant-1.10.5
set GIT_PATH=C:\cygwin64\bin
@@ -24,4 +24,4 @@ set TARGET_RT_JAR=C:\jre1.8.0_212\lib\rt.jar
REM set JOGAMP_JAR_CODEBASE=Codebase: *.jogamp.org
set JOGAMP_JAR_CODEBASE=Codebase: *.goethel.localnet
-ant -Drootrel.build=build-win64 "-Djunit.run.arg0=--illegal-access=warn" %1 %2 %3 %4 %5 %6 %7 %8 %9 > make.jogl.all.win64.log 2>&1
+ant -Drootrel.build=build-win64 %1 %2 %3 %4 %5 %6 %7 %8 %9 > make.jogl.all.win64.log 2>&1
diff --git a/make/scripts/test-win32-smb_share.bat b/make/scripts/test-win32-smb_share.bat
deleted file mode 100755
index deb8451ec..000000000
--- a/make/scripts/test-win32-smb_share.bat
+++ /dev/null
@@ -1,33 +0,0 @@
-
-set SMB_ROOT=\\risa.goethel.localnet\deployment\test\jogamp
-
-set J2RE_HOME=c:\jre-11.0.4+11_x32
-set JAVA_HOME=c:\jdk-11.0.4+11_x32
-set ANT_PATH=C:\apache-ant-1.10.5
-
-set BLD_SUB=build-win32
-set PROJECT_ROOT=%SMB_ROOT%\jogl
-set BLD_DIR=%PROJECT_ROOT%\%BLD_SUB%
-
-REM set FFMPEG_LIB=C:\ffmpeg_libav\lavc53_lavf53_lavu51-ffmpeg\x32
-set FFMPEG_LIB=C:\ffmpeg_libav\lavc55_lavf55_lavu52-ffmpeg\x32
-REM set FFMPEG_LIB=C:\ffmpeg_libav\lavc54_lavf54_lavu52_lavr01-libav\x32
-
-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=%J2RE_HOME%\bin;%JAVA_HOME%\bin;%ANT_PATH%\bin;%FFMPEG_LIB%;%PATH%
-
-set D_ARGS="-Djogamp.debug=all"
-
-REM set LIB_DIR=..\..\gluegen\%BLD_SUB%\obj;%BLD_DIR%\lib
-set LIB_DIR=
-
-set CP_ALL=.;%BLD_DIR%\jar\jogl-all.jar;%BLD_DIR%\jar\jogl-test.jar;%SMB_ROOT%\gluegen\%BLD_SUB%\gluegen-rt.jar;%SMB_ROOT%\gluegen\make\lib\junit.jar;%ANT_PATH%\lib\ant.jar;%ANT_PATH%\lib\ant-junit.jar;%BLD_DIR%\..\make\lib\swt\win32-win32-x86\swt.jar
-
-echo CP_ALL %CP_ALL%
-
-%J2RE_HOME%\bin\java -classpath %CP_ALL% %D_ARGS% %X_ARGS% com.jogamp.opengl.test.junit.jogl.demos.es2.newt.TestGearsES2NEWT -time 3000 > java-win.log 2>&1
-tail java-win.log
-
diff --git a/make/scripts/tests-javaws-x64.bat b/make/scripts/tests-javaws-x64.bat
index 7253c7cb4..f58e372d2 100755
--- a/make/scripts/tests-javaws-x64.bat
+++ b/make/scripts/tests-javaws-x64.bat
@@ -1,4 +1,6 @@
-set JRE_HOME=c:\jre-11.0.4+11_x64
+set JRE_HOME=c:\jdk-17
+set J2RE_HOME=c:\jdk-17
+set JAVA_HOME=c:\jdk-17
REM set JRE_HOME=c:\jre1.8.0_121_x64
set LOG_PATH=%USERPROFILE%\AppData\LocalLow\Sun\Java\Deployment\log
diff --git a/make/scripts/tests-osx-aarch64.sh b/make/scripts/tests-osx-aarch64.sh
index ad9e289e4..0d4998338 100755
--- a/make/scripts/tests-osx-aarch64.sh
+++ b/make/scripts/tests-osx-aarch64.sh
@@ -17,5 +17,5 @@ spath=`dirname $0`
ulimit -c unlimited
-. $spath/tests.sh $JAVA_HOME/bin/java --illegal-access=warn ../build-macosx $*
+. $spath/tests.sh $JAVA_HOME/bin/java -DummyArg ../build-macosx $*
diff --git a/make/scripts/tests-osx-x64.sh b/make/scripts/tests-osx-x64.sh
index 06b17df3c..7c95b5509 100755
--- a/make/scripts/tests-osx-x64.sh
+++ b/make/scripts/tests-osx-x64.sh
@@ -17,5 +17,5 @@ spath=`dirname $0`
ulimit -c unlimited
-. $spath/tests.sh $JAVA_HOME/bin/java --illegal-access=warn ../build-macosx $*
+. $spath/tests.sh $JAVA_HOME/bin/java -DummyArg ../build-macosx $*
diff --git a/make/scripts/tests-x32-dbg.bat b/make/scripts/tests-x32-dbg.bat
deleted file mode 100755
index 6eeff22a0..000000000
--- a/make/scripts/tests-x32-dbg.bat
+++ /dev/null
@@ -1,60 +0,0 @@
-
-set TEMP=\\jordan\data\Incoming\windows\temp
-set TMP=\\jordan\data\Incoming\windows\temp
-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:\jre-11.0.4+11_x32
-set JAVA_HOME=c:\jdk-11.0.4+11_x32
-set ANT_PATH=C:\apache-ant-1.10.5
-
-set PROJECT_ROOT=D:\projects\jogamp\jogl
-set BLD_DIR=..\%BLD_SUB%
-
-REM set FFMPEG_LIB=C:\ffmpeg_libav\lavc53_lavf53_lavu51-ffmpeg\x32
-set FFMPEG_LIB=C:\ffmpeg_libav\lavc55_lavf55_lavu52-ffmpeg\x32
-REM set FFMPEG_LIB=C:\ffmpeg_libav\lavc54_lavf54_lavu52_lavr01-libav\x32
-
-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=%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=
-
-set CP_ALL=.;%BLD_DIR%\jar\jogl-all.jar;%BLD_DIR%\jar\atomic\oculusvr.jar;%BLD_DIR%\jar\jogl-test.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\swt.jar
-
-echo CP_ALL %CP_ALL%
-
-REM set D_ARGS="-Djogl.debug.GLDrawable" "-Djogl.debug.GLContext" "-Djogl.debug.FBObject" "-Djogl.enable.ANGLE"
-REM set D_ARGS="-Djogl.debug.GLDrawable" "-Djogl.debug.EGLDrawableFactory.DontQuery"
-REM set D_ARGS="-Djogl.debug.GLDrawable" "-Djogl.debug.EGLDrawableFactory.QueryNativeTK"
-REM set D_ARGS="-Djogl.debug=all" "-Dnewt.debug=all" "-Dnativewindow.debug=all" "-Djogl.debug.windows.cpu_affinity_mode=0" "-Djogl.debug.GLContext.TraceSwitch" "-Djogl.debug.GLContext"
-REM set D_ARGS="-Djogl.debug=all" "-Dnewt.debug=all" "-Dnativewindow.debug=all" "-Djogl.debug.GLContext.TraceSwitch" "-Djogl.debug.GLContext"
-REM set D_ARGS="-Djogl.debug.GLDrawable" "-Djogl.debug.windows.cpu_affinity_mode=0"
-REM set D_ARGS="-Djogamp.debug.IOUtil" "-Djogl.debug.GLSLCode" "-Djogl.debug.GLMediaPlayer"
-REM set D_ARGS="-Djogamp.debug.IOUtil"
-set D_ARGS="-Djogl.debug.GLSLCode"
-REM set D_ARGS="-Djogl.debug.ExtensionAvailabilityCache" "-Djogl.debug=all" "-Dnewt.debug=all" "-Dnativewindow.debug=all" "-Djogamp.debug.ProcAddressHelper=true" "-Djogamp.debug.NativeLibrary=true" "-Djogamp.debug.NativeLibrary.Lookup=true"
-REM set D_ARGS="-Djogl.debug=all" "-Dnewt.debug=all" "-Dnativewindow.debug=all" "-Djogamp.debug.NativeLibrary=true"
-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="-Dnewt.debug.Window" "-Dnativewindow.debug.TraceLock"
-REM set D_ARGS="-Dnativewindow.debug.TraceLock"
-REM set D_ARGS="-Dnewt.debug.Window" "-Dnewt.debug.Display"
-set D_ARGS="-Djogl.debug=all" "-Dnativewindow.debug=all"
-set X_ARGS="--illegal-access=warn"
-REM set D_ARGS="-Djogl.debug=all"
-REM set D_ARGS="-Djogl.debug.DebugGL" "-Djogl.debug.TraceGL"
-REM set D_ARGS="-Djogl.debug.DebugGL" "-Djogl.debug.TraceGL" "-Djogl.debug=all"
-REM set D_ARGS="-Dnewt.debug.Window" "-Dnewt.debug.Display" "-Dnewt.test.Window.reparent.incompatible=true"
-REM set D_ARGS="-Dnewt.debug.Window.MouseEvent"
-REM set D_ARGS="-Dnewt.debug.Window.KeyEvent"
-REM set D_ARGS="-Djogl.debug.GLMediaPlayer" "-Djogl.debug.GLMediaPlayer.Native"
-REM set D_ARGS="-Xcheck:jni" "-Xint" "-verbose:jni"
-
-set X_ARGS="-Dsun.java2d.noddraw=true" "-Dsun.awt.noerasebackground=true"
-
-scripts\tests-win.bat %*
diff --git a/make/scripts/tests-x32.bat b/make/scripts/tests-x32.bat
deleted file mode 100755
index 9f50e0346..000000000
--- a/make/scripts/tests-x32.bat
+++ /dev/null
@@ -1,33 +0,0 @@
-
-set BLD_SUB=build-win32
-set J2RE_HOME=c:\jre-11.0.4+11_x32
-set JAVA_HOME=c:\jdk-11.0.4+11_x32
-set ANT_PATH=C:\apache-ant-1.10.5
-
-REM set TEMP=C:\Documents and Settings\jogamp\temp
-REM set TMP=C:\Documents and Settings\jogamp\temp
-REM set TEMP=C:\Users\jogamp\temp\no-exec
-REM set TMP=C:\Users\jogamp\temp\no-exec
-
-set PROJECT_ROOT=D:\projects\jogamp\jogl
-set BLD_DIR=..\%BLD_SUB%
-
-REM set FFMPEG_LIB=C:\ffmpeg_libav\lavc53_lavf53_lavu51-ffmpeg\x32
-set FFMPEG_LIB=C:\ffmpeg_libav\lavc55_lavf55_lavu52-ffmpeg\x32
-REM set FFMPEG_LIB=C:\ffmpeg_libav\lavc54_lavf54_lavu52_lavr01-libav\x32
-
-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=%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
-set LIB_DIR=
-
-set CP_ALL=.;%BLD_DIR%\jar\jogl-all.jar;%BLD_DIR%\jar\atomic\oculusvr.jar;%BLD_DIR%\jar\jogl-test.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\swt.jar
-
-echo CP_ALL %CP_ALL%
-
-scripts\tests-win.bat %*
diff --git a/make/scripts/tests-x64-dbg.bat b/make/scripts/tests-x64-dbg.bat
index 895dcd2ff..4e19bddd8 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:\jre-11.0.4+11_x64
-set JAVA_HOME=c:\jdk-11.0.4+11_x64
+set J2RE_HOME=c:\jdk-17
+set JAVA_HOME=c:\jdk-17
set ANT_PATH=C:\apache-ant-1.10.5
set PROJECT_ROOT=D:\projects\jogamp\jogl
@@ -98,5 +98,9 @@ REM set X_ARGS="-Dsun.java2d.noddraw=true" "-Dsun.java2d.opengl=true" "-Dsun.awt
REM set X_ARGS="-Dsun.java2d.noddraw=true" "-Dsun.java2d.d3d=false" "-Dsun.java2d.ddoffscreen=false" "-Dsun.java2d.gdiblit=false" "-Dsun.java2d.opengl=false" "-Dsun.awt.noerasebackground=true" "-Xms512m" "-Xmx1024m"
REM set X_ARGS="-Dsun.java2d.noddraw=true" "-Dsun.java2d.d3d=false" "-Dsun.java2d.ddoffscreen=false" "-Dsun.java2d.gdiblit=false" "-Dsun.java2d.opengl=true" "-Dsun.awt.noerasebackground=true" "-Xms512m" "-Xmx1024m"
+REM set MODULE_ARGS=--add-opens java.base/java.lang=ALL-UNNAMED --add-opens java.desktop/sun.awt=ALL-UNNAMED --add-opens java.desktop/sun.java2d=ALL-UNNAMED
+set MODULE_ARGS=--add-opens java.desktop/sun.awt=ALL-UNNAMED --add-opens java.desktop/sun.java2d=ALL-UNNAMED
+set X_ARGS="-Dsun.java2d.noddraw=true" "-Dsun.awt.noerasebackground=true" %MODULE_ARGS%
+
scripts\tests-win.bat %*
diff --git a/make/scripts/tests-x64.bat b/make/scripts/tests-x64.bat
index a7d474506..a2bc578a8 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:\jre-11.0.4+11_x64
-set JAVA_HOME=c:\jdk-11.0.4+11_x64
+set J2RE_HOME=c:\jdk-17
+set JAVA_HOME=c:\jdk-17
set ANT_PATH=C:\apache-ant-1.10.5
REM set TEMP=C:\Documents and Settings\jogamp\temp
@@ -16,7 +16,7 @@ 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=%J2RE_HOME%\bin;%JAVA_HOME%\bin;%ANT_PATH%\bin;%FFMPEG_LIB%;%PATH%
-set PATH=%J2RE_HOME%\bin;%JAVA_HOME%\bin;%ANT_PATH%\bin;C:\temp;%FFMPEG_LIB%;%PATH%
+REM set PATH=%J2RE_HOME%\bin;%JAVA_HOME%\bin;%ANT_PATH%\bin;C:\temp;%FFMPEG_LIB%;%PATH%
echo PATH %PATH%
set BLD_DIR=..\%BLD_SUB%
@@ -26,7 +26,9 @@ set LIB_DIR=
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.jar
echo CP_ALL %CP_ALL%
-set X_ARGS="-Dsun.java2d.noddraw=true" "-Dsun.awt.noerasebackground=true" "--illegal-access=warn"
+REM set MODULE_ARGS=--add-opens java.base/java.lang=ALL-UNNAMED --add-opens java.desktop/sun.awt=ALL-UNNAMED --add-opens java.desktop/sun.java2d=ALL-UNNAMED
+set MODULE_ARGS=--add-opens java.desktop/sun.awt=ALL-UNNAMED --add-opens java.desktop/sun.java2d=ALL-UNNAMED
+set X_ARGS="-Dsun.java2d.noddraw=true" "-Dsun.awt.noerasebackground=true" %MODULE_ARGS%
scripts\tests-win.bat %*
diff --git a/make/scripts/tests.sh b/make/scripts/tests.sh
index 41748eebd..d95d2babd 100644
--- a/make/scripts/tests.sh
+++ b/make/scripts/tests.sh
@@ -99,6 +99,10 @@ function jrun() {
swton=$1
shift
+ # MODULE_ARGS="--illegal-access=warn"
+ # MODULE_ARGS="--add-opens java.base/java.lang=ALL-UNNAMED --add-opens java.desktop/sun.awt=ALL-UNNAMED --add-opens java.desktop/sun.java2d=ALL-UNNAMED"
+ MODULE_ARGS="--add-opens java.desktop/sun.awt=ALL-UNNAMED --add-opens java.desktop/sun.java2d=ALL-UNNAMED"
+
#X_ARGS="-Dsun.java2d.noddraw=True -Dsun.java2d.opengl=True -Dsun.java2d.xrender=false"
#X_ARGS="-Dsun.java2d.noddraw=True -Dsun.java2d.opengl=false -Dsun.java2d.xrender=false"
#X_ARGS="-verbose:jni"
@@ -106,7 +110,6 @@ function jrun() {
#X_ARGS="-Xcheck:jni -verbose:jni"
#X_ARGS="-Xrs"
#X_ARGS="-Dsun.awt.disableMixing=true"
- #X_ARGS="--illegal-access=warn"
#D_ARGS="-Djogl.debug.GLProfile -Djogl.debug.GLContext"
#D_ARGS="-Dnativewindow.debug.OSXUtil.MainThreadChecker -Djogamp.common.utils.locks.Lock.timeout=600000"
@@ -156,7 +159,7 @@ function jrun() {
#D_ARGS="-Dnativewindow.debug=all -Djogl.debug=all -Dnewt.debug=all"
#D_ARGS="-Dnativewindow.debug.SWT"
- D_ARGS="-Dnativewindow.debug.SWT -Dnewt.debug.Window -Djogl.debug.GLCanvas"
+ #D_ARGS="-Dnativewindow.debug.SWT -Dnewt.debug.Window -Djogl.debug.GLCanvas -Dnewt.debug.EDT"
#D_ARGS="-Dnativewindow.debug.SWT -Dnewt.debug.Window -Djogl.debug.GLCanvas -Dswt.autoScale=200"
#export GDK_DPI_SCALE=2
#D_ARGS="-Dnativewindow.debug.SWT -Dnativewindow.debug.X11Util -Dnewt.debug.Window"
@@ -409,10 +412,10 @@ function jrun() {
# export __GL_THREADED_OPTIMIZATIONS=1
echo __GL_THREADED_OPTIMIZATIONS $__GL_THREADED_OPTIMIZATIONS
echo
- echo "$javaexe" $javaxargs $X_ARGS -cp $USE_CLASSPATH $D_ARGS $C_ARG $*
- #gdb --args "$javaexe" $javaxargs $X_ARGS -cp $USE_CLASSPATH $D_ARGS $C_ARG $*
- "$javaexe" $javaxargs $X_ARGS -cp $USE_CLASSPATH $D_ARGS $C_ARG $*
- #strace $javaexe $javaxargs $X_ARGS -cp $USE_CLASSPATH $D_ARGS $C_ARG $*
+ echo "$javaexe" $javaxargs $MODULE_ARGS $X_ARGS -cp $USE_CLASSPATH $D_ARGS $C_ARG $*
+ #gdb --args "$javaexe" $javaxargs $MODULE_ARGS $X_ARGS -cp $USE_CLASSPATH $D_ARGS $C_ARG $*
+ "$javaexe" $javaxargs $MODULE_ARGS $X_ARGS -cp $USE_CLASSPATH $D_ARGS $C_ARG $*
+ #strace $javaexe $javaxargs $MODULE_ARGS $X_ARGS -cp $USE_CLASSPATH $D_ARGS $C_ARG $*
echo
echo "Test End: $*"
echo
@@ -781,7 +784,7 @@ function testawtswt() {
#
#testswt com.jogamp.opengl.test.junit.jogl.swt.TestSWTAccessor01 $*
#testswt com.jogamp.opengl.test.junit.jogl.swt.TestSWTAccessor02NewtGLWindow $*
-testswt com.jogamp.opengl.test.junit.jogl.swt.TestNewtCanvasSWTGLn $*
+#testswt com.jogamp.opengl.test.junit.jogl.swt.TestNewtCanvasSWTGLn $*
#testswt com.jogamp.opengl.test.junit.jogl.swt.TestSWTJOGLGLCanvas01GLn $*
#testswt com.jogamp.opengl.test.junit.jogl.demos.es2.swt.TestGearsES2SWT $*
#testswt com.jogamp.opengl.test.junit.jogl.swt.TestSWTEclipseGLCanvas01GLn $*
@@ -797,8 +800,15 @@ testswt com.jogamp.opengl.test.junit.jogl.swt.TestNewtCanvasSWTGLn $*
#testawtswt com.jogamp.opengl.test.junit.jogl.swt.TestSWTJOGLGLCanvas01GLn $*
#testawtswt com.jogamp.opengl.test.junit.jogl.swt.TestNewtCanvasSWTGLn $*
#testawtswt com.jogamp.opengl.test.junit.jogl.swt.TestNewtCanvasSWTBug628ResizeDeadlockAWT $*
+#testawtswt com.jogamp.opengl.test.junit.newt.event.TestNewtEventModifiersNewtCanvasSWTAWT $*
#testawtswt com.jogamp.opengl.test.junit.jogl.swt.TestSWTBug643AsyncExec $*
+testawt com.jogamp.opengl.test.junit.jogl.demos.es2.awt.TestGearsES2AWT $*
+#testnoawt com.jogamp.opengl.test.junit.jogl.demos.es2.newt.TestGearsES2NEWT $*
+#testawt com.jogamp.opengl.test.junit.jogl.demos.es2.newt.TestGearsES2NEWT $*
+#testawt com.jogamp.opengl.test.junit.jogl.demos.es2.awt.TestGearsES2GLJPanelsAWT $*
+#testawt com.jogamp.opengl.test.junit.jogl.demos.es2.newt.TestGearsES2NewtCanvasAWT $*
+
#
# newt.awt (testawt)
#
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-15 02:53:14 +0000