cordova-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fil...@apache.org
Subject [10/16] git commit: Updating calls to plugman after a refactoring there
Date Mon, 03 Jun 2013 22:08:10 GMT
Updating calls to plugman after a refactoring there


Project: http://git-wip-us.apache.org/repos/asf/cordova-cli/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-cli/commit/0154bd91
Tree: http://git-wip-us.apache.org/repos/asf/cordova-cli/tree/0154bd91
Diff: http://git-wip-us.apache.org/repos/asf/cordova-cli/diff/0154bd91

Branch: refs/heads/2.8.x
Commit: 0154bd91eeff6ced71be54af76fb0a48aa6d45b4
Parents: d893014
Author: Braden Shepherdson <braden.shepherdson@gmail.com>
Authored: Tue May 28 16:16:02 2013 -0400
Committer: Fil Maj <maj.fil@gmail.com>
Committed: Mon Jun 3 15:07:31 2013 -0700

----------------------------------------------------------------------
 src/platform.js |    2 +-
 src/plugin.js   |    6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-cli/blob/0154bd91/src/platform.js
----------------------------------------------------------------------
diff --git a/src/platform.js b/src/platform.js
index c215a71..e4bf539 100644
--- a/src/platform.js
+++ b/src/platform.js
@@ -116,7 +116,7 @@ module.exports = function platform(command, targets, callback) {
                                         return;
                                     }
 
-                                    plugman.install(target, output, path.basename(plugin),
pluginsDir, {}, parser.staging_dir());
+                                    plugman.install(target, output, path.basename(plugin),
pluginsDir, { www_dir: parser.staging_dir() });
                                 });
                                 end();
                             });

http://git-wip-us.apache.org/repos/asf/cordova-cli/blob/0154bd91/src/plugin.js
----------------------------------------------------------------------
diff --git a/src/plugin.js b/src/plugin.js
index caeb82c..56a3dbd 100644
--- a/src/plugin.js
+++ b/src/plugin.js
@@ -77,7 +77,7 @@ module.exports = function plugin(command, targets, callback) {
                 }
 
                 // Fetch the plugin first.
-                plugman.fetch(target, pluginsDir, false /* no link */, undefined /* subdir
*/, undefined /* git_ref */, function(err, dir) {
+                plugman.fetch(target, pluginsDir, {}, function(err, dir) {
                     if (err) {
                         throw new Error('Error fetching plugin: ' + err);
                     }
@@ -88,7 +88,7 @@ module.exports = function plugin(command, targets, callback) {
                         var parser = new parsers[platform](platformRoot);
                         // TODO: unify use of blackberry in cli vs blackberry10 in plugman
                         plugman.install((platform=='blackberry'?'blackberry10':platform),
platformRoot,
-                                        path.basename(dir), pluginsDir, undefined, {}, parser.staging_dir());
+                                        path.basename(dir), pluginsDir, { www_dir: parser.staging_dir()
});
                     });
 
                     hooks.fire('after_plugin_add');
@@ -121,7 +121,7 @@ module.exports = function plugin(command, targets, callback) {
                     intersection.forEach(function(platform) {
                         var platformRoot = path.join(projectRoot, 'platforms', platform);
                         var parser = new parsers[platform](platformRoot);
-                        plugman.uninstall(platform, platformRoot, target, path.join(projectRoot,
'plugins'), {}, parser.staging_dir());
+                        plugman.uninstall(platform, platformRoot, target, path.join(projectRoot,
'plugins'), { www_dir: parser.staging_dir() });
                     });
 
                     // Finally remove the plugin dir from plugins/


Mime
View raw message