cordova-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ste...@apache.org
Subject [1/4] git commit: CB-6414 - fixes the issue where two config.xml munges exists, it will still write the correct config.xml output
Date Fri, 11 Apr 2014 00:02:18 GMT
Repository: cordova-plugman
Updated Branches:
  refs/heads/master 8551e9649 -> 28318d8ea


CB-6414 - fixes the issue where two config.xml munges exists, 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/39d412c6
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugman/tree/39d412c6
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugman/diff/39d412c6

Branch: refs/heads/master
Commit: 39d412c61574055d95c4fdd70478a5f9446bf191
Parents: 34ce31b
Author: Josh Bavari <josh@raisemore.com>
Authored: Tue Apr 8 14:48:52 2014 -0500
Committer: Josh Bavari <josh@raisemore.com>
Committed: Tue Apr 8 15:25:06 2014 -0500

----------------------------------------------------------------------
 src/util/config-changes.js | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-plugman/blob/39d412c6/src/util/config-changes.js
----------------------------------------------------------------------
diff --git a/src/util/config-changes.js b/src/util/config-changes.js
index d09fcf1..309ceb3 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]);    
     }
 }
 


Mime
View raw message