You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by ti...@apache.org on 2015/07/15 03:29:48 UTC
cordova-lib git commit: Fix prepare to wait the promise from plugman
prepare.
Repository: cordova-lib
Updated Branches:
refs/heads/master 6ab017924 -> f818696bf
Fix prepare to wait the promise from plugman prepare.
This closes #259
Project: http://git-wip-us.apache.org/repos/asf/cordova-lib/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-lib/commit/f818696b
Tree: http://git-wip-us.apache.org/repos/asf/cordova-lib/tree/f818696b
Diff: http://git-wip-us.apache.org/repos/asf/cordova-lib/diff/f818696b
Branch: refs/heads/master
Commit: f818696bf9a4515b51c8cb98cc33cd00f2ebb417
Parents: 6ab0179
Author: giuseppelt <gi...@live.com>
Authored: Tue Jul 14 10:48:44 2015 +0200
Committer: Tim Barham <ti...@microsoft.com>
Committed: Wed Jul 15 11:28:55 2015 +1000
----------------------------------------------------------------------
cordova-lib/src/cordova/prepare.js | 45 +++++++++++++++++----------------
cordova-lib/src/plugman/prepare.js | 3 +++
2 files changed, 26 insertions(+), 22 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/f818696b/cordova-lib/src/cordova/prepare.js
----------------------------------------------------------------------
diff --git a/cordova-lib/src/cordova/prepare.js b/cordova-lib/src/cordova/prepare.js
index adbf1c6..797200b 100644
--- a/cordova-lib/src/cordova/prepare.js
+++ b/cordova-lib/src/cordova/prepare.js
@@ -106,28 +106,29 @@ function prepare(options) {
if (options.browserify) {
plugman.prepare = require('../plugman/prepare-browserify');
}
- plugman.prepare(platformPath, platform, plugins_dir, null, true, pluginInfoProvider);
-
- // Make sure that config changes for each existing plugin is in place
- var platformJson = PlatformJson.load(plugins_dir, platform);
- var munger = new PlatformMunger(platform, platformPath, plugins_dir, platformJson, pluginInfoProvider);
- munger.reapply_global_munge();
- munger.save_all();
-
- // Update platform config.xml based on top level config.xml
- var cfg = new ConfigParser(xml);
- var platform_cfg = new ConfigParser(parser.config_xml());
- exports._mergeXml(cfg.doc.getroot(), platform_cfg.doc.getroot(), platform, true);
-
- // CB-6976 Windows Universal Apps. For smooth transition and to prevent mass api failures
- // we allow using windows8 tag for new windows platform
- if (platform == 'windows') {
- exports._mergeXml(cfg.doc.getroot(), platform_cfg.doc.getroot(), 'windows8', true);
- }
-
- platform_cfg.write();
-
- return parser.update_project(cfg);
+
+ return plugman.prepare(platformPath, platform, plugins_dir, null, true, pluginInfoProvider).then(function () {
+ // Make sure that config changes for each existing plugin is in place
+ var platformJson = PlatformJson.load(plugins_dir, platform);
+ var munger = new PlatformMunger(platform, platformPath, plugins_dir, platformJson, pluginInfoProvider);
+ munger.reapply_global_munge();
+ munger.save_all();
+
+ // Update platform config.xml based on top level config.xml
+ var cfg = new ConfigParser(xml);
+ var platform_cfg = new ConfigParser(parser.config_xml());
+ exports._mergeXml(cfg.doc.getroot(), platform_cfg.doc.getroot(), platform, true);
+
+ // CB-6976 Windows Universal Apps. For smooth transition and to prevent mass api failures
+ // we allow using windows8 tag for new windows platform
+ if (platform == 'windows') {
+ exports._mergeXml(cfg.doc.getroot(), platform_cfg.doc.getroot(), 'windows8', true);
+ }
+
+ platform_cfg.write();
+
+ return parser.update_project(cfg);
+ });
})).then(function() {
return hooksRunner.fire('after_prepare', options);
});
http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/f818696b/cordova-lib/src/plugman/prepare.js
----------------------------------------------------------------------
diff --git a/cordova-lib/src/plugman/prepare.js b/cordova-lib/src/plugman/prepare.js
index 55ac90f..c52d92e 100644
--- a/cordova-lib/src/plugman/prepare.js
+++ b/cordova-lib/src/plugman/prepare.js
@@ -25,6 +25,7 @@ var platform_modules = require('../platforms/platforms'),
common = require('./platforms/common'),
fs = require('fs'),
shell = require('shelljs'),
+ Q = require('q'),
events = require('../events');
var PlatformJson = require('./util/PlatformJson');
var PluginInfoProvider = require('../PluginInfoProvider');
@@ -153,4 +154,6 @@ module.exports = function handlePrepare(project_dir, platform, plugins_dir, www_
events.emit('verbose', 'Writing out cordova_plugins.js...');
fs.writeFileSync(path.join(wwwDir, 'cordova_plugins.js'), final_contents, 'utf-8');
+
+ return Q();
};
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org