diff options
Diffstat (limited to 'make')
| -rwxr-xr-x | make/scripts/setenv-jogl.sh | 12 | ||||
| -rwxr-xr-x | make/scripts/tests.sh | 16 |
2 files changed, 21 insertions, 7 deletions
diff --git a/make/scripts/setenv-jogl.sh b/make/scripts/setenv-jogl.sh index e52c2382f..38fd8de38 100755 --- a/make/scripts/setenv-jogl.sh +++ b/make/scripts/setenv-jogl.sh @@ -84,15 +84,21 @@ CP_SEP=: LIB=$THISDIR/lib +JOGAMP_ALL_AWT_CLASSPATH=.:$GLUEGEN_JAR:$JOGL_ALL_AWT_CLASSPATH:$SWT_CLASSPATH:$JUNIT_JAR:$ANT_JARS +JOGAMP_ALL_NOAWT_CLASSPATH=.:$GLUEGEN_JAR:$JOGL_ALL_NOAWT_CLASSPATH:$SWT_CLASSPATH:$JUNIT_JAR:$ANT_JARS +JOGAMP_MOBILE_CLASSPATH=.:$GLUEGEN_JAR:$JOGL_MOBILE_CLASSPATH:$SWT_CLASSPATH:$JUNIT_JAR:$ANT_JARS +export JOGAMP_ALL_AWT_CLASSPATH JOGAMP_ALL_NOAWT_CLASSPATH JOGAMP_MOBILE_CLASSPATH + CLASSPATH=.:$GLUEGEN_JAR:$JOGL_CLASSPATH:$SWT_CLASSPATH:$JUNIT_JAR:$ANT_JARS -for i in $LIB/*jar ; do - CLASSPATH=$CLASSPATH:$i -done export CLASSPATH + # We use TempJarCache per default now! #export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$GLUEGEN_OS:$JOGL_LIB_DIR #export DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH:$GLUEGEN_OS:$JOGL_LIB_DIR +echo JOGAMP_ALL_AWT_CLASSPATH: $CLASSPATH +echo JOGAMP_ALL_NOAWT_CLASSPATH: $CLASSPATH +echo JOGAMP_MOBILE_CLASSPATH: $CLASSPATH echo CLASSPATH: $CLASSPATH echo echo MacOSX REMEMBER to add the JVM arguments "-XstartOnFirstThread -Djava.awt.headless=true" for running demos without AWT, e.g. NEWT diff --git a/make/scripts/tests.sh b/make/scripts/tests.sh index e154f8d7b..fa47231b7 100755 --- a/make/scripts/tests.sh +++ b/make/scripts/tests.sh @@ -24,6 +24,7 @@ rm -f java-run.log spath=`dirname $0` . $spath/setenv-jogl.sh $bdir JOGL_ALL +unset CLASSPATH MOSX=0 MOSX_MT=0 @@ -39,7 +40,6 @@ echo LIBGL_DRIVERS_PATH: $LIBGL_DRIVERS_PATH 2>&1 | tee -a java-run.log echo LIBGL_DEBUG: $LIBGL_DEBUG 2>&1 | tee -a java-run.log echo SWT_CLASSPATH: $SWT_CLASSPATH 2>&1 | tee -a java-run.log echo $javaexe $X_ARGS $D_ARGS $* 2>&1 | tee -a java-run.log -echo CLASSPATH $CLASSPATH 2>&1 | tee -a java-run.log echo MacOsX $MOSX function jrun() { @@ -55,12 +55,12 @@ function jrun() { #D_ARGS="-Djogl.debug.GLContext -Djogl.debug.GLProfile -Djogl.debug.GLDrawable" #D_ARGS="-Djogl.debug.GLProfile" # D_ARGS="-Dnewt.debug.EDT -Dnativewindow.debug.ToolkitLock.TraceLock -Dnativewindow.debug.NativeWindow" - D_ARGS="-Dnativewindow.debug.NativeWindow" + #D_ARGS="-Dnativewindow.debug.NativeWindow" #D_ARGS="-Dnewt.debug.Window -Dnewt.debug.Display -Dnewt.debug.EDT" #D_ARGS="-Dnewt.debug.EDT -Dnewt.debug.Window -Djogl.debug.GLContext" #D_ARGS="-Dnativewindow.debug.ToolkitLock.TraceLock -Dnativewindow.debug.X11Util.TraceDisplayLifecycle=true -Dnativewindow.debug.X11Util" #D_ARGS="-Dnativewindow.debug.X11Util -Djogl.debug.GLContext -Djogl.debug.GLDrawable -Dnewt.debug=all" - #D_ARGS="-Dnativewindow.debug.X11Util" + D_ARGS="-Djogl.debug.GLDrawable -Djogl.debug.GLContext" #D_ARGS="-Djogamp.common.utils.locks.Lock.timeout=600000 -Djogamp.debug.Lock -Djogamp.debug.Lock.TraceLock" #D_ARGS="-Djogamp.common.utils.locks.Lock.timeout=1000 -Djogamp.debug.Lock -Djogamp.debug.Lock.TraceLock" #D_ARGS="-Dnewt.debug.EDT -Djogamp.common.utils.locks.Lock.timeout=600000 -Djogl.debug.Animator -Dnewt.debug.Display -Dnewt.debug.Screen" @@ -111,8 +111,12 @@ function jrun() { #X_ARGS="-verbose:jni" if [ $awton -eq 1 ] ; then + export CLASSPATH=$JOGAMP_ALL_AWT_CLASSPATH + echo CLASSPATH $CLASSPATH X_ARGS="-Djava.awt.headless=false" else + export CLASSPATH=$JOGAMP_ALL_NOAWT_CLASSPATH + echo CLASSPATH $CLASSPATH X_ARGS="-Djava.awt.headless=true" fi if [ $MOSX_MT -eq 1 ] ; then @@ -280,7 +284,11 @@ function testswt() { # # regressions # -testawt com.jogamp.opengl.test.junit.jogl.acore.TestSharedContextListAWT $* +#testnoawt com.jogamp.opengl.test.junit.jogl.demos.gl2.newt.TestGearsNEWT $* +#testawt com.jogamp.opengl.test.junit.jogl.demos.gl2.awt.TestGearsAWT $* +#testawt com.jogamp.opengl.test.junit.newt.parenting.TestParenting01cAWT $* +#testawt com.jogamp.opengl.test.junit.jogl.newt.TestSwingAWTRobotUsageBeforeJOGLInitBug411 +testawt com.jogamp.opengl.test.junit.newt.parenting.TestParenting03AWT $* $spath/count-edt-start.sh java-run.log |