You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by ni...@apache.org on 2015/09/06 16:23:31 UTC
cordova-lib git commit: Misc bug fixes - prepare failure,
check_reqs bug, improved logging
Repository: cordova-lib
Updated Branches:
refs/heads/master 59cac5b69 -> 7c62b98a9
Misc bug fixes - prepare failure, check_reqs bug, improved logging
Project: http://git-wip-us.apache.org/repos/asf/cordova-lib/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-lib/commit/7c62b98a
Tree: http://git-wip-us.apache.org/repos/asf/cordova-lib/tree/7c62b98a
Diff: http://git-wip-us.apache.org/repos/asf/cordova-lib/diff/7c62b98a
Branch: refs/heads/master
Commit: 7c62b98a9feeed1eee3417985211f2d4ae24d67e
Parents: 59cac5b
Author: Nikhil Khandelwal <ni...@microsoft.com>
Authored: Sun Sep 6 07:23:22 2015 -0700
Committer: Nikhil Khandelwal <ni...@microsoft.com>
Committed: Sun Sep 6 07:23:22 2015 -0700
----------------------------------------------------------------------
cordova-lib/src/cordova/prepare.js | 3 +--
cordova-lib/src/cordova/requirements.js | 7 +++++--
cordova-lib/src/plugman/install.js | 4 ++--
3 files changed, 8 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/7c62b98a/cordova-lib/src/cordova/prepare.js
----------------------------------------------------------------------
diff --git a/cordova-lib/src/cordova/prepare.js b/cordova-lib/src/cordova/prepare.js
index 7ad8183..16750c3 100644
--- a/cordova-lib/src/cordova/prepare.js
+++ b/cordova-lib/src/cordova/prepare.js
@@ -43,8 +43,7 @@ function prepare(options) {
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();
+ return platforms.getPlatformApi(p, platform_path).getPlatformInfo().locations.www;
});
options.paths = paths;
})
http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/7c62b98a/cordova-lib/src/cordova/requirements.js
----------------------------------------------------------------------
diff --git a/cordova-lib/src/cordova/requirements.js b/cordova-lib/src/cordova/requirements.js
index a0fa79b..a5f8e11 100644
--- a/cordova-lib/src/cordova/requirements.js
+++ b/cordova-lib/src/cordova/requirements.js
@@ -38,11 +38,14 @@ module.exports = function check_reqs(platforms) {
return knownPlatforms.getPlatformApi(platform).requirements();
}))
.then(function (settledChecks) {
- return settledChecks.reduce(function (result, settledCheck, idx) {
+ var res = {};
+ settledChecks.reduce(function (result, settledCheck, idx) {
var platformName = platforms[idx];
result[platformName] = settledCheck.state === 'fulfilled' ?
settledCheck.value :
new CordovaError(settledCheck.reason);
- }, {});
+ return result;
+ }, res);
+ return res;
});
};
http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/7c62b98a/cordova-lib/src/plugman/install.js
----------------------------------------------------------------------
diff --git a/cordova-lib/src/plugman/install.js b/cordova-lib/src/plugman/install.js
index 071e851..f6d39cd 100644
--- a/cordova-lib/src/plugman/install.js
+++ b/cordova-lib/src/plugman/install.js
@@ -279,9 +279,9 @@ function runInstall(actions, platform, project_dir, plugin_dir, plugins_dir, opt
msg += ' Making it top-level.';
platformJson.makeTopLevel(pluginInfo.id).save();
}
- events.emit('verbose', msg);
+ events.emit('log', msg);
} else {
- events.emit('verbose', 'Dependent plugin "' + pluginInfo.id + '" already installed on ' + platform + '.');
+ events.emit('log', 'Dependent plugin "' + pluginInfo.id + '" already installed on ' + platform + '.');
}
return Q();
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org