cordova-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From agri...@apache.org
Subject git commit: CB-5885 Remove no-longer-necessary iOS project file cache from CLI.
Date Tue, 18 Feb 2014 19:05:39 GMT
Repository: cordova-cli
Updated Branches:
  refs/heads/master 5aab49fad -> 85c2b9e84


CB-5885 Remove no-longer-necessary iOS project file cache from CLI.


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

Branch: refs/heads/master
Commit: 85c2b9e8441d136b1b295357061276e0b9528f19
Parents: 5aab49f
Author: Andrew Grieve <agrieve@chromium.org>
Authored: Tue Feb 18 14:03:22 2014 -0500
Committer: Andrew Grieve <agrieve@chromium.org>
Committed: Tue Feb 18 14:05:29 2014 -0500

----------------------------------------------------------------------
 spec/prepare.spec.js | 2 +-
 src/prepare.js       | 7 ++-----
 2 files changed, 3 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-cli/blob/85c2b9e8/spec/prepare.spec.js
----------------------------------------------------------------------
diff --git a/spec/prepare.spec.js b/spec/prepare.spec.js
index ebdeffc..2a4e8f5 100644
--- a/spec/prepare.spec.js
+++ b/spec/prepare.spec.js
@@ -164,7 +164,7 @@ describe('prepare command', function() {
                 cordova.raw.prepare().then(function() {
                     supported_platforms.forEach(function(p) {
                         var platform_path = path.join(project_dir, 'platforms', p);
-                        expect(add_plugin_changes).toHaveBeenCalledWith((p=='blackberry'?'blackberry10':p),
platform_path, plugins_dir, 'testPlugin', 'plugin vars', true, false, {});
+                        expect(add_plugin_changes).toHaveBeenCalledWith((p=='blackberry'?'blackberry10':p),
platform_path, plugins_dir, 'testPlugin', 'plugin vars', true, false);
                     });
                 }, function(err) {
                     expect(err).toBeUndefined();

http://git-wip-us.apache.org/repos/asf/cordova-cli/blob/85c2b9e8/src/prepare.js
----------------------------------------------------------------------
diff --git a/src/prepare.js b/src/prepare.js
index 64815b3..4f72601 100644
--- a/src/prepare.js
+++ b/src/prepare.js
@@ -97,7 +97,6 @@ module.exports = function prepare(options) {
                 var plugins = cordova_util.findPlugins(plugins_dir),
                     platform_json = plugman.config_changes.get_platform_json(plugins_dir,
platform);
                 if (plugins && Array.isArray(plugins)) {
-                    var plugman_cache = {};
                     plugins.forEach(function(plugin_id) {
                         if (platform_json.installed_plugins[plugin_id]) {
                             events.emit('verbose', 'Ensuring plugin "' + plugin_id + '" is
installed correctly...');
@@ -105,8 +104,7 @@ module.exports = function prepare(options) {
                                 platform, platformPath, plugins_dir, plugin_id,
                                 /* variables for plugin */ platform_json.installed_plugins[plugin_id],
                                 /* top level plugin? */ true,
-                                /* should increment config munge? cordova-cli never should,
only plugman */ false,
-                                plugman_cache
+                                /* should increment config munge? cordova-cli never should,
only plugman */ false
                             );
                         } else if (platform_json.dependent_plugins[plugin_id]) {
                             events.emit('verbose', 'Ensuring plugin "' + plugin_id + '" is
installed correctly...');
@@ -114,8 +112,7 @@ module.exports = function prepare(options) {
                                 platform, platformPath, plugins_dir, plugin_id,
                                 /* variables for plugin */ platform_json.dependent_plugins[plugin_id],
                                 /* top level plugin? */ false,
-                                /* should increment config munge? cordova-cli never should,
only plugman */ false,
-                                plugman_cache
+                                /* should increment config munge? cordova-cli never should,
only plugman */ false
                             );
                         }
                         events.emit('verbose', 'Plugin "' + plugin_id + '" is good to go.');


Mime
View raw message