cordova-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mmo...@apache.org
Subject git commit: Fix CB-7615 Read config.xml after pre-prepare hooks fire
Date Mon, 22 Sep 2014 20:03:35 GMT
Repository: cordova-lib
Updated Branches:
  refs/heads/master 0f8972424 -> 2c3817e90


Fix CB-7615 Read config.xml after pre-prepare hooks fire


Project: http://git-wip-us.apache.org/repos/asf/cordova-lib/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-lib/commit/2c3817e9
Tree: http://git-wip-us.apache.org/repos/asf/cordova-lib/tree/2c3817e9
Diff: http://git-wip-us.apache.org/repos/asf/cordova-lib/diff/2c3817e9

Branch: refs/heads/master
Commit: 2c3817e907c4ab33fca49ec2c2fd28a432980ee5
Parents: 0f89724
Author: Michal Mocny <mmocny@gmail.com>
Authored: Mon Sep 22 16:03:24 2014 -0400
Committer: Michal Mocny <mmocny@gmail.com>
Committed: Mon Sep 22 16:03:24 2014 -0400

----------------------------------------------------------------------
 cordova-lib/src/cordova/prepare.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/2c3817e9/cordova-lib/src/cordova/prepare.js
----------------------------------------------------------------------
diff --git a/cordova-lib/src/cordova/prepare.js b/cordova-lib/src/cordova/prepare.js
index c69a4d7..d5f3729 100644
--- a/cordova-lib/src/cordova/prepare.js
+++ b/cordova-lib/src/cordova/prepare.js
@@ -38,7 +38,6 @@ exports = module.exports = prepare;
 function prepare(options) {
     var projectRoot = cordova_util.cdProjectRoot();
     var xml = cordova_util.projectConfig(projectRoot);
-    var cfg = new ConfigParser(xml);
 
     if (!options) {
         options = {
@@ -108,6 +107,7 @@ function prepare(options) {
             munger.save_all();
 
             // Update platform config.xml based on top level config.xml
+            var cfg = new ConfigParser(xml);
             var platform_cfg = new ConfigParser(parser.config_xml());
             exports._mergeXml(cfg.doc.getroot(), platform_cfg.doc.getroot(), platform, true);
 


Mime
View raw message