| Index: samples/todomvc/android/compile.sh
|
| diff --git a/samples/todomvc/android/compile.sh b/samples/todomvc/android/compile.sh
|
| index 36990860d202e7967e718a0588a971c45567c697..381d334d225afea3deaa3036b663441aa1a326ba 100755
|
| --- a/samples/todomvc/android/compile.sh
|
| +++ b/samples/todomvc/android/compile.sh
|
| @@ -9,29 +9,29 @@ set -ue
|
| DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
|
| SERVICEC_DIR=$DIR/../../../tools/servicec
|
| JAVA_DIR=$DIR/../java
|
| -FLETCH_DIR=$DIR/../../..
|
| +DARTINO_DIR=$DIR/../../..
|
|
|
| if [[ $# -eq 1 ]] && [[ "$1" == "snapshot" ]]; then
|
| echo "Only rebuilding the Dart snapshot."
|
| - echo "If Fletch or any IMMI files changed re-run compile.sh without arguments."
|
| + echo "If Dartino or any IMMI files changed re-run compile.sh without arguments."
|
| else
|
|
|
|
|
| # Build the native interpreter src for arm and x86.
|
| -cd $FLETCH_DIR
|
| +cd $DARTINO_DIR
|
| ninja
|
| ninja -C out/ReleaseIA32
|
| # Regenerate java and jni sources.
|
| -out/ReleaseIA32/fletch x-servicec file samples/todomvc/todomvc_service.idl out samples/todomvc/
|
| +out/ReleaseIA32/dartino x-servicec file samples/todomvc/todomvc_service.idl out samples/todomvc/
|
|
|
| -ninja -C out/ReleaseXARMAndroid fletch_vm_library_generator
|
| -ninja -C out/ReleaseIA32Android fletch_vm_library_generator
|
| -mkdir -p out/ReleaseXARMAndroid/obj/src/vm/fletch_vm.gen
|
| -mkdir -p out/ReleaseIA32Android/obj/src/vm/fletch_vm.gen
|
| -out/ReleaseXARMAndroid/fletch_vm_library_generator > out/ReleaseXARMAndroid/obj/src/vm/fletch_vm.gen/generated.S
|
| -out/ReleaseIA32Android/fletch_vm_library_generator > out/ReleaseIA32Android/obj/src/vm/fletch_vm.gen/generated.S
|
| +ninja -C out/ReleaseXARMAndroid dartino_vm_library_generator
|
| +ninja -C out/ReleaseIA32Android dartino_vm_library_generator
|
| +mkdir -p out/ReleaseXARMAndroid/obj/src/vm/dartino_vm.gen
|
| +mkdir -p out/ReleaseIA32Android/obj/src/vm/dartino_vm.gen
|
| +out/ReleaseXARMAndroid/dartino_vm_library_generator > out/ReleaseXARMAndroid/obj/src/vm/dartino_vm.gen/generated.S
|
| +out/ReleaseIA32Android/dartino_vm_library_generator > out/ReleaseIA32Android/obj/src/vm/dartino_vm.gen/generated.S
|
|
|
| -# Compile Fletch runtime and jni code into libfletch.so.
|
| +# Compile Dartino runtime and jni code into libdartino.so.
|
| cd $JAVA_DIR
|
| CPUCOUNT=1
|
| if [[ $(uname) = 'Darwin' ]]; then
|
| @@ -41,19 +41,19 @@ else
|
| fi
|
| NDK_MODULE_PATH=. ndk-build -j$CPUCOUNT
|
|
|
| -# Copy Java source and fletch library to the right places.
|
| -mkdir -p $DIR/TodoMVC/app/src/main/java/fletch
|
| -cp -R fletch/*.java $DIR/TodoMVC/app/src/main/java/fletch/
|
| +# Copy Java source and dartino library to the right places.
|
| +mkdir -p $DIR/TodoMVC/app/src/main/java/dartino
|
| +cp -R dartino/*.java $DIR/TodoMVC/app/src/main/java/dartino/
|
| mkdir -p $DIR/TodoMVC/app/src/main/jniLibs/
|
| cp -R libs/* $DIR/TodoMVC/app/src/main/jniLibs/
|
|
|
| fi
|
|
|
| # Build snapshot.
|
| -cd $FLETCH_DIR
|
| +cd $DARTINO_DIR
|
| mkdir -p $DIR/TodoMVC/app/src/main/res/raw
|
|
|
| ./out/ReleaseIA32/dart \
|
| -c --packages=.packages \
|
| -Dsnapshot="$DIR/TodoMVC/app/src/main/res/raw/todomvc_snapshot" \
|
| - tests/fletchc/run.dart "$DIR/../todomvc.dart"
|
| + tests/dartino_compiler/run.dart "$DIR/../todomvc.dart"
|
|
|