You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by an...@apache.org on 2014/04/11 21:46:51 UTC
[35/50] [abbrv] git commit: CB-6414 - fixes the config.xml issue with
android and ios, correcting the bug at the ConfigKeeper.get method
CB-6414 - fixes the config.xml issue with android and ios, correcting the bug at the ConfigKeeper.get method
Project: http://git-wip-us.apache.org/repos/asf/cordova-plugman/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugman/commit/28e4052e
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugman/tree/28e4052e
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugman/diff/28e4052e
Branch: refs/heads/browserify
Commit: 28e4052ed0613a626da84696076eff6f430d349c
Parents: 70ff5bd
Author: Josh Bavari <jo...@raisemore.com>
Authored: Wed Apr 9 21:47:06 2014 -0500
Committer: Josh Bavari <jo...@raisemore.com>
Committed: Wed Apr 9 21:47:06 2014 -0500
----------------------------------------------------------------------
src/util/config-changes.js | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-plugman/blob/28e4052e/src/util/config-changes.js
----------------------------------------------------------------------
diff --git a/src/util/config-changes.js b/src/util/config-changes.js
index 041183a..3ca7cc0 100644
--- a/src/util/config-changes.js
+++ b/src/util/config-changes.js
@@ -274,10 +274,6 @@ function reapply_global_munge () {
);
continue;
}
- if(file == 'config.xml') {
- file = resolveConfigFilePath(self.project_dir, self.platform, file);
- file = path.relative(self.project_dir, file);
- }
self.apply_file_munge(file, global_munge.files[file]);
}
@@ -390,7 +386,14 @@ function ConfigKeeper() {
ConfigKeeper.prototype.get = ConfigKeeper_get;
function ConfigKeeper_get(project_dir, platform, file) {
var self = this;
+
+ //This fixes a bug with older plugins - when specifying config xml instead of res/xml/config.xml
+ //https://issues.apache.org/jira/browse/CB-6414
+ if(file == 'config.xml' && platform == 'android'){
+ file = 'res/xml/config.xml';
+ }
var fake_path = path.join(project_dir, platform, file);
+
if (self._cached[fake_path]) {
return self._cached[fake_path];
}