From 39d412c61574055d95c4fdd70478a5f9446bf191 Mon Sep 17 00:00:00 2001 From: Josh Bavari Date: Tue, 8 Apr 2014 14:48:52 -0500 Subject: [PATCH 1/2] CB-6414 - fixes the issue where two config.xml munges exists, it will still write the correct config.xml output --- src/util/config-changes.js | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/util/config-changes.js b/src/util/config-changes.js index d09fcf19..309ceb37 100644 --- a/src/util/config-changes.js +++ b/src/util/config-changes.js @@ -274,8 +274,13 @@ function reapply_global_munge () { ); continue; } - // 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]); + if(file == 'config.xml') { + file = resolveConfigFilePath(self.project_dir, self.platform, file); + file = path.relative(self.project_dir, file); + console.log('New file: ' + file); + } + + self.apply_file_munge(file, global_munge.files[file]); } } From 70ff5bded716dbe2d2ce71df6473b31bbf6df8c4 Mon Sep 17 00:00:00 2001 From: Josh Bavari Date: Tue, 8 Apr 2014 15:26:24 -0500 Subject: [PATCH 2/2] Removing console.log statement --- src/util/config-changes.js | 1 - 1 file changed, 1 deletion(-) diff --git a/src/util/config-changes.js b/src/util/config-changes.js index 309ceb37..041183a9 100644 --- a/src/util/config-changes.js +++ b/src/util/config-changes.js @@ -277,7 +277,6 @@ function reapply_global_munge () { if(file == 'config.xml') { file = resolveConfigFilePath(self.project_dir, self.platform, file); file = path.relative(self.project_dir, file); - console.log('New file: ' + file); } self.apply_file_munge(file, global_munge.files[file]);