diff options
| author | michelou <michelou@epfl.ch> | 2007-11-28 12:38:41 +0000 |
|---|---|---|
| committer | michelou <michelou@epfl.ch> | 2007-11-28 12:38:41 +0000 |
| commit | db60c0207beecb68df33c5a21afcebdb5de38daa (patch) | |
| tree | 91b157b17e612bc608ab704690855835d3a10c93 /test | |
| parent | 924c77e79b5f964bd57985f42e63f48adc96bed5 (diff) | |
| download | scala-db60c0207beecb68df33c5a21afcebdb5de38daa.tar.gz scala-db60c0207beecb68df33c5a21afcebdb5de38daa.tar.bz2 scala-db60c0207beecb68df33c5a21afcebdb5de38daa.zip | |
improved DX tool invocation (Android)
Diffstat (limited to 'test')
| -rwxr-xr-x | test/scalatest | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/test/scalatest b/test/scalatest index ed37c27cc7..5d819a2b1c 100755 --- a/test/scalatest +++ b/test/scalatest @@ -351,15 +351,15 @@ test_run_android() { cpath=`get_os_pathlist $ANDROID_LIB:"$dstbase"` && $SCALAC -bootclasspath $cpath -cp "$os_classes" -d "$os_classes" -encoding ascii "$os_srcbase".scala && # echo $JAVACCMD -bootclasspath $cpath -cp "$os_classes" -d "$os_classes" -encoding ascii "$os_srcbase"/**/*.java && - (cd "$os_classes" && $JARCMD xf $SCALA_LIB) && extdirs=`get_os_pathlist "$ANDROID_HOME/tools/lib"` && dex_file=`get_os_filename "$os_dstbase"/classes.dex` && + scala_lib=`get_os_filename "$SCALA_LIB"` && $JAVACMD -Djava.ext.dirs=$extdirs -Xmx384M -jar $DX_LIB \ --dex --output=$dex_file --locals=full --positions=lines \ - "$os_classes" && - (cd "$dstbase" && zip -9q Test.apk *.xml *.dex && - $ANDROID_ADB shell '"cd data/app; rm Test.apk"' 2>&1 1> /dev/null && - $ANDROID_ADB install Test.apk 2> /dev/null) + "$scala_lib" "$os_classes" && + ( cd "$dstbase" && zip -9q Test.apk *.xml *.dex && + $ANDROID_ADB shell '"cd data/app; rm Test.apk"' 2>&1 1> /dev/null && + $ANDROID_ADB install Test.apk 2> /dev/null) } # Tests a script with Scala code embedded in it @@ -898,8 +898,8 @@ else if [ -d "$KVEM_HOME" ]; then KVEM_PREVERIFY="$KVEM_HOME/bin/preverify"; KVEM_EMULATOR="$KVEM_HOME/bin/emulator"; - KVEM_CLDC=$KVEM_HOME/lib/cldcapi10.jar; - KVEM_MIDP=$KVEM_HOME/lib/midpapi10.jar; + KVEM_CLDC="$KVEM_HOME/lib/cldcapi10.jar"; + KVEM_MIDP="$KVEM_HOME/lib/midpapi10.jar"; JARCMD="$bin_dir/jar"; elif [ -d "/home/linuxsoft/apps/" ]; then error "option '--cldc' requires variable KVEM_HOME to be set" |