diff options
Diffstat (limited to 'make/scripts')
| -rwxr-xr-x | make/scripts/make.jogl.all.ios.amd64.sh | 2 | ||||
| -rwxr-xr-x | make/scripts/make.jogl.all.ios.arm64.sh | 2 | ||||
| -rwxr-xr-x | make/scripts/make.jogl.all.linux-x86_64.sh | 3 | ||||
| -rwxr-xr-x | make/scripts/make.jogl.all.macosx.sh | 9 | ||||
| -rwxr-xr-x | make/scripts/make.jogl.all.win32.bat | 4 | ||||
| -rwxr-xr-x | make/scripts/make.jogl.all.win64.bat | 4 | ||||
| -rwxr-xr-x | make/scripts/tests-osx-x64.sh | 9 | ||||
| -rw-r--r-- | make/scripts/tests.sh | 8 |
8 files changed, 21 insertions, 20 deletions
diff --git a/make/scripts/make.jogl.all.ios.amd64.sh b/make/scripts/make.jogl.all.ios.amd64.sh index 9ebb655e2..8e48335fa 100755 --- a/make/scripts/make.jogl.all.ios.amd64.sh +++ b/make/scripts/make.jogl.all.ios.amd64.sh @@ -12,7 +12,7 @@ fi export SDKROOT=iphonesimulator13.2 xcrun --show-sdk-path -JAVA_HOME=`/usr/libexec/java_home -version 11` +JAVA_HOME=`/usr/libexec/java_home -version 17` PATH=$JAVA_HOME/bin:$PATH export JAVA_HOME PATH which java diff --git a/make/scripts/make.jogl.all.ios.arm64.sh b/make/scripts/make.jogl.all.ios.arm64.sh index 1edae79d8..2dbf89fd0 100755 --- a/make/scripts/make.jogl.all.ios.arm64.sh +++ b/make/scripts/make.jogl.all.ios.arm64.sh @@ -12,7 +12,7 @@ fi export SDKROOT=iphoneos13.2 xcrun --show-sdk-path -JAVA_HOME=`/usr/libexec/java_home -version 11` +JAVA_HOME=`/usr/libexec/java_home -version 17` PATH=$JAVA_HOME/bin:$PATH export JAVA_HOME PATH which java diff --git a/make/scripts/make.jogl.all.linux-x86_64.sh b/make/scripts/make.jogl.all.linux-x86_64.sh index f4f9e97cc..0b809aa18 100755 --- a/make/scripts/make.jogl.all.linux-x86_64.sh +++ b/make/scripts/make.jogl.all.linux-x86_64.sh @@ -2,6 +2,9 @@ SDIR=`dirname $0` +# export J2RE_HOME=/usr/lib/jvm/java-11-openjdk-amd64 +# export JAVA_HOME=/usr/lib/jvm/java-11-openjdk-amd64 + if [ -e $SDIR/../../../gluegen/make/scripts/setenv-build-jogamp-x86_64.sh ] ; then . $SDIR/../../../gluegen/make/scripts/setenv-build-jogamp-x86_64.sh fi diff --git a/make/scripts/make.jogl.all.macosx.sh b/make/scripts/make.jogl.all.macosx.sh index d10652485..730be7028 100755 --- a/make/scripts/make.jogl.all.macosx.sh +++ b/make/scripts/make.jogl.all.macosx.sh @@ -4,17 +4,12 @@ if [ -e /usr/local/etc/profile.ant ] ; then . /usr/local/etc/profile.ant fi -# Force OSX SDK 10.6, if desired -# export SDKROOT=macosx10.6 - -#JAVA_HOME=`/usr/libexec/java_home` -JAVA_HOME=`/usr/libexec/java_home -version 11` -#JAVA_HOME=`/usr/libexec/java_home -version 1.8` +JAVA_HOME=`/usr/libexec/java_home -version 17` PATH=$JAVA_HOME/bin:$PATH export JAVA_HOME PATH - # -Dc.compiler.debug=true \ +# -Dc.compiler.optimise=none \ # -Djavacdebug="true" \ # -Djavacdebuglevel="source,lines,vars" \ # diff --git a/make/scripts/make.jogl.all.win32.bat b/make/scripts/make.jogl.all.win32.bat index cd885accb..87cbab76f 100755 --- a/make/scripts/make.jogl.all.win32.bat +++ b/make/scripts/make.jogl.all.win32.bat @@ -1,7 +1,7 @@ set THISDIR="C:\JogAmp"
-set J2RE_HOME=c:\jre-11.0.4+11_x32
-set JAVA_HOME=c:\jdk-11.0.4+11_x32
+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
diff --git a/make/scripts/make.jogl.all.win64.bat b/make/scripts/make.jogl.all.win64.bat index 0d40a859d..d9e404370 100755 --- a/make/scripts/make.jogl.all.win64.bat +++ b/make/scripts/make.jogl.all.win64.bat @@ -1,7 +1,7 @@ set THISDIR="C:\JOGL"
-set J2RE_HOME=c:\jre-11.0.4+11_x64
-set JAVA_HOME=c:\jdk-11.0.4+11_x64
+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
diff --git a/make/scripts/tests-osx-x64.sh b/make/scripts/tests-osx-x64.sh index 67f3aaa50..4f225b7c0 100755 --- a/make/scripts/tests-osx-x64.sh +++ b/make/scripts/tests-osx-x64.sh @@ -2,17 +2,20 @@ #export DYLD_LIBRARY_PATH=$HOME/ffmpeg-0.8_0.9/lib:$DYLD_LIBRARY_PATH #export DYLD_LIBRARY_PATH=$HOME/ffmpeg-2.2.3/lib:$DYLD_LIBRARY_PATH -export DYLD_LIBRARY_PATH=/usr/local/Cellar/ffmpeg/2.8/lib:$DYLD_LIBRARY_PATH +#export DYLD_LIBRARY_PATH=/usr/local/Cellar/ffmpeg/2.8/lib:$DYLD_LIBRARY_PATH #JAVA_HOME=`/usr/libexec/java_home` #JAVA_HOME=`/usr/libexec/java_home -version 1.8` -JAVA_HOME=`/usr/libexec/java_home -version 11` +#JAVA_HOME=`/usr/libexec/java_home -version 11` +JAVA_HOME=`/usr/libexec/java_home -version 17` PATH=$JAVA_HOME/bin:$PATH export JAVA_HOME PATH -export SWT_CLASSPATH=`pwd`/lib/swt/cocoa-macosx-x86_64/swt.jar +# export SWT_CLASSPATH=`pwd`/lib/swt/cocoa-macosx-x86_64/swt.jar spath=`dirname $0` +ulimit -c unlimited + . $spath/tests.sh $JAVA_HOME/bin/java --illegal-access=warn ../build-macosx $* diff --git a/make/scripts/tests.sh b/make/scripts/tests.sh index f503de734..eb602e6aa 100644 --- a/make/scripts/tests.sh +++ b/make/scripts/tests.sh @@ -122,7 +122,7 @@ function jrun() { #D_ARGS="-Djogl.quirks.force=NoDoubleBufferedPBuffer" #D_ARGS="-Dnativewindow.debug.GraphicsConfiguration" #D_ARGS="-Djogamp.common.utils.locks.Lock.timeout=600000" - D_ARGS="-Djogl.debug.Bug1398" + #D_ARGS="-Djogl.debug.Bug1398" #D_ARGS="-Djogamp.debug=all" #D_ARGS="-Dnativewindow.debug=all" @@ -495,10 +495,10 @@ function testawtswt() { #testawt com.jogamp.opengl.test.junit.jogl.demos.es2.newt.TestGearsES2NewtCanvasAWT $* #testawt com.jogamp.opengl.test.junit.jogl.demos.es2.newt.TestLandscapeES2NewtCanvasAWT $* #testnoawt com.jogamp.opengl.test.junit.jogl.demos.es2.newt.TestGearsES2NEWT $* +testawt com.jogamp.opengl.test.junit.jogl.demos.es2.newt.TestGearsES2NEWT $* +#testnoawtatomics com.jogamp.opengl.test.junit.jogl.demos.es2.newt.TestGearsES2NEWT $* #testnoawt com.jogamp.opengl.test.junit.jogl.demos.es2.newt.TestLandscapeES2NEWT $* #testnoawt com.jogamp.opengl.test.junit.jogl.demos.es2.newt.TestElektronenMultipliziererNEWT $* -#testnoawtatomics com.jogamp.opengl.test.junit.jogl.demos.es2.newt.TestGearsES2NEWT $* -#testnoawt com.jogamp.opengl.test.junit.jogl.demos.es2.newt.TestGearsES2NEWT $* #testnoawt com.jogamp.opengl.test.junit.jogl.demos.es2.newt.TestRedSquareES2NEWT $* #testawt com.jogamp.opengl.test.junit.jogl.demos.gl2.awt.TestGearsAWT $* #testawt com.jogamp.opengl.test.junit.jogl.demos.gl2.awt.TestGearsAWTAnalyzeBug455 $* @@ -948,7 +948,7 @@ function testawtswt() { # OSX Bug 1398 #testswt com.jogamp.opengl.test.junit.jogl.demos.es2.newt.TestGearsES2NewtCanvasSWT $* #testnoawt com.jogamp.opengl.test.junit.jogl.glsl.TestGLSLShaderState02NEWT $* -testawt com.jogamp.opengl.test.junit.jogl.acore.TestBug1398Deadlock02AWT $* +#testawt com.jogamp.opengl.test.junit.jogl.acore.TestBug1398Deadlock02AWT $* # # to re-test: |