You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by ka...@apache.org on 2014/05/16 20:30:46 UTC
git commit: Style fixes in plugman/insall.js,
jshint runs with no warnings
Repository: cordova-lib
Updated Branches:
refs/heads/master b9347eea3 -> f9e3ed1e5
Style fixes in plugman/insall.js, jshint runs with no warnings
Project: http://git-wip-us.apache.org/repos/asf/cordova-lib/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-lib/commit/f9e3ed1e
Tree: http://git-wip-us.apache.org/repos/asf/cordova-lib/tree/f9e3ed1e
Diff: http://git-wip-us.apache.org/repos/asf/cordova-lib/diff/f9e3ed1e
Branch: refs/heads/master
Commit: f9e3ed1e57bc20298f9d8aba759d48cabaa62844
Parents: b9347ee
Author: Mark Koudritsky <ka...@gmail.com>
Authored: Fri May 16 14:28:59 2014 -0400
Committer: Mark Koudritsky <ka...@gmail.com>
Committed: Fri May 16 14:28:59 2014 -0400
----------------------------------------------------------------------
cordova-lib/src/plugman/install.js | 31 +++++++++++++++++++------------
1 file changed, 19 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/f9e3ed1e/cordova-lib/src/plugman/install.js
----------------------------------------------------------------------
diff --git a/cordova-lib/src/plugman/install.js b/cordova-lib/src/plugman/install.js
index da630e3..7d2d664 100644
--- a/cordova-lib/src/plugman/install.js
+++ b/cordova-lib/src/plugman/install.js
@@ -1,3 +1,5 @@
+/* jshint node:true, asi:true, laxcomma:true, sub:true, expr:true */
+
var path = require('path'),
fs = require('fs'),
action_stack = require('./util/action-stack'),
@@ -218,13 +220,14 @@ function getEngines(pluginElement, platform, project_dir, plugin_dir){
function isPluginInstalled(plugins_dir, platform, plugin_id) {
+ var installed_plugin_id;
var platform_config = config_changes.get_platform_json(plugins_dir, platform);
- for (var installed_plugin_id in platform_config.installed_plugins) {
+ for (installed_plugin_id in platform_config.installed_plugins) {
if (installed_plugin_id == plugin_id) {
return true;
}
}
- for (var installed_plugin_id in platform_config.dependent_plugins) {
+ for (installed_plugin_id in platform_config.dependent_plugins) {
if (installed_plugin_id == plugin_id) {
return true;
}
@@ -370,13 +373,14 @@ function tryFetchDependency(dep, install, options) {
// The easy case of relative paths is to have a URL of '.' and a different subdir.
// TODO: Implement the hard case of different repo URLs, rather than the special case of
// same-repo-different-subdir.
+ var relativePath;
if ( dep.url == '.' ) {
// Look up the parent plugin's fetch metadata and determine the correct URL.
var fetchdata = require('./util/metadata').get_fetch_metadata(install.top_plugin_dir);
if (!fetchdata || !(fetchdata.source && fetchdata.source.type)) {
- var relativePath = dep.subdir || dep.id;
+ relativePath = dep.subdir || dep.id;
events.emit('warn', 'No fetch metadata found for plugin ' + install.top_plugin_id + '. checking for ' + relativePath + ' in '+ options.searchpath.join(','));
@@ -445,7 +449,7 @@ function tryFetchDependency(dep, install, options) {
// Test relative to parent folder
if( dep.url && isRelativePath(dep.url) ) {
- var relativePath = path.resolve(install.top_plugin_dir, '../' + dep.url);
+ relativePath = path.resolve(install.top_plugin_dir, '../' + dep.url);
if( fs.existsSync(relativePath) ) {
dep.url = relativePath;
@@ -462,11 +466,13 @@ function tryFetchDependency(dep, install, options) {
function installDependency(dep, install, options) {
+ var opts;
+
dep.install_dir = path.join(install.plugins_dir, dep.id);
if ( fs.existsSync(dep.install_dir) ) {
events.emit('verbose', 'Dependent plugin "' + dep.id + '" already fetched, using that version.');
- var opts = underscore.extend({}, options, {
+ opts = underscore.extend({}, options, {
cli_variables: install.filtered_variables,
is_top_level: false
});
@@ -476,7 +482,7 @@ function installDependency(dep, install, options) {
} else {
events.emit('verbose', 'Dependent plugin "' + dep.id + '" not fetched, retrieving then installing.');
- var opts = underscore.extend({}, options, {
+ opts = underscore.extend({}, options, {
cli_variables: install.filtered_variables,
is_top_level: false,
subdir: dep.subdir,
@@ -492,7 +498,7 @@ function installDependency(dep, install, options) {
return runInstall(install.actions, install.platform, install.project_dir, plugin_dir, install.plugins_dir, opts);
}
);
- };
+ }
}
function handleInstall(actions, plugin_id, plugin_et, platform, project_dir, plugins_dir, plugin_dir, filtered_variables, www_dir, is_top_level) {
@@ -507,13 +513,13 @@ function handleInstall(actions, plugin_id, plugin_et, platform, project_dir, plu
var assets = plugin_et.findall('asset');
if (platformTag) {
-
+ assets = assets.concat(platformTag.findall('./asset'));
var sourceFiles = platformTag.findall('./source-file'),
headerFiles = platformTag.findall('./header-file'),
resourceFiles = platformTag.findall('./resource-file'),
frameworkFiles = platformTag.findall('./framework[@custom="true"]'), // CB-5238 adding only custom frameworks
- libFiles = platformTag.findall('./lib-file'),
- assets = assets.concat(platformTag.findall('./asset'));
+ libFiles = platformTag.findall('./lib-file');
+
// queue up native stuff
sourceFiles && sourceFiles.forEach(function(item) {
@@ -618,13 +624,14 @@ function copyPlugin(plugin_src_dir, plugins_dir, link) {
}
function isPluginInstalled(plugins_dir, platform, plugin_id) {
+ var installed_plugin_id;
var platform_config = config_changes.get_platform_json(plugins_dir, platform);
- for (var installed_plugin_id in platform_config.installed_plugins) {
+ for (installed_plugin_id in platform_config.installed_plugins) {
if (installed_plugin_id == plugin_id) {
return true;
}
}
- for (var installed_plugin_id in platform_config.dependent_plugins) {
+ for (installed_plugin_id in platform_config.dependent_plugins) {
if (installed_plugin_id == plugin_id) {
return true;
}