You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by om...@apache.org on 2015/09/05 04:25:21 UTC
cordova-lib git commit: CB-8993 Plugin restore ignores search path
Repository: cordova-lib
Updated Branches:
refs/heads/master 4ca15f2be -> f68562747
CB-8993 Plugin restore ignores search path
When restoring a platform the search path needs to be provided otherwise
plugins will always be resolved to npm.
Project: http://git-wip-us.apache.org/repos/asf/cordova-lib/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-lib/commit/f6856274
Tree: http://git-wip-us.apache.org/repos/asf/cordova-lib/tree/f6856274
Diff: http://git-wip-us.apache.org/repos/asf/cordova-lib/diff/f6856274
Branch: refs/heads/master
Commit: f68562747a8b3788b09229292d6291496d08448a
Parents: 4ca15f2
Author: Marcus Pridham <ma...@sap.com>
Authored: Mon Aug 31 12:08:58 2015 -0400
Committer: Omar Mefire <om...@gmail.com>
Committed: Fri Sep 4 18:27:43 2015 -0700
----------------------------------------------------------------------
cordova-lib/src/cordova/prepare.js | 12 ++++++++++--
cordova-lib/src/cordova/restore-util.js | 4 ++--
2 files changed, 12 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/f6856274/cordova-lib/src/cordova/prepare.js
----------------------------------------------------------------------
diff --git a/cordova-lib/src/cordova/prepare.js b/cordova-lib/src/cordova/prepare.js
index 4125bb3..7ad8183 100644
--- a/cordova-lib/src/cordova/prepare.js
+++ b/cordova-lib/src/cordova/prepare.js
@@ -37,8 +37,16 @@ function prepare(options) {
var hooksRunner = new HooksRunner(projectRoot);
return hooksRunner.fire('before_prepare', options)
.then(function(){
- var platformsToRestore = options && options.platforms || [];
- return restore.installPlatformsFromConfigXML(platformsToRestore);
+ return restore.installPlatformsFromConfigXML(options.platforms, { searchpath : options.searchpath });
+ })
+ .then(function(){
+ options = cordova_util.preProcessOptions(options);
+ var paths = options.platforms.map(function(p) {
+ var platform_path = path.join(projectRoot, 'platforms', p);
+ var parser = platforms.getPlatformProject(p, platform_path);
+ return parser.www_dir();
+ });
+ options.paths = paths;
})
.then(function() {
options = cordova_util.preProcessOptions(options);
http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/f6856274/cordova-lib/src/cordova/restore-util.js
----------------------------------------------------------------------
diff --git a/cordova-lib/src/cordova/restore-util.js b/cordova-lib/src/cordova/restore-util.js
index 3d238b5..aa3e9d2 100644
--- a/cordova-lib/src/cordova/restore-util.js
+++ b/cordova-lib/src/cordova/restore-util.js
@@ -32,7 +32,7 @@ exports.installPluginsFromConfigXML = installPluginsFromConfigXML;
exports.installPlatformsFromConfigXML = installPlatformsFromConfigXML;
-function installPlatformsFromConfigXML(platforms) {
+function installPlatformsFromConfigXML(platforms, opts) {
var projectHome = cordova_util.cdProjectRoot();
var configPath = cordova_util.projectConfig(projectHome);
var cfg = new ConfigParser(configPath);
@@ -68,7 +68,7 @@ function installPlatformsFromConfigXML(platforms) {
return promiseutil.Q_chainmap_graceful(targets, function(target) {
if (target) {
events.emit('log', 'Restoring platform ' + target + ' referenced on config.xml');
- return cordova.raw.platform('add', target);
+ return cordova.raw.platform('add', target, opts);
}
return Q();
}, function(err) {
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org