Repository: cordova-lib Updated Branches: refs/heads/master 9ce2e6e63 -> 67c486913
Pass the searchpath when installing plugins Passes the searchpath option to plugin add. github: close #120 Project: http://git-wip-us.apache.org/repos/asf/cordova-lib/repo Commit: http://git-wip-us.apache.org/repos/asf/cordova-lib/commit/67c48691 Tree: http://git-wip-us.apache.org/repos/asf/cordova-lib/tree/67c48691 Diff: http://git-wip-us.apache.org/repos/asf/cordova-lib/diff/67c48691 Branch: refs/heads/master Commit: 67c486913ad198a8534fbdd03ddd3504b8aef4b0 Parents: 9ce2e6e Author: Gorkem Ercan <[email protected]> Authored: Fri Nov 14 12:12:32 2014 -0500 Committer: Mark Koudritsky <[email protected]> Committed: Thu Nov 20 11:18:13 2014 -0500 ---------------------------------------------------------------------- cordova-lib/src/cordova/restore.js | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/67c48691/cordova-lib/src/cordova/restore.js ---------------------------------------------------------------------- diff --git a/cordova-lib/src/cordova/restore.js b/cordova-lib/src/cordova/restore.js index eff7055..8070eb0 100644 --- a/cordova-lib/src/cordova/restore.js +++ b/cordova-lib/src/cordova/restore.js @@ -32,12 +32,12 @@ var cordova_util = require('./util'), CordovaError = require('../CordovaError'); module.exports = restore; -function restore(target){ +function restore(target, args){ var projectHome = cordova_util.cdProjectRoot(); var configPath = cordova_util.projectConfig(projectHome); var configXml = new ConfigParser(configPath); if( 'plugins' === target ){ - return installPluginsFromConfigXML(configXml); + return installPluginsFromConfigXML(configXml, args); } if( 'platforms' === target ){ return installPlatformsFromConfigXML(configXml); @@ -72,7 +72,7 @@ function installPlatformsFromConfigXML(cfg){ } //returns a Promise -function installPluginsFromConfigXML(cfg) { +function installPluginsFromConfigXML(cfg, args) { //Install plugins that are listed on config.xml var projectRoot = cordova_util.cdProjectRoot(); var plugins_dir = path.join(projectRoot, 'plugins'); @@ -99,7 +99,8 @@ function installPluginsFromConfigXML(cfg) { installFrom += ('@' + feature.version); } // Add feature preferences as CLI variables if have any - var options = {cli_variables: feature.variables }; + var options = {cli_variables: feature.variables, + searchpath: args.searchpath }; return plugin('add', installFrom, options); }); --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
