diff options
Diffstat (limited to 'make/scripts')
-rwxr-xr-x | make/scripts/java-run-all.sh (renamed from make/scripts/java-run.sh) | 8 | ||||
-rwxr-xr-x | make/scripts/java-run-allall.sh | 41 | ||||
-rw-r--r-- | make/scripts/setenv-jogl.sh | 11 |
3 files changed, 54 insertions, 6 deletions
diff --git a/make/scripts/java-run.sh b/make/scripts/java-run-all.sh index fbc06893f..de4fdc3fe 100755 --- a/make/scripts/java-run.sh +++ b/make/scripts/java-run-all.sh @@ -1,4 +1,4 @@ -#! /bin/sh +#! /bin/bash scriptdir=`dirname $0` @@ -25,7 +25,7 @@ if [ -z "$1" ] ; then exit fi -. $scriptdir/setenv-jogl.sh $1 +. $scriptdir/setenv-jogl.sh $1 JOGL_ALL shift MOSX=0 @@ -35,5 +35,7 @@ uname -a | grep -i Darwin && MOSX=1 # D_ARGS="-Dnativewindow.debug=all -Djogl.debug=all -Dnewt.debug=all -Djogl.debug.GLSLState" # D_ARGS="-Dnativewindow.debug.X11Util=true -Djogl.debug.GLDrawableFactory=true" # D_ARGS="-Dnativewindow.debug.X11Util=true" +# D_ARGS="-Dnewt.debug=all" -java $X_ARGS $D_ARGS $* 2>&1 | tee java-run.log +echo java $X_ARGS $D_ARGS $* 2>&1 | tee java-run.log +java $X_ARGS $D_ARGS $* 2>&1 | tee -a java-run.log diff --git a/make/scripts/java-run-allall.sh b/make/scripts/java-run-allall.sh new file mode 100755 index 000000000..16a8f314b --- /dev/null +++ b/make/scripts/java-run-allall.sh @@ -0,0 +1,41 @@ +#! /bin/bash + +scriptdir=`dirname $0` + +function print_usage() { + echo "Usage: $0 [-libdir pre-lib-dir] jogl-build-dir ..." +} + +if [ "$1" = "-libdir" ] ; then + shift + if [ -z "$1" ] ; then + echo libdir argument missing + print_usage + exit + fi + PRELIB=$1 + shift + LD_LIBRARY_PATH=$PRELIB:$LD_LIBRARY_PATH + export LD_LIBRARY_PATH +fi + +if [ -z "$1" ] ; then + echo JOGL BUILD DIR missing + print_usage + exit +fi + +. $scriptdir/setenv-jogl.sh $1 JOGL_ALLALL +shift + +MOSX=0 +uname -a | grep -i Darwin && MOSX=1 + +# D_ARGS="-Dgluegen.debug.ProcAddressHelper=true -Dgluegen.debug.NativeLibrary=true -Dnativewindow.debug=all -Djogl.debug=all -Dnewt.debug=all" +# D_ARGS="-Dnativewindow.debug=all -Djogl.debug=all -Dnewt.debug=all -Djogl.debug.GLSLState" +# D_ARGS="-Dnativewindow.debug.X11Util=true -Djogl.debug.GLDrawableFactory=true" +# D_ARGS="-Dnativewindow.debug.X11Util=true" +# D_ARGS="-Dnewt.debug=all" + +echo java $X_ARGS $D_ARGS $* 2>&1 | tee java-run.log +java $X_ARGS $D_ARGS $* 2>&1 | tee -a java-run.log diff --git a/make/scripts/setenv-jogl.sh b/make/scripts/setenv-jogl.sh index f7d42a193..a5a5d6adc 100644 --- a/make/scripts/setenv-jogl.sh +++ b/make/scripts/setenv-jogl.sh @@ -1,7 +1,7 @@ #! /bin/sh function print_usage() { - echo "Usage: $0 jogl-build-dir" + echo "Usage: $0 jogl-build-dir [JOGL_PROFILE]" } if [ -z "$1" ] ; then @@ -14,11 +14,16 @@ if [ -e /devtools/etc/profile.ant ] ; then . /devtools/etc/profile.ant fi -JOGL_PROFILE=JOGL_ALL - JOGL_BUILDDIR=$1 shift +if [ -z "$1" ] ; then + JOGL_PROFILE=JOGL_ALL +else + JOGL_PROFILE=$1 + shift +fi + THISDIR=`pwd` if [ -e "$JOGL_BUILDDIR" ] ; then |