diff options
| author | Sven Gothel <[email protected]> | 2014-05-09 07:54:15 +0200 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2014-05-09 07:54:15 +0200 |
| commit | 3cde33e0ef3a79cefa0a56b29d6912bb3f6b7988 (patch) | |
| tree | 80d62b8e2d5de2f812e03df83e66296e39c25d3f | |
| parent | 82df5f664a3dfe136031deae0b0db28fcb3a3f31 (diff) | |
manual tests: Add exp. gluegen-rt-alt.jar to 'ALT' classpath
| -rwxr-xr-x | make/scripts/setenv-jogl.sh | 5 | ||||
| -rw-r--r-- | make/scripts/tests.sh | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/make/scripts/setenv-jogl.sh b/make/scripts/setenv-jogl.sh index dc121a596..546905f9d 100755 --- a/make/scripts/setenv-jogl.sh +++ b/make/scripts/setenv-jogl.sh @@ -53,6 +53,7 @@ if [ ! -e "$GLUEGEN_BUILDDIR" ] ; then exit fi GLUEGEN_JAR="$GLUEGEN_BUILDDIR"/gluegen-rt.jar +GLUEGEN_ALT_JAR="$GLUEGEN_BUILDDIR"/gluegen-rt-alt.jar GLUEGEN_OS="$GLUEGEN_BUILDDIR"/obj JUNIT_JAR="$GLUEGEN_DIR"/make/lib/junit.jar @@ -107,7 +108,9 @@ LIB=$THISDIR/lib JOGAMP_ALL_AWT_CLASSPATH=.:"$GLUEGEN_JAR":"$JOAL_JAR":"$JOGL_ALL_AWT_CLASSPATH":"$SWT_CLASSPATH":"$JUNIT_JAR":"$ANT_JARS" JOGAMP_ALL_NOAWT_CLASSPATH=.:"$GLUEGEN_JAR":"$JOAL_JAR":"$JOGL_ALL_NOAWT_CLASSPATH":"$SWT_CLASSPATH":"$JUNIT_JAR":"$ANT_JARS" JOGAMP_MOBILE_CLASSPATH=.:"$GLUEGEN_JAR":"$JOAL_JAR":"$JOGL_MOBILE_CLASSPATH":"$SWT_CLASSPATH":"$JUNIT_JAR":"$ANT_JARS" -export JOGAMP_ALL_AWT_CLASSPATH JOGAMP_ALL_NOAWT_CLASSPATH JOGAMP_MOBILE_CLASSPATH +JOGAMP_ALL_NOAWT_ALT_CLASSPATH=.:"$GLUEGEN_ALT_JAR":"$JOAL_JAR":"$JOGL_ALL_NOAWT_CLASSPATH":"$SWT_CLASSPATH":"$JUNIT_JAR":"$ANT_JARS" +JOGAMP_MOBILE_ALT_CLASSPATH=.:"$GLUEGEN_ALT_JAR":"$JOAL_JAR":"$JOGL_MOBILE_CLASSPATH":"$SWT_CLASSPATH":"$JUNIT_JAR":"$ANT_JARS" +export JOGAMP_ALL_AWT_CLASSPATH JOGAMP_ALL_NOAWT_CLASSPATH JOGAMP_MOBILE_CLASSPATH JOGAMP_ALL_NOAWT_ALT_CLASSPATH JOGAMP_MOBILE_ALT_CLASSPATH CLASSPATH=.:"$GLUEGEN_JAR":"$JOAL_JAR":"$JOGL_CLASSPATH":"$SWT_CLASSPATH":"$JUNIT_JAR":"$ANT_JARS" export CLASSPATH diff --git a/make/scripts/tests.sh b/make/scripts/tests.sh index 84248a1dc..87d57df73 100644 --- a/make/scripts/tests.sh +++ b/make/scripts/tests.sh @@ -277,6 +277,8 @@ function jrun() { #export USE_CLASSPATH=$JOGAMP_ALL_AWT_CLASSPATH export USE_CLASSPATH=$JOGAMP_ALL_NOAWT_CLASSPATH #export USE_CLASSPATH=$JOGAMP_MOBILE_CLASSPATH + #export USE_CLASSPATH=$JOGAMP_ALL_NOAWT_ALT_CLASSPATH + #export USE_CLASSPATH=$JOGAMP_MOBILE_ALT_CLASSPATH #export USE_CLASSPATH=.:$GLUEGEN_JAR:$JOGL_BUILD_DIR/jar/atomic/jogl-core.jar:$JOGL_BUILD_DIR/jar/atomic/jogl-gldesktop.jar:$JOGL_BUILD_DIR/jar/atomic/jogl-os-x11.jar:$JOGL_BUILD_DIR/jar/atomic/jogl-util.jar:$JOGL_BUILD_DIR/jar/atomic/nativewindow-core.jar:$JOGL_BUILD_DIR/jar/atomic/nativewindow-os-x11.jar:$JOGL_BUILD_DIR/jar/atomic/newt-core.jar:$JOGL_BUILD_DIR/jar/atomic/newt-driver-x11.jar:$JOGL_BUILD_DIR/jar/atomic/newt-ogl.jar:$JOGL_BUILD_DIR/jar/jogl-test.jar:$SWT_CLASSPATH:$JUNIT_JAR:$ANT_JARS X_ARGS="-Djava.awt.headless=true $X_ARGS" fi |