From 3e5286065ff8655c287a8f8fe99acd2b8a12ff32 Mon Sep 17 00:00:00 2001 From: Jonathan Lipps Date: Mon, 1 Apr 2013 17:21:47 -0700 Subject: [PATCH] only update one submodule in reset.sh, some readme mods --- README.md | 10 ++++++---- reset.sh | 2 +- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 6b0a3703e..cfd89a01c 100644 --- a/README.md +++ b/README.md @@ -27,7 +27,7 @@ Requirements > Mac OS X 10.6 or higher > XCode - > Apple Developer Tools (iPhone simulator, command line tools) + > Apple Developer Tools (iPhone simulator SDK, command line tools) > Android SDK API >= 17 > Node and npm (http://www.nodejs.org) (Node must be >= v0.8) @@ -79,11 +79,12 @@ following commands: > sudo npm install -g mocha > sudo npm install -g grunt-cli - > npm install + > ./reset.sh The first two commands install test and build tools (sudo may not be necessary if you installed node.js via Homebrew). The third command installs all app -dependencies. +dependencies, builds supporting binaries and test apps. `reset.sh` is also the +recommended command to run after pulling changes from master. Developing on Appium (iOS) -------------- @@ -208,7 +209,8 @@ grunt from the command line with an app or without an app, among other things: > node server.js --app /absolute/path/to/app -V // launch Appium server with app > node server.js --launch // pre-launch the app when appium loads > node server.js --log /my/appium.log // log to file instead of stdout - > node server.js --warp // use unsupported system-crashing speedup tech + > node server.js --without-delay // (iOS) use faster instruments-without-delay + > node server.js --fast-reset // (Android) faster resetting between tests (See [the server documentation](https://github.com/appium/appium/blob/master/docs/server-args.md) for diff --git a/reset.sh b/reset.sh index 9eda8698f..7c200fee7 100755 --- a/reset.sh +++ b/reset.sh @@ -4,7 +4,7 @@ rm -rf node_modules/wd echo "Installing WD and new NPM modules" npm install . echo "Updating/initializing submodules" -git submodule update --init +git submodule update --init submodules/instruments-without-delay echo "Building instruments-without-delay" pushd submodules/instruments-without-delay ./build.sh