You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by fi...@apache.org on 2012/11/28 19:16:24 UTC
[31/50] git commit: Update pluginstall + xcode dependencies. Fixes
#49 and #50
Update pluginstall + xcode dependencies. Fixes #49 and #50
Project: http://git-wip-us.apache.org/repos/asf/cordova-cli/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-cli/commit/1f5dd3e5
Tree: http://git-wip-us.apache.org/repos/asf/cordova-cli/tree/1f5dd3e5
Diff: http://git-wip-us.apache.org/repos/asf/cordova-cli/diff/1f5dd3e5
Branch: refs/heads/master
Commit: 1f5dd3e5543b68739cdca5491b6c0f250a7d77c4
Parents: a241537
Author: Fil Maj <ma...@gmail.com>
Authored: Thu Oct 18 13:23:06 2012 -0700
Committer: Fil Maj <ma...@gmail.com>
Committed: Thu Oct 18 13:23:06 2012 -0700
----------------------------------------------------------------------
bin/cordova | 5 ++---
package.json | 4 ++--
src/plugin.js | 8 ++++----
3 files changed, 8 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-cli/blob/1f5dd3e5/bin/cordova
----------------------------------------------------------------------
diff --git a/bin/cordova b/bin/cordova
index 6e42147..6595799 100755
--- a/bin/cordova
+++ b/bin/cordova
@@ -23,7 +23,7 @@ while (current = tokens.shift()) {
// TODO figure out how to incorporate -d logging
if (version) {
console.log(require('../package').version);
-} else if (cmd === undefined) {
+} else if (cmd === undefined) {
console.log(cordova.help());
} else if (cordova.hasOwnProperty(cmd)) {
var opts = Array.prototype.slice.call(tokens, 0);
@@ -41,7 +41,6 @@ if (version) {
r = cordova[cmd].apply(this, opts);
}
if (r) console.log(r);
-}
-else {
+} else {
console.error('Cordova does not know ' + cmd + '; try help for a list of all the available commands.')
}
http://git-wip-us.apache.org/repos/asf/cordova-cli/blob/1f5dd3e5/package.json
----------------------------------------------------------------------
diff --git a/package.json b/package.json
index a4f14d8..4ba15b9 100644
--- a/package.json
+++ b/package.json
@@ -22,8 +22,8 @@
"dependencies": {
"colors":">=0.6.0",
"elementtree":"0.1.3",
- "pluginstall":"git://github.com/imhotep/pluginstall.git",
- "node-xcode":"git://github.com/imhotep/node-xcode.git",
+ "pluginstall":"git://github.com/imhotep/pluginstall.git#0.3.4",
+ "xcode":"0.5.1",
"plist":"0.4.0",
"express":"3.0",
"shelljs":"0.0.7",
http://git-wip-us.apache.org/repos/asf/cordova-cli/blob/1f5dd3e5/src/plugin.js
----------------------------------------------------------------------
diff --git a/src/plugin.js b/src/plugin.js
index 692a4eb..474d586 100644
--- a/src/plugin.js
+++ b/src/plugin.js
@@ -84,12 +84,12 @@ module.exports = function plugin(command, targets, callback) {
var pluginWww = path.join(target, 'www');
var wwwContents = ls(pluginWww);
- var cli = path.join(__dirname, '..', 'node_modules', 'pluginstall', 'cli.js');
+ var cli = path.join(__dirname, '..', 'node_modules', 'pluginstall', 'pluginstall.js');
// Iterate over all matchin app-plugin platforms in the project and install the
// plugin.
intersection.forEach(function(platform) {
- var cmd = util.format('%s %s "%s" "%s"', cli, platform, path.join(projectRoot, 'platforms', platform), target);
+ var cmd = util.format('%s --platform %s --project "%s" --plugin "%s"', cli, platform, path.join(projectRoot, 'platforms', platform), target);
var plugin_cli = shell.exec(cmd, {silent:true});
if (plugin_cli.code > 0) throw 'An error occured during plugin installation for ' + platform + '. ' + cli.output;
});
@@ -129,7 +129,7 @@ module.exports = function plugin(command, targets, callback) {
hooks.fire('before_plugin_rm');
var pluginWww = path.join(targetPath, 'www');
var wwwContents = ls(pluginWww);
- var cli = path.join(__dirname, '..', 'node_modules', 'pluginstall', 'cli.js');
+ var cli = path.join(__dirname, '..', 'node_modules', 'pluginstall', 'pluginstall.js');
// Check if there is at least one match between plugin
// supported platforms and app platforms
@@ -142,7 +142,7 @@ module.exports = function plugin(command, targets, callback) {
// Iterate over all matchin app-plugin platforms in the project and uninstall the
// plugin.
intersection.forEach(function(platform) {
- var cmd = util.format('%s -d %s "%s" "%s"', cli, platform, path.join(projectRoot, 'platforms', platform), targetPath);
+ var cmd = util.format('%s --platform %s --project "%s" --plugin "%s" --remove', cli, platform, path.join(projectRoot, 'platforms', platform), targetPath);
var plugin_cli = shell.exec(cmd, {silent:true});
if (plugin_cli.code > 0) throw 'An error occured during plugin uninstallation for ' + platform + '. ' + cli.output;
});