You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by ag...@apache.org on 2014/01/24 20:06:45 UTC
git commit: CB-3612 Don't pass --device to "run" command by default.
Update help text
Updated Branches:
refs/heads/master c2830c114 -> 95ae4893e
CB-3612 Don't pass --device to "run" command by default. Update help text
Project: http://git-wip-us.apache.org/repos/asf/cordova-cli/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-cli/commit/95ae4893
Tree: http://git-wip-us.apache.org/repos/asf/cordova-cli/tree/95ae4893
Diff: http://git-wip-us.apache.org/repos/asf/cordova-cli/diff/95ae4893
Branch: refs/heads/master
Commit: 95ae4893ef596915506471445e63c0beb0b2e08b
Parents: c2830c1
Author: Andrew Grieve <ag...@chromium.org>
Authored: Fri Jan 24 14:06:05 2014 -0500
Committer: Andrew Grieve <ag...@chromium.org>
Committed: Fri Jan 24 14:06:05 2014 -0500
----------------------------------------------------------------------
doc/help.txt | 14 ++++++++++----
src/run.js | 3 +--
2 files changed, 11 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-cli/blob/95ae4893/doc/help.txt
----------------------------------------------------------------------
diff --git a/doc/help.txt b/doc/help.txt
index d4f9f6e..f16dbd3 100644
--- a/doc/help.txt
+++ b/doc/help.txt
@@ -28,14 +28,20 @@ Project-Level Commands
plugin(s) [{add|remove|rm} <PATH|URI>] .... add or remove a plugin from the specified PATH or URI, OR
[{ls|list}] ..................... list all currently installed plugins
[search <keyword1 keyword2...>] . search the plugin registry for plugins matching the keywords
+
prepare [PLATFORM..] ...................... copies files for specified platforms, or all platforms,
so that the project is ready to build in each SDK
+
compile [PLATFORM..] ...................... builds the app for specified platforms, or all platforms
+
build [PLATFORM...] ....................... shortcut for prepare, then compile
- emulate [PLATFORM...] ..................... deploys app in specified (or all) platform emulator(s),
- opening each emulator if necessary
- run [PLATFORM...] ......................... deploys app on specified (or all) platform devices, which
- must be properly connected and configured in each SDK
+
+ run [--debug|--release]
+ [--device|--emulator|--target=FOO]
+ [PLATFORM] ............................ deploys app on specified platform devices / emulators
+
+ emulate [PLATFORM...] ..................... alias for "run --emulator"
+
serve [PORT] .............................. runs a local web server for www/ assets. Port defaults to 8000.
Access projects at: http://HOST_IP:PORT/PLATFORM/www
http://git-wip-us.apache.org/repos/asf/cordova-cli/blob/95ae4893/src/run.js
----------------------------------------------------------------------
diff --git a/src/run.js b/src/run.js
index ed799cc..fa34e36 100644
--- a/src/run.js
+++ b/src/run.js
@@ -26,13 +26,12 @@ var cordova_util = require('./util'),
events = require('./events'),
Q = require('q'),
child_process = require('child_process'),
- DEFAULT_OPTIONS = ["--device"],
os = require('os');
// Returns a promise.
function shell_out_to_run(projectRoot, platform, options) {
var cmd = path.join(projectRoot, 'platforms', platform, 'cordova', 'run'),
- args = options.length ? DEFAULT_OPTIONS.concat(options) : DEFAULT_OPTIONS,
+ args = options || [],
d = Q.defer(),
errors = "",
child;