diff options
| author | Sven Gothel <[email protected]> | 2010-04-27 18:00:20 +0200 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2010-04-27 18:00:20 +0200 |
| commit | b5fc2499749d9c180d3e5a0e04a939bd78017068 (patch) | |
| tree | d47913fe1c907b929ec0359c0dc87a541142cf9f /make | |
| parent | 2e99ad22783143067887881665a6204ac0e47d91 (diff) | |
Relax Junit: TestOffscreen01NEWT, ie no failure if no PBuffer available
Diffstat (limited to 'make')
| -rw-r--r-- | make/setenv-jogl.sh | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/make/setenv-jogl.sh b/make/setenv-jogl.sh index 49c584459..f7d42a193 100644 --- a/make/setenv-jogl.sh +++ b/make/setenv-jogl.sh @@ -7,7 +7,7 @@ function print_usage() { if [ -z "$1" ] ; then echo JOGL BUILD DIR missing print_usage - return + exit fi if [ -e /devtools/etc/profile.ant ] ; then @@ -27,7 +27,7 @@ if [ -e "$JOGL_BUILDDIR" ] ; then else echo JOGL_BUILDDIR $JOGL_BUILDDIR not exist or not given print_usage - return + exit fi gpf=`find ../../gluegen/make -name dynlink-unix.cfg` @@ -37,7 +37,7 @@ fi if [ -z "$gpf" ] ; then echo GLUEGEN_BUILDDIR not found print_usage - return + exit fi GLUEGEN_DIR=`dirname $gpf`/.. @@ -45,19 +45,25 @@ GLUEGEN_BUILDDIR=$GLUEGEN_DIR/$JOGL_BUILDDIR_BASE if [ ! -e "$GLUEGEN_BUILDDIR" ] ; then echo GLUEGEN_BUILDDIR $GLUEGEN_BUILDDIR does not exist print_usage - return + exit fi GLUEGEN_JAR=$GLUEGEN_BUILDDIR/gluegen-rt.jar GLUEGEN_OS=$GLUEGEN_BUILDDIR/obj JUNIT_JAR=$GLUEGEN_DIR/make/lib/junit-4.5.jar if [ -z "$ANT_PATH" ] ; then + if [ -e /usr/share/ant/bin/ant -a -e /usr/share/ant/lib/ant.jar ] ; then + ANT_PATH=/usr/share/ant + export ANT_PATH + echo autosetting ANT_PATH to $ANT_PATH + fi +fi +if [ -z "$ANT_PATH" ] ; then echo ANT_PATH does not exist, set it print_usage - return -else - ANT_JARS=$ANT_PATH/lib/ant.jar:$ANT_PATH/lib/ant-junit.jar + exit fi +ANT_JARS=$ANT_PATH/lib/ant.jar:$ANT_PATH/lib/ant-junit.jar echo GLUEGEN BUILDDIR: $GLUEGEN_BUILDDIR echo JOGL DIR: $JOGL_DIR |