You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by ag...@apache.org on 2013/12/19 16:30:56 UTC
git commit: CB-5674 Don't install plugins in parallel when adding a
platform.
Updated Branches:
refs/heads/master 4a5dc4040 -> d7e3e896f
CB-5674 Don't install plugins in parallel when adding a platform.
Project: http://git-wip-us.apache.org/repos/asf/cordova-cli/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-cli/commit/d7e3e896
Tree: http://git-wip-us.apache.org/repos/asf/cordova-cli/tree/d7e3e896
Diff: http://git-wip-us.apache.org/repos/asf/cordova-cli/diff/d7e3e896
Branch: refs/heads/master
Commit: d7e3e896fb59cd0c56088f6e7a609900fb5b3dd3
Parents: 4a5dc40
Author: Andrew Grieve <ag...@chromium.org>
Authored: Thu Dec 19 10:29:38 2013 -0500
Committer: Andrew Grieve <ag...@chromium.org>
Committed: Thu Dec 19 10:29:38 2013 -0500
----------------------------------------------------------------------
src/platform.js | 15 +++++++++------
1 file changed, 9 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-cli/blob/d7e3e896/src/platform.js
----------------------------------------------------------------------
diff --git a/src/platform.js b/src/platform.js
index 21a61b7..ff6a319 100644
--- a/src/platform.js
+++ b/src/platform.js
@@ -253,12 +253,15 @@ function call_into_create(target, projectRoot, cfg, libDir, template_dir) {
var plugins = cordova_util.findPlugins(plugins_dir);
var parser = new platforms[target].parser(output);
if (!plugins) return Q();
- var promises = plugins.map(function(plugin) {
- events.emit('verbose', 'Installing plugin "' + plugin + '" following successful platform add of ' + target);
- return require('plugman').install(target, output, path.basename(plugin), plugins_dir, { www_dir: parser.staging_dir() });
- });
- return promises.reduce(function(soFar, f) {
- return soFar.then(f);
+
+ var plugman = require('plugman');
+ var staging_dir = parser.staging_dir();
+ // Install them serially.
+ return plugins.reduce(function(soFar, plugin) {
+ return soFar.then(function() {
+ events.emit('verbose', 'Installing plugin "' + plugin + '" following successful platform add of ' + target);
+ return plugman.raw.install(target, output, path.basename(plugin), plugins_dir, { www_dir: staging_dir});
+ });
}, Q());
});
});