cordova-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fil...@apache.org
Subject git commit: 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.
Date Wed, 05 Jun 2013 20:50:42 GMT
Updated Branches:
  refs/heads/master2 4c3680c36 -> 6d3381393


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/6d338139
Tree: http://git-wip-us.apache.org/repos/asf/cordova-cli/tree/6d338139
Diff: http://git-wip-us.apache.org/repos/asf/cordova-cli/diff/6d338139

Branch: refs/heads/master2
Commit: 6d3381393fd71349fa30a515100aeeec503a3644
Parents: 4c3680c
Author: Fil Maj <maj.fil@gmail.com>
Authored: Wed Jun 5 13:50:37 2013 -0700
Committer: Fil Maj <maj.fil@gmail.com>
Committed: Wed Jun 5 13:50:37 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/6d338139/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/6d338139/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/6d338139/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/6d338139/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) {


Mime
View raw message