You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by fi...@apache.org on 2013/06/05 21:36:08 UTC
git commit: 2.8.7. updated emulate + run commands to use proper flags
and whatnot.
Updated Branches:
refs/heads/master2 a817a29dd -> 4c3680c36
2.8.7. updated emulate + run commands to use proper flags and whatnot.
Project: http://git-wip-us.apache.org/repos/asf/cordova-cli/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-cli/commit/4c3680c3
Tree: http://git-wip-us.apache.org/repos/asf/cordova-cli/tree/4c3680c3
Diff: http://git-wip-us.apache.org/repos/asf/cordova-cli/diff/4c3680c3
Branch: refs/heads/master2
Commit: 4c3680c36b2f6b0d6bd4458cf6a34eee5a9d0313
Parents: a817a29
Author: Fil Maj <ma...@gmail.com>
Authored: Wed Jun 5 12:36:02 2013 -0700
Committer: Fil Maj <ma...@gmail.com>
Committed: Wed Jun 5 12:36:02 2013 -0700
----------------------------------------------------------------------
package.json | 2 +-
spec/cordova-cli/emulate.spec.js | 2 +-
spec/cordova-cli/run.spec.js | 2 +-
src/emulate.js | 2 +-
src/run.js | 2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-cli/blob/4c3680c3/package.json
----------------------------------------------------------------------
diff --git a/package.json b/package.json
index 38ac8a3..2ab9de2 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "cordova",
- "version": "2.8.6",
+ "version": "2.8.7",
"preferGlobal": "true",
"description": "Cordova command line interface tool",
"main": "cordova",
http://git-wip-us.apache.org/repos/asf/cordova-cli/blob/4c3680c3/spec/cordova-cli/emulate.spec.js
----------------------------------------------------------------------
diff --git a/spec/cordova-cli/emulate.spec.js b/spec/cordova-cli/emulate.spec.js
index 64464cb..8df6ce3 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.emulate"$/gi);
+ expect(s.mostRecentCall.args[0]).toMatch(/cordova.run" --emulator$/gi);
}).not.toThrow();
});
});
http://git-wip-us.apache.org/repos/asf/cordova-cli/blob/4c3680c3/spec/cordova-cli/run.spec.js
----------------------------------------------------------------------
diff --git a/spec/cordova-cli/run.spec.js b/spec/cordova-cli/run.spec.js
index fb4da30..6904c73 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"$/gi);
+ expect(spy.mostRecentCall.args[0]).toMatch(/cordova.run" --device$/gi);
done();
});
});
http://git-wip-us.apache.org/repos/asf/cordova-cli/blob/4c3680c3/src/emulate.js
----------------------------------------------------------------------
diff --git a/src/emulate.js b/src/emulate.js
index 9dd8857..ba2883b 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', 'emulate') + '"';
+ var cmd = '"' + path.join(root, 'platforms', platform, 'cordova', 'run') + '" --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/4c3680c3/src/run.js
----------------------------------------------------------------------
diff --git a/src/run.js b/src/run.js
index c13e4ab..5777599 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') + '"';
+ var cmd = '"' + path.join(projectRoot, 'platforms', platform, 'cordova', 'run') + '" --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) {