run and emulate commands now call into the ./cordova/run command with --debug flag always, and either --device or --emulator flags depending on cli command invoked.
Project: http://git-wip-us.apache.org/repos/asf/cordova-cli/repo Commit: http://git-wip-us.apache.org/repos/asf/cordova-cli/commit/ca42474a Tree: http://git-wip-us.apache.org/repos/asf/cordova-cli/tree/ca42474a Diff: http://git-wip-us.apache.org/repos/asf/cordova-cli/diff/ca42474a Branch: refs/heads/2.8.x Commit: ca42474a7ff3a320bf576a330927dddaaeb28050 Parents: 2300651 Author: Fil Maj <[email protected]> Authored: Wed Jun 5 13:50:37 2013 -0700 Committer: Fil Maj <[email protected]> Committed: Thu Jun 6 18:29:20 2013 -0700 ---------------------------------------------------------------------- spec/cordova-cli/emulate.spec.js | 2 +- spec/cordova-cli/run.spec.js | 2 +- src/emulate.js | 2 +- src/run.js | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cordova-cli/blob/ca42474a/spec/cordova-cli/emulate.spec.js ---------------------------------------------------------------------- diff --git a/spec/cordova-cli/emulate.spec.js b/spec/cordova-cli/emulate.spec.js index 8df6ce3..93eaa90 100644 --- a/spec/cordova-cli/emulate.spec.js +++ b/spec/cordova-cli/emulate.spec.js @@ -72,7 +72,7 @@ describe('emulate command', function() { cordova.emulate(); a_spy.mostRecentCall.args[1](); // fake out android parser expect(s).toHaveBeenCalled(); - expect(s.mostRecentCall.args[0]).toMatch(/cordova.run" --emulator$/gi); + expect(s.mostRecentCall.args[0]).toMatch(/cordova.run" --debug --emulator$/gi); }).not.toThrow(); }); }); http://git-wip-us.apache.org/repos/asf/cordova-cli/blob/ca42474a/spec/cordova-cli/run.spec.js ---------------------------------------------------------------------- diff --git a/spec/cordova-cli/run.spec.js b/spec/cordova-cli/run.spec.js index 6904c73..359a723 100644 --- a/spec/cordova-cli/run.spec.js +++ b/spec/cordova-cli/run.spec.js @@ -79,7 +79,7 @@ describe('run command', function() { cb(0, 'yep'); }); cordova.run('android', function() { - expect(spy.mostRecentCall.args[0]).toMatch(/cordova.run" --device$/gi); + expect(spy.mostRecentCall.args[0]).toMatch(/cordova.run" --debug --device$/gi); done(); }); }); http://git-wip-us.apache.org/repos/asf/cordova-cli/blob/ca42474a/src/emulate.js ---------------------------------------------------------------------- diff --git a/src/emulate.js b/src/emulate.js index ba2883b..a6460c9 100644 --- a/src/emulate.js +++ b/src/emulate.js @@ -31,7 +31,7 @@ var cordova_util = require('./util'), util = require('util'); function shell_out_to_emulate(root, platform, callback) { - var cmd = '"' + path.join(root, 'platforms', platform, 'cordova', 'run') + '" --emulator'; + var cmd = '"' + path.join(root, 'platforms', platform, 'cordova', 'run') + '" --debug --emulator'; events.emit('log', 'Running on emulator for platform "' + platform + '" via command "' + cmd + '" (output to follow)...'); shell.exec(cmd, {silent:true, async:true}, function(code, output) { events.emit('log', output); http://git-wip-us.apache.org/repos/asf/cordova-cli/blob/ca42474a/src/run.js ---------------------------------------------------------------------- diff --git a/src/run.js b/src/run.js index 5777599..63af0a3 100644 --- a/src/run.js +++ b/src/run.js @@ -27,7 +27,7 @@ var cordova_util = require('./util'), n = require('ncallbacks'); function shell_out_to_run(projectRoot, platform, callback) { - var cmd = '"' + path.join(projectRoot, 'platforms', platform, 'cordova', 'run') + '" --device'; + var cmd = '"' + path.join(projectRoot, 'platforms', platform, 'cordova', 'run') + '" --debug --device'; events.emit('log', 'Running app on platform "' + platform + '" with command "' + cmd + '" (output to follow)...'); shell.exec(cmd, {silent:true, async:true}, function(code, output) {
