You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by da...@apache.org on 2016/04/26 16:46:37 UTC
cordova-lib git commit: CB-11036 'args.slice is not a function' when
building windows with other platform
Repository: cordova-lib
Updated Branches:
refs/heads/master 0c61fb097 -> b65196413
CB-11036 'args.slice is not a function' when building windows with other platform
Avoid options obj modification as it's then passed to other platforms
Project: http://git-wip-us.apache.org/repos/asf/cordova-lib/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-lib/commit/b6519641
Tree: http://git-wip-us.apache.org/repos/asf/cordova-lib/tree/b6519641
Diff: http://git-wip-us.apache.org/repos/asf/cordova-lib/diff/b6519641
Branch: refs/heads/master
Commit: b65196413d92ca9ce904abaa6c736ea6eefe7ebf
Parents: 0c61fb0
Author: daserge <v-...@microsoft.com>
Authored: Wed Apr 20 17:34:59 2016 +0300
Committer: daserge <v-...@microsoft.com>
Committed: Thu Apr 21 15:43:04 2016 +0300
----------------------------------------------------------------------
cordova-lib/src/cordova/compile.js | 5 +++--
cordova-lib/src/cordova/emulate.js | 6 ++++--
cordova-lib/src/cordova/prepare.js | 5 +++--
cordova-lib/src/cordova/run.js | 5 +++--
4 files changed, 13 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/b6519641/cordova-lib/src/cordova/compile.js
----------------------------------------------------------------------
diff --git a/cordova-lib/src/cordova/compile.js b/cordova-lib/src/cordova/compile.js
index 6a5adfb..a9b41ba 100644
--- a/cordova-lib/src/cordova/compile.js
+++ b/cordova-lib/src/cordova/compile.js
@@ -21,7 +21,8 @@ var Q = require('q'),
cordova_util = require('./util'),
HooksRunner = require('../hooks/HooksRunner'),
promiseUtil = require('../util/promise-util'),
- platform_lib = require('../platforms/platforms');
+ platform_lib = require('../platforms/platforms'),
+ _ = require('underscore');
// Returns a promise.
module.exports = function compile(options) {
@@ -35,7 +36,7 @@ module.exports = function compile(options) {
return promiseUtil.Q_chainmap(options.platforms, function (platform) {
return platform_lib
.getPlatformApi(platform)
- .build(options.options);
+ .build(_.clone(options.options));
});
}).then(function() {
return hooksRunner.fire('after_compile', options);
http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/b6519641/cordova-lib/src/cordova/emulate.js
----------------------------------------------------------------------
diff --git a/cordova-lib/src/cordova/emulate.js b/cordova-lib/src/cordova/emulate.js
index b2ac92b..2c8fea4 100644
--- a/cordova-lib/src/cordova/emulate.js
+++ b/cordova-lib/src/cordova/emulate.js
@@ -20,7 +20,9 @@
var cordova_util = require('./util'),
HooksRunner = require('../hooks/HooksRunner'),
Q = require('q'),
- platform_lib = require('../platforms/platforms');
+ platform_lib = require('../platforms/platforms'),
+ _ = require('underscore');
+
// Returns a promise.
module.exports = function emulate(options) {
@@ -40,7 +42,7 @@ module.exports = function emulate(options) {
return Q.all(options.platforms.map(function(platform) {
return platform_lib
.getPlatformApi(platform)
- .run(options.options);
+ .run(_.clone(options.options));
}));
}).then(function() {
return hooksRunner.fire('after_emulate', options);
http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/b6519641/cordova-lib/src/cordova/prepare.js
----------------------------------------------------------------------
diff --git a/cordova-lib/src/cordova/prepare.js b/cordova-lib/src/cordova/prepare.js
index 194122e..3aa61b2 100644
--- a/cordova-lib/src/cordova/prepare.js
+++ b/cordova-lib/src/cordova/prepare.js
@@ -29,7 +29,8 @@ var cordova_util = require('./util'),
restore = require('./restore-util'),
path = require('path'),
browserify = require('../plugman/browserify'),
- config = require('./config');
+ config = require('./config'),
+ _ = require('underscore');
// Returns a promise.
exports = module.exports = prepare;
@@ -100,7 +101,7 @@ function preparePlatforms (platformList, projectRoot, options) {
// Please note that plugins' changes, such as installed js files, assets and
// config changes is not being reinstalled on each prepare.
var platformApi = platforms.getPlatformApi(platform);
- return platformApi.prepare(project, options)
+ return platformApi.prepare(project, _.clone(options))
.then(function () {
if (platform === 'windows' && !(platformApi instanceof PlatformApiPoly)) {
// Windows Api doesn't fire 'pre_package' hook, so we fire it here
http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/b6519641/cordova-lib/src/cordova/run.js
----------------------------------------------------------------------
diff --git a/cordova-lib/src/cordova/run.js b/cordova-lib/src/cordova/run.js
index 323bf37..be15205 100644
--- a/cordova-lib/src/cordova/run.js
+++ b/cordova-lib/src/cordova/run.js
@@ -20,7 +20,8 @@
var cordova_util = require('./util'),
HooksRunner = require('../hooks/HooksRunner'),
Q = require('q'),
- platform_lib = require('../platforms/platforms');
+ platform_lib = require('../platforms/platforms'),
+ _ = require('underscore');
// Returns a promise.
@@ -41,7 +42,7 @@ module.exports = function run(options) {
return Q.all(options.platforms.map(function(platform) {
return platform_lib
.getPlatformApi(platform)
- .run(options.options);
+ .run(_.clone(options.options));
}));
}).then(function() {
return hooksRunner.fire('after_run', options);
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org