You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by ag...@apache.org on 2014/04/08 23:38:37 UTC
git commit: CB-6414 Fixes the issue where two config.xml munges exist,
it will still write the correct config.xml output
Repository: cordova-plugman
Updated Branches:
refs/heads/master 34ce31b6b -> 57a5eaa13
CB-6414 Fixes the issue where two config.xml munges exist, it will still write the correct config.xml output
Project: http://git-wip-us.apache.org/repos/asf/cordova-plugman/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugman/commit/57a5eaa1
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugman/tree/57a5eaa1
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugman/diff/57a5eaa1
Branch: refs/heads/master
Commit: 57a5eaa1357f1f70d85437b9bb2d8f322bc39bc2
Parents: 34ce31b
Author: Josh Bavari <jo...@raisemore.com>
Authored: Tue Apr 8 14:48:52 2014 -0500
Committer: Andrew Grieve <ag...@chromium.org>
Committed: Tue Apr 8 14:53:21 2014 -0600
----------------------------------------------------------------------
src/util/config-changes.js | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-plugman/blob/57a5eaa1/src/util/config-changes.js
----------------------------------------------------------------------
diff --git a/src/util/config-changes.js b/src/util/config-changes.js
index d09fcf1..6ebcd2a 100644
--- a/src/util/config-changes.js
+++ b/src/util/config-changes.js
@@ -132,7 +132,7 @@ PlatformMunger.prototype.apply_file_munge = PlatformMunger_apply_file_munge;
function PlatformMunger_apply_file_munge(file, munge, remove) {
var self = this;
var xml_child;
-
+
if ( file === 'framework' && self.platform === 'ios' ) {
// ios pbxproj file
var pbxproj = self.config_keeper.get(self.project_dir, self.platform, 'framework');
@@ -274,6 +274,11 @@ function reapply_global_munge () {
);
continue;
}
+ if (file == 'config.xml') {
+ file = resolveConfigFilePath(self.project_dir, self.platform, file);
+ file = path.relative(self.project_dir, file);
+ }
+
// TODO: This is mostly file IO and can run in parallel since each file is independent.
self.apply_file_munge(file, global_munge.files[file]);
}