diff options
Diffstat (limited to 'make')
| -rw-r--r-- | make/build-common.xml | 6 | ||||
| -rw-r--r-- | make/build-newt.xml | 12 | ||||
| -rwxr-xr-x | make/scripts/tests-osx-x32.sh | 12 | ||||
| -rwxr-xr-x | make/scripts/tests-osx-x64-java6.sh | 10 | ||||
| -rwxr-xr-x | make/scripts/tests-win.bat | 5 | ||||
| -rwxr-xr-x | make/scripts/tests-x64-dbg.bat | 3 | ||||
| -rw-r--r-- | make/scripts/tests.sh | 12 |
7 files changed, 48 insertions, 12 deletions
diff --git a/make/build-common.xml b/make/build-common.xml index 1d408a057..88c876e5d 100644 --- a/make/build-common.xml +++ b/make/build-common.xml @@ -180,7 +180,10 @@ <echo message="swt.jar=${swt.jar}" /> <property name="plugin3.jar" value="${project.root}/make/lib/plugin3/plugin3-public.jar"/> - <echo message="plugin3.jar=${plugin3.jar}" /> + <condition property="plugin3-jars.available"> + <available file="${plugin3.jar}"/> + </condition> + <echo message="plugin3-jars.available: ${plugin3-jars.available} ${plugin3.jar}" /> <condition property="isSWTRuntimeAvailable"> <or> @@ -241,6 +244,7 @@ <condition property="oculusvr.sdk.available"> <available file="${rel.oculusvr.sdk}/LibOVR/Include/OVR_CAPI.h"/> </condition> + <echo message="oculusvr.sdk.available: ${oculusvr.sdk.available}" /> <property name="results.test" value="${build}/test/results" /> <property name="build.test" value="${build}/test/build" /> diff --git a/make/build-newt.xml b/make/build-newt.xml index 37e6b8bff..ec7a8a789 100644 --- a/make/build-newt.xml +++ b/make/build-newt.xml @@ -114,6 +114,9 @@ <property name="java.part.swt" value="com/jogamp/newt/swt/** jogamp/newt/swt/**"/> + <property name="java.part.applet3" + value="com/jogamp/newt/util/applet3/**"/> + <property name="java.part.driver.linux" value="jogamp/newt/driver/linux/**"/> @@ -153,11 +156,18 @@ <isset property="setup.noSWT"/> </condition> + <condition property="java.excludes.applet3" + value="${java.part.applet3}"> + <not> + <isset property="plugin3-jars.available"/> + </not> + </condition> + <condition property="java.excludes.opengl" value="${java.part.opengl}"> <isset property="setup.noOpenGL"/> </condition> - <property name="java.excludes.all" value="${java.excludes.awt}, ${java.excludes.swt}, ${java.excludes.opengl}" /> + <property name="java.excludes.all" value="${java.excludes.awt}, ${java.excludes.swt}, ${java.excludes.applet3}, ${java.excludes.opengl}" /> <echo message="java.excludes.all: ${java.excludes.all}" /> </target> diff --git a/make/scripts/tests-osx-x32.sh b/make/scripts/tests-osx-x32.sh index e7f4f01ef..12678d966 100755 --- a/make/scripts/tests-osx-x32.sh +++ b/make/scripts/tests-osx-x32.sh @@ -1,7 +1,17 @@ #! /bin/bash +#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 + +#JAVA_HOME=`/usr/libexec/java_home -version 1.8` +#JAVA_HOME=`/usr/libexec/java_home -version 1.7` +#JAVA_HOME=`/usr/libexec/java_home -version 1.7.0_25` +JAVA_HOME=`/usr/libexec/java_home -version 1.6.0` +PATH=$JAVA_HOME/bin:$PATH +export JAVA_HOME PATH + spath=`dirname $0` -. $spath/tests.sh /usr/bin/java -d32 ../build-macosx $* +. $spath/tests.sh $JAVA_HOME/bin/java -d32 ../build-macosx-java6 $* diff --git a/make/scripts/tests-osx-x64-java6.sh b/make/scripts/tests-osx-x64-java6.sh index b8190f0d7..93ca77a6b 100755 --- a/make/scripts/tests-osx-x64-java6.sh +++ b/make/scripts/tests-osx-x64-java6.sh @@ -1,12 +1,16 @@ #! /bin/bash -export DYLD_LIBRARY_PATH=/usr/local/libav:$DYLD_LIBRARY_PATH +#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 -JAVA_HOME=`/usr/libexec/java_home -version 1.6` +#JAVA_HOME=`/usr/libexec/java_home -version 1.8` +#JAVA_HOME=`/usr/libexec/java_home -version 1.7` +#JAVA_HOME=`/usr/libexec/java_home -version 1.7.0_25` +JAVA_HOME=`/usr/libexec/java_home -version 1.6.0` PATH=$JAVA_HOME/bin:$PATH export JAVA_HOME PATH spath=`dirname $0` -. $spath/tests.sh /usr/bin/java -d64 ../build-macosx $* +. $spath/tests.sh $JAVA_HOME/bin/java -d64 ../build-macosx-java6 $* diff --git a/make/scripts/tests-win.bat b/make/scripts/tests-win.bat index 0f73de53d..d91de44b7 100755 --- a/make/scripts/tests-win.bat +++ b/make/scripts/tests-win.bat @@ -59,6 +59,7 @@ REM scripts\java-win.bat com.jogamp.opengl.test.junit.jogl.acore.TestSharedConte REM scripts\java-win.bat com.jogamp.opengl.test.junit.jogl.acore.TestSharedContextVBOES2SWT3 %* REM scripts\java-win.bat com.jogamp.opengl.test.junit.jogl.acore.TestSharedContextNewtAWTBug523 %* REM scripts\java-win.bat com.jogamp.opengl.test.junit.jogl.acore.TestSharedContextListAWT %* +scripts\java-win.bat com.jogamp.opengl.test.junit.jogl.acore.TestSharedExternalContextAWT %* REM scripts\java-win.bat com.jogamp.opengl.test.junit.jogl.acore.TestFBOOffThreadSharedContextMix2DemosES2NEWT %* REM scripts\java-win.bat com.jogamp.opengl.test.junit.jogl.acore.TestFBOOnThreadSharedContext1DemoES2NEWT %* @@ -93,6 +94,8 @@ REM scripts\java-win.bat com.jogamp.opengl.test.junit.jogl.acore.TestMapBuffer01 REM scripts\java-win.bat com.jogamp.opengl.test.junit.jogl.acore.TestBug669RecursiveGLContext01NEWT %* REM scripts\java-win.bat com.jogamp.opengl.test.junit.jogl.acore.TestBug669RecursiveGLContext02NEWT %* REM scripts\java-win.bat com.jogamp.opengl.test.junit.jogl.acore.TestBug692GL3VAO %* +REM scripts\java-win.bat com.jogamp.opengl.test.junit.jogl.acore.TestBug1146GLContextDialogToolTipAWT %* + REM scripts\java-win.bat com.jogamp.opengl.test.junit.jogl.acore.ect.TestExclusiveContext01VSyncAnimNEWT %* REM scripts\java-win.bat com.jogamp.opengl.test.junit.jogl.acore.ect.TestExclusiveContext01VSyncAnimAWT %* REM scripts\java-win.bat com.jogamp.opengl.test.junit.jogl.acore.ect.TestExclusiveContext02FPSAnimNEWT %* @@ -221,4 +224,4 @@ REM scripts\java-win.bat com.jogamp.opengl.test.junit.graph.demos.GPUUISceneNewt REM scripts\java-win.bat com.jogamp.opengl.test.junit.jogl.awt.TestBug461FBOSupersamplingSwingAWT REM scripts\java-win.bat com.jogamp.opengl.test.junit.jogl.glsl.TestRulerNEWT01 -scripts\java-win.bat com.jogamp.opengl.test.junit.jogl.stereo.StereoDemo01 %* +REM scripts\java-win.bat com.jogamp.opengl.test.junit.jogl.stereo.StereoDemo01 %* diff --git a/make/scripts/tests-x64-dbg.bat b/make/scripts/tests-x64-dbg.bat index fdd7d50e9..ca625b2f1 100755 --- a/make/scripts/tests-x64-dbg.bat +++ b/make/scripts/tests-x64-dbg.bat @@ -31,11 +31,12 @@ REM set D_ARGS="-Djogl.debug=all" "-Dnewt.debug=all" "-Dnativewindow.debug=all" REM set D_ARGS="-Djogl.debug=all" "-Dnewt.debug=all" "-Dnativewindow.debug=all" "-Djogamp.debug=all" "-Djogl.debug.EGLDrawableFactory.DontQuery"
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"
+set D_ARGS="-Djogl.debug=all" "-Dnewt.debug=all" "-Dnativewindow.debug=all" "-Djogl.debug.GLContext"
REM set D_ARGS="-Djogl.disable.opengles"
REM set D_ARGS="-Djogl.disable.openglcore"
REM set D_ARGS="-Djogl.disable.openglarbcontext"
REM set D_ARGS="-Dnativewindow.debug.GDIUtil" "-Dnativewindow.debug.RegisteredClass"
-set D_ARGS="-Djogl.debug.GLContext"
+REM set D_ARGS="-Djogl.debug.GLContext"
REM set D_ARGS="-Djogl.debug.GLContext" "-Djogl.debug.FBObject"
REM set D_ARGS="-Djogl.debug.GLDrawable" "-Djogl.debug.EGLDrawableFactory.DontQuery"
REM set D_ARGS="-Djogl.debug.GLDrawable" "-Djogl.debug.EGLDrawableFactory.QueryNativeTK"
diff --git a/make/scripts/tests.sh b/make/scripts/tests.sh index d35cf0cf1..8c758cf6b 100644 --- a/make/scripts/tests.sh +++ b/make/scripts/tests.sh @@ -137,7 +137,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" @@ -310,7 +310,7 @@ function jrun() { #D_ARGS="-Djogl.debug.GLMediaPlayer.StreamWorker.delay=25 -Djogl.debug.GLMediaPlayer" #D_ARGS="-Djogl.debug.GLMediaPlayer.Native" #D_ARGS="-Djogl.debug.StereoDevice -Djogl.debug.StereoDevice.DumpData" - D_ARGS="-Djogl.debug.StereoDevice" + #D_ARGS="-Djogl.debug.StereoDevice" #D_ARGS="-Dnewt.debug.Screen -Djogl.debug.StereoDevice" #D_ARGS="-Dnewt.debug.Screen -Dnewt.test.Screen.disableRandR13" #D_ARGS="-Dnewt.debug.Screen" @@ -409,12 +409,12 @@ function testawtswt() { #testnoawt com.jogamp.opengl.test.junit.jogl.acore.TestGLProfile02NEWTNoARBCtx $* #testnoawt com.jogamp.opengl.test.junit.jogl.acore.TestGLProfile03NEWTOffscreen $* #testnoawt com.jogamp.opengl.test.junit.jogl.acore.TestGLProfile04NEWTOffscreenNoARBCtx $* -#testawt com.jogamp.opengl.test.junit.jogl.acore.TestVersionSemanticsNOUI $* +testawt com.jogamp.opengl.test.junit.jogl.acore.TestVersionSemanticsNOUI $* # # Stereo # -testnoawt com.jogamp.opengl.test.junit.jogl.stereo.StereoDemo01 $* +#testnoawt com.jogamp.opengl.test.junit.jogl.stereo.StereoDemo01 $* # # HiDPI @@ -423,6 +423,7 @@ testnoawt com.jogamp.opengl.test.junit.jogl.stereo.StereoDemo01 $* #testawt com.jogamp.opengl.test.junit.jogl.demos.es2.awt.TestGearsES2GLJPanelAWT $* #testawt com.jogamp.opengl.test.junit.jogl.demos.es2.awt.TestGearsES2AWT $* #testawt com.jogamp.opengl.test.junit.jogl.demos.es2.newt.TestGearsES2NewtCanvasAWT $* +#testawt com.jogamp.opengl.test.junit.jogl.demos.gl2.awt.TestGearsAWT $* #testnoawt com.jogamp.opengl.test.junit.jogl.glsl.TestRulerNEWT01 $* #testnoawt com.jogamp.opengl.test.junit.graph.demos.GPUUISceneNewtDemo $* #testawt com.jogamp.opengl.test.junit.graph.demos.GPUUISceneNewtCanvasAWTDemo $* @@ -512,6 +513,7 @@ testnoawt com.jogamp.opengl.test.junit.jogl.stereo.StereoDemo01 $* #testnoawt com.jogamp.opengl.test.junit.jogl.acore.TestGLException01NEWT $* #testnoawt com.jogamp.opengl.test.junit.jogl.acore.TestMapBufferRead01NEWT $* +#testnoawt com.jogamp.opengl.test.junit.jogl.acore.TestMapBufferRead02NEWT $* #testnoawt com.jogamp.opengl.test.junit.jogl.demos.es2.newt.TestRedSquareES2NEWT $* #testnoawt com.jogamp.opengl.test.junit.jogl.demos.es2.newt.TestGearsES2NEWT $* @@ -535,6 +537,7 @@ testnoawt com.jogamp.opengl.test.junit.jogl.stereo.StereoDemo01 $* #testnoawt com.jogamp.opengl.test.junit.jogl.acore.TestSharedContextVBOES2NEWT4 $* #testswt com.jogamp.opengl.test.junit.jogl.acore.TestSharedContextVBOES2SWT3 $* #testawt com.jogamp.opengl.test.junit.jogl.acore.TestSharedContextWithJTabbedPaneAWT $* +#testawt com.jogamp.opengl.test.junit.jogl.acore.TestSharedExternalContextAWT $* #testawt com.jogamp.opengl.test.junit.jogl.acore.TestFBOAutoDrawableDeadlockAWT $* #testawt com.jogamp.opengl.test.junit.jogl.acore.TestPBufferDeadlockAWT $* @@ -593,6 +596,7 @@ testnoawt com.jogamp.opengl.test.junit.jogl.stereo.StereoDemo01 $* #testnoawt com.jogamp.opengl.test.junit.jogl.acore.TestNEWTCloseX11DisplayBug565 $* #testawt com.jogamp.opengl.test.junit.jogl.acore.TestAWTCloseX11DisplayBug565 $* +#testawt com.jogamp.opengl.test.junit.jogl.acore.TestBug1146GLContextDialogToolTipAWT $* #testnoawt com.jogamp.opengl.test.junit.jogl.acore.anim.TestAnimatorGLWindow01NEWT $* #testawt com.jogamp.opengl.test.junit.jogl.acore.anim.TestAnimatorGLJPanel01AWT $* |