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:52 UTC
[36/50] [abbrv] git commit: Revert "CB-6414 Fixes the issue where two
config.xml munges exist, it will still write the correct config.xml output"
Revert "CB-6414 Fixes the issue where two config.xml munges exist, it will still write the correct config.xml output"
This reverts commit 57a5eaa1357f1f70d85437b9bb2d8f322bc39bc2.
Project: http://git-wip-us.apache.org/repos/asf/cordova-plugman/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugman/commit/8551e964
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugman/tree/8551e964
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugman/diff/8551e964
Branch: refs/heads/browserify
Commit: 8551e964901099ababdd4a0fe37eb22390b082b5
Parents: 57a5eaa
Author: Steven Gill <st...@gmail.com>
Authored: Thu Apr 10 16:41:42 2014 -0700
Committer: Steven Gill <st...@gmail.com>
Committed: Thu Apr 10 16:41:42 2014 -0700
----------------------------------------------------------------------
src/util/config-changes.js | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-plugman/blob/8551e964/src/util/config-changes.js
----------------------------------------------------------------------
diff --git a/src/util/config-changes.js b/src/util/config-changes.js
index 6ebcd2a..d09fcf1 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,11 +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);
- }
-
// 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]);
}