cordova-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From agri...@apache.org
Subject [3/6] android commit: CB-4914 Fix build whitespace issue
Date Tue, 13 Jan 2015 15:01:52 GMT
CB-4914 Fix build whitespace issue


Project: http://git-wip-us.apache.org/repos/asf/cordova-android/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-android/commit/8e5c93a3
Tree: http://git-wip-us.apache.org/repos/asf/cordova-android/tree/8e5c93a3
Diff: http://git-wip-us.apache.org/repos/asf/cordova-android/diff/8e5c93a3

Branch: refs/heads/master
Commit: 8e5c93a31fb88108f1d97e933816584ecbbb939f
Parents: 0e5d72d
Author: Murat Sutunc <muratsu@microsoft.com>
Authored: Mon Jan 12 22:54:37 2015 -0800
Committer: Andrew Grieve <agrieve@chromium.org>
Committed: Tue Jan 13 09:59:29 2015 -0500

----------------------------------------------------------------------
 bin/templates/cordova/lib/spawn.js | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-android/blob/8e5c93a3/bin/templates/cordova/lib/spawn.js
----------------------------------------------------------------------
diff --git a/bin/templates/cordova/lib/spawn.js b/bin/templates/cordova/lib/spawn.js
index d5b0dce..3e500a0 100644
--- a/bin/templates/cordova/lib/spawn.js
+++ b/bin/templates/cordova/lib/spawn.js
@@ -26,13 +26,15 @@ var isWindows = process.platform.slice(0, 3) == 'win';
 // Takes a command and optional current working directory.
 module.exports = function(cmd, args, opt_cwd) {
     var d = Q.defer();
+    var opts = { cwd: opt_cwd, stdio: 'inherit' };
     try {
         // Work around spawn not being able to find .bat files.
         if (isWindows) {
-          args.unshift('/s', '/c', cmd);
-          cmd = 'cmd';
+            args = [['/s', '/c', '"' + [cmd].concat(args).map(function(a){if (/^[^"].* .*[^"]/.test(a))
return '"' + a + '"'; return a;}).join(' ')+'"'].join(' ')];
+            cmd = 'cmd';
+            opts.windowsVerbatimArguments = true;
         }
-        var child = child_process.spawn(cmd, args, {cwd: opt_cwd, stdio: 'inherit'});
+        var child = child_process.spawn(cmd, args, opts);
         child.on('exit', function(code) {
             if (code) {
                 d.reject('Error code ' + code + ' for command: ' + cmd + ' with args: ' +
args);
@@ -45,5 +47,4 @@ module.exports = function(cmd, args, opt_cwd) {
         d.reject(e);
     }
     return d.promise;
-}
-
+};


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org


Mime
View raw message