diff options
| author | sg215889 <[email protected]> | 2009-07-15 07:17:49 -0700 |
|---|---|---|
| committer | sg215889 <[email protected]> | 2009-07-15 07:17:49 -0700 |
| commit | 7af34608611659680f37025ee68773c254518f06 (patch) | |
| tree | c68c6d5fc18aaff763c9a234e18d99787ca5a030 | |
| parent | a29817b54313d481abd6a594262159a589ce743b (diff) | |
Add cpu flag to fix broken CVM os.arch (here on linux)JOGL_CDCCVM_sgothel
| -rwxr-xr-x | cvm-dbg-newt.sh | 19 | ||||
| -rwxr-xr-x | cvm-run-newt.sh | 18 |
2 files changed, 23 insertions, 14 deletions
diff --git a/cvm-dbg-newt.sh b/cvm-dbg-newt.sh index 0469627..13b3bd9 100755 --- a/cvm-dbg-newt.sh +++ b/cvm-dbg-newt.sh @@ -3,19 +3,24 @@ CVM=$1 shift -JOGL_LIB_DIR=$1 -shift - BUILD_SUBDIR=$1 shift -if [ ! -x "$CVM" -o -z "$JOGL_LIB_DIR" -o -z "$BUILD_SUBDIR" ] ; then - echo Usage $0 CVM-Binary JOGL_LIB_DIR BUILD_SUB_PATH - echo e.g. $0 ../CVM/bin/cvm ../jogl/build-cdcfp-x86/lib build-cdcfp-x86 +if [ ! -x "$CVM" -o -z "$BUILD_SUBDIR" ] ; then + echo "Usage $0 CVM-Binary BUILD_SUB_PATH [-cpu <arch>] Main-Class" + echo "e.g. $0 ../CVM/bin/cvm build-x86 -cpu x86 test" exit 1 fi +X_FLAGS= +if [ "$1" = "-cpu" ] ; then + shift + X_FLAGS="-Dos.arch=$1" + shift +fi + # D_ARGS="-Dgluegen.debug.ProcAddressHelper=true -Dgluegen.debug.NativeLibrary=true -Dnativewindow.debug=all -Djogl.debug=all -Dnewt.debug=all" D_ARGS="-Dgluegen.debug.NativeLibrary=true -Dnativewindow.debug=all -Djogl.debug=all -Dnewt.debug=all" -$CVM -Djava.awt.headless=true $D_ARGS -Dsun.boot.library.path=$JOGL_LIB_DIR -Xbootclasspath/a:../gluegen/$BUILD_SUBDIR/gluegen-rt.jar -Xbootclasspath/a:../jogl/$BUILD_SUBDIR/nativewindow/nativewindow.core.jar -Xbootclasspath/a:../jogl/$BUILD_SUBDIR/jogl/jogl.cdcfp.jar -Xbootclasspath/a:../jogl/$BUILD_SUBDIR/newt/newt.cdcfp.jar -Xbootclasspath/a:$BUILD_SUBDIR/jogl-demos.jar com.sun.javafx.newt.util.MainThread $* 2>&1 | tee cvm-dbg-newt.log +$CVM $X_FLAGS -Djava.awt.headless=true $D_ARGS -Dsun.boot.library.path=../jogl/$BUILD_SUBDIR/lib -Xbootclasspath/a:../gluegen/$BUILD_SUBDIR/gluegen-rt-cdc.jar -Xbootclasspath/a:../jogl/$BUILD_SUBDIR/nativewindow/nativewindow.core.jar -Xbootclasspath/a:../jogl/$BUILD_SUBDIR/jogl/jogl.all.cdc.jar -Xbootclasspath/a:../jogl/$BUILD_SUBDIR/newt/newt.all.cdc.jar -Xbootclasspath/a:$BUILD_SUBDIR/jogl-demos.jar com.sun.javafx.newt.util.MainThread $* 2>&1 | tee cvm-dbg-newt.log + diff --git a/cvm-run-newt.sh b/cvm-run-newt.sh index 61615da..09f718c 100755 --- a/cvm-run-newt.sh +++ b/cvm-run-newt.sh @@ -3,16 +3,20 @@ CVM=$1 shift -JOGL_LIB_DIR=$1 -shift - BUILD_SUBDIR=$1 shift -if [ ! -x "$CVM" -o -z "$JOGL_LIB_DIR" -o -z "$BUILD_SUBDIR" ] ; then - echo Usage $0 CVM-Binary JOGL_LIB_DIR BUILD_SUB_PATH - echo e.g. $0 ../CVM/bin/cvm ../jogl/build-cdcfp-x86/lib build-cdcfp-x86 +if [ ! -x "$CVM" -o -z "$BUILD_SUBDIR" ] ; then + echo "Usage $0 CVM-Binary BUILD_SUB_PATH [-cpu <arch>] Main-Class" + echo "e.g. $0 ../CVM/bin/cvm build-x86 -cpu x86 test" exit 1 fi -$CVM -Djava.awt.headless=true -Dsun.boot.library.path=$JOGL_LIB_DIR -Xbootclasspath/a:../gluegen/$BUILD_SUBDIR/gluegen-rt.jar -Xbootclasspath/a:../jogl/$BUILD_SUBDIR/nativewindow/nativewindow.core.jar -Xbootclasspath/a:../jogl/$BUILD_SUBDIR/jogl/jogl.cdcfp.jar -Xbootclasspath/a:../jogl/$BUILD_SUBDIR/newt/newt.cdcfp.jar -Xbootclasspath/a:$BUILD_SUBDIR/jogl-demos.jar com.sun.javafx.newt.util.MainThread $* 2>&1 | tee cvm-dbg-newt.log +X_FLAGS= +if [ "$1" = "-cpu" ] ; then + shift + X_FLAGS="-Dos.arch=$1" + shift +fi + +$CVM $X_FLAGS -Djava.awt.headless=true -Dsun.boot.library.path=../jogl/$BUILD_SUBDIR/lib -Xbootclasspath/a:../gluegen/$BUILD_SUBDIR/gluegen-rt-cdc.jar -Xbootclasspath/a:../jogl/$BUILD_SUBDIR/nativewindow/nativewindow.core.jar -Xbootclasspath/a:../jogl/$BUILD_SUBDIR/jogl/jogl.all.cdc.jar -Xbootclasspath/a:../jogl/$BUILD_SUBDIR/newt/newt.all.cdc.jar -Xbootclasspath/a:$BUILD_SUBDIR/jogl-demos.jar com.sun.javafx.newt.util.MainThread $* 2>&1 | tee cvm-run-newt.log |