cordova-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From vi...@apache.org
Subject git commit: support for merges directory in wp8
Date Thu, 08 Aug 2013 15:27:38 GMT
Updated Branches:
  refs/heads/master 83a042a75 -> d0f44cae6


support for merges directory in wp8


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

Branch: refs/heads/master
Commit: d0f44cae6ee46600af4e1acec3f61bc306b6622d
Parents: 83a042a
Author: Wolfgang Koller <viras@apache.org>
Authored: Thu Aug 8 17:26:14 2013 +0200
Committer: Wolfgang Koller <viras@apache.org>
Committed: Thu Aug 8 17:26:38 2013 +0200

----------------------------------------------------------------------
 src/metadata/wp8_parser.js | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-cli/blob/d0f44cae/src/metadata/wp8_parser.js
----------------------------------------------------------------------
diff --git a/src/metadata/wp8_parser.js b/src/metadata/wp8_parser.js
index fe97428..d41328a 100644
--- a/src/metadata/wp8_parser.js
+++ b/src/metadata/wp8_parser.js
@@ -157,6 +157,13 @@ module.exports.prototype = {
         // copy over all app www assets
         shell.cp('-rf', project_www, this.wp8_proj_dir);
 
+        // copy all files from merges directory
+        var merges_path = path.join(util.appDir(project_root), 'merges', 'wp8');
+        if (fs.existsSync(merges_path)) {
+            var overrides = path.join(merges_path, '*');
+            shell.cp('-rf', overrides, this.www_dir());
+        }
+
         // copy over wp8 lib's cordova.js
         var lib_path = path.join(util.libDirectory, 'wp', 'cordova', require('../../platforms').wp8.version);
         var custom_path = config.has_custom_path(project_root, 'wp8');
@@ -246,8 +253,8 @@ module.exports.prototype = {
             if (callback) return callback(e);
             else throw e;
         }
+        // overrides (merges) are handled in update_www()
         this.update_www();
-        // TODO: Add overrides support? Why is this missing?
         this.update_staging();
         util.deleteSvnFolders(this.www_dir());
 


Mime
View raw message