summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorParménides GV <parmegv@sdf.org>2013-10-10 17:13:13 +0200
committercyBerta <richy@cyborgsociety.org>2013-11-09 20:23:01 +0100
commit0abfb2f21719d0c49aaf5713dbde41cc20ade055 (patch)
treeba5e95a2c439e5e754e88b542172c38be2ea4ed2
parente4f53f8bf019fdb2d8f73325c6ec6908002e8899 (diff)
Changed some documentation and scripts.
-rw-r--r--README.txt12
-rw-r--r--build.xml2
-rwxr-xr-xcompile.sh2
-rwxr-xr-xrun.sh2
4 files changed, 9 insertions, 9 deletions
diff --git a/README.txt b/README.txt
index 7d57a6e3..c7dd933b 100644
--- a/README.txt
+++ b/README.txt
@@ -17,7 +17,7 @@ Instructions to compile
Postconditions
--------------
-1. $PROJECT_LOCATION/leap_android/bin/LEAP Android-debug.apk exists
+1. $PROJECT_LOCATION/leap_android/bin/Bitmask Android-debug.apk exists
Running on the emulator
=========================
@@ -26,7 +26,7 @@ Preconditions
-----------------
1. Android SDK is installed, and its tools are in the PATH.
-2. leap_android has been compiled.
+2. Bitmask Android has been compiled.
3. An avd exists in ~/.android/avd/ (if you do not have one, follow instructions from http://developer.android.com/tools/devices/managing-avds-cmdline.html)
Instructions to run on the emulator
@@ -38,7 +38,7 @@ Instructions to run on the emulator
Postconditions
--------------
-1. LEAP Android is running.
+1. Bitmask Android is running.
Debugging from console
======================
@@ -47,7 +47,7 @@ Preconditions
-----------------
1. Android SDK is installed, and its tools are in the PATH.
-2. leap_android has been compiled.
+2. Bitmask Android has been compiled.
3. An avd exists in ~/.android/avd/ (if you do not have one, follow instructions from http://developer.android.com/tools/devices/managing-avds-cmdline.html).
4. jdb is installed (this program is part of OpenJDK 7)
@@ -60,6 +60,6 @@ Instructions to debug from the console
Postconditions
--------------
-1. LEAP Android is running.
-2. LEAP Android does not show the message "Application LEAP for Android (process se.leap.leapclient) is waiting for the debugger to attach".
+1. Bitmask Android is running.
+2. Bitmask Android does not show the message "Application Bitmask for Android (process se.leap.bitmaskclient) is waiting for the debugger to attach".
3. You are in a jdb debuggin session.
diff --git a/build.xml b/build.xml
index 538f2eee..56cf179f 100644
--- a/build.xml
+++ b/build.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project name="LEAP Android" default="help">
+<project name="Bitmask Android" default="help">
<!-- The local.properties file is created and updated by the 'android' tool.
It contains the path to the SDK. It should *NOT* be checked into
diff --git a/compile.sh b/compile.sh
index 8d946dcc..77bd6caa 100755
--- a/compile.sh
+++ b/compile.sh
@@ -1,3 +1,3 @@
#!/bin/bash
-android update project --path . --name "LEAP Android" --target android-17
+android update project --path . --name "Bitmask Android" --target android-17
ant debug
diff --git a/run.sh b/run.sh
index 08209db0..77dc7c6c 100755
--- a/run.sh
+++ b/run.sh
@@ -34,5 +34,5 @@ else
fi
wait_until_booted
-adb install -r $PROJECT_FOLDER/bin/LEAP\ Android-debug.apk # Install the new version of the application
+adb install -r $PROJECT_FOLDER/bin/Bitmask\ Android-debug.apk # Install the new version of the application
adb shell am start se.leap.bitmaskclient/.Dashboard # Run app