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 2014/01/15 16:34:01 UTC
[1/2] git commit: Fix move from lodash->underscore where underscore
doesn't have "merge"
Updated Branches:
refs/heads/master b0d422719 -> 3fdbaf70a
Fix move from lodash->underscore where underscore doesn't have "merge"
Project: http://git-wip-us.apache.org/repos/asf/cordova-cli/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-cli/commit/70e835db
Tree: http://git-wip-us.apache.org/repos/asf/cordova-cli/tree/70e835db
Diff: http://git-wip-us.apache.org/repos/asf/cordova-cli/diff/70e835db
Branch: refs/heads/master
Commit: 70e835db452abc2d8baa5cd44c88b44476545135
Parents: b0d4227
Author: Andrew Grieve <ag...@chromium.org>
Authored: Wed Jan 15 10:32:33 2014 -0500
Committer: Andrew Grieve <ag...@chromium.org>
Committed: Wed Jan 15 10:32:33 2014 -0500
----------------------------------------------------------------------
src/cli.js | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-cli/blob/70e835db/src/cli.js
----------------------------------------------------------------------
diff --git a/src/cli.js b/src/cli.js
index 8cabad8..d22ba56 100644
--- a/src/cli.js
+++ b/src/cli.js
@@ -138,7 +138,8 @@ module.exports = function CLI(inputArgs) {
if (args.link) {
wwwCfg.link = true;
}
- _.merge(cfg, {lib: {www: wwwCfg}} );
+ cfg.lib = cfg.lib || {};
+ cfg.lib.www = wwwCfg;
}
// create(dir, id, name, cfg)
cordova.raw[cmd].call(this, args._[1], args._[2], args._[3], cfg).done();
[2/2] git commit: CB-5006 Fix searchpath not being passed to
dependent plugins.
Posted by ag...@apache.org.
CB-5006 Fix searchpath not being passed to dependent plugins.
Project: http://git-wip-us.apache.org/repos/asf/cordova-cli/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-cli/commit/3fdbaf70
Tree: http://git-wip-us.apache.org/repos/asf/cordova-cli/tree/3fdbaf70
Diff: http://git-wip-us.apache.org/repos/asf/cordova-cli/diff/3fdbaf70
Branch: refs/heads/master
Commit: 3fdbaf70a83386dbafbaa825d60bcf1bd6198c9c
Parents: 70e835d
Author: Andrew Grieve <ag...@chromium.org>
Authored: Wed Jan 15 10:33:41 2014 -0500
Committer: Andrew Grieve <ag...@chromium.org>
Committed: Wed Jan 15 10:33:41 2014 -0500
----------------------------------------------------------------------
src/plugin.js | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-cli/blob/3fdbaf70/src/plugin.js
----------------------------------------------------------------------
diff --git a/src/plugin.js b/src/plugin.js
index 3d04600..5ef98ce 100644
--- a/src/plugin.js
+++ b/src/plugin.js
@@ -84,6 +84,7 @@ module.exports = function plugin(command, targets, opts) {
}
var config_json = config(projectRoot, {});
+ var searchPath = opts.searchpath || config_json.plugin_search_path;
return hooks.fire('before_plugin_add', opts)
.then(function() {
@@ -97,7 +98,7 @@ module.exports = function plugin(command, targets, opts) {
// Fetch the plugin first.
events.emit('verbose', 'Calling plugman.fetch on plugin "' + target + '"');
var plugman = require('plugman');
- return plugman.raw.fetch(target, pluginsDir, { searchpath: opts.searchpath || config_json.plugin_search_path });
+ return plugman.raw.fetch(target, pluginsDir, { searchpath: searchPath});
})
.fail(function(err) {
return Q.reject(new Error('Fetching plugin failed: ' + err));
@@ -111,7 +112,8 @@ module.exports = function plugin(command, targets, opts) {
parser = new platforms[platform].parser(platformRoot),
options = {
www_dir: parser.staging_dir(),
- cli_variables: {}
+ cli_variables: {},
+ searchpath: searchPath
},
tokens,
key,