diff --git a/.npmignore b/.npmignore index f8c12f868..7cfcb60b0 100644 --- a/.npmignore +++ b/.npmignore @@ -1,2 +1,3 @@ submodules/appium.io submodules/ApiDemos +submodules/selendroid/selendroid-server/target diff --git a/README.md b/README.md index 4ee908efb..e029c0aca 100644 --- a/README.md +++ b/README.md @@ -60,7 +60,7 @@ Option 2: Run Appium from the command line using Node: Example Tests: [Node.js](https://github.com/appium/appium/tree/master/sample-code/examples/node) | [Python](https://github.com/appium/appium/tree/master/sample-code/examples/python) | [PHP](https://github.com/appium/appium/tree/master/sample-code/examples/php) | [Ruby](https://github.com/appium/appium/tree/master/sample-code/examples/ruby) | [Java](https://github.com/appium/appium/tree/master/sample-code/examples/java) -More Detailed Information +Write Tests for Appium ------------------- We support a sub-set of the [Selenium WebDriver JSON Wire Protocol](https://github.com/appium/appium/wiki/JSON-Wire-Protocol:-Supported-Methods). @@ -84,7 +84,7 @@ We support Android and iOS platforms side-by-side: - - - -Developing on Appium +Hacking with Appium ------------ Install [node.js](http://nodejs.org/) (includes npm, the node.js package manager). The recommended way to install node is `brew install node`. Node [installed by @@ -105,7 +105,7 @@ if you installed node.js via Homebrew). The third command installs all app 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) +Hacking with Appium (iOS) -------------- (First, have a look at [setting up your system for Appium iOS support](https://github.com/appium/appium/blob/master/docs/system-setup.md#ios).) @@ -126,7 +126,7 @@ At this point, you can simply run: ./reset.sh --ios -Developing on Appium (Android) +Hacking with Appium (Android) ---------------- (First, have a look at [setting up your system for Appium Android support](https://github.com/appium/appium/blob/master/docs/system-setup.md#android).) diff --git a/grunt-helpers.js b/grunt-helpers.js index e66ec8cc3..6143999d8 100644 --- a/grunt-helpers.js +++ b/grunt-helpers.js @@ -411,7 +411,11 @@ module.exports.generateAppiumIo = function(grunt, cb) { grunt.log.write("Pushing changes to appium.io..."); var cmd = 'git commit -am "updating getting-started via grunt" && ' + 'git pull --rebase origin master && ' + - 'git push origin master'; + 'git push origin master && ' + + 'git checkout gh-pages && ' + + 'git merge master && ' + + 'git push origin gh-pages && ' + + 'git checkout master'; exec(cmd, {cwd: submod}, function(err, stdout, stderr) { if (err) { console.log(stdout); diff --git a/submodules/appium.io b/submodules/appium.io index 32111c0c5..c1b550d0c 160000 --- a/submodules/appium.io +++ b/submodules/appium.io @@ -1 +1 @@ -Subproject commit 32111c0c56e6d0fb5b7bec73418b6900c31a9844 +Subproject commit c1b550d0c53303fd2d0b2f42871d05a18acbfdbd