[39/50] [abbrv] git commit: CB-7576 Support 'windows' merges folder for Windows platform

[st...@apache.org]

CB-7576 Support 'windows' merges folder for Windows platform


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

Branch: refs/heads/cb-7219
Commit: 0ca0fada0faf4734bbd0d921650e3ca5f262bd78
Parents: a017795
Author: sgrebnov <v-...@microsoft.com>
Authored: Thu Sep 18 12:38:43 2014 +0400
Committer: sgrebnov <v-...@microsoft.com>
Committed: Thu Sep 18 12:38:43 2014 +0400

----------------------------------------------------------------------
 cordova-lib/src/cordova/metadata/windows_parser.js | 3 +++
 1 file changed, 3 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/0ca0fada/cordova-lib/src/cordova/metadata/windows_parser.js
----------------------------------------------------------------------
diff --git a/cordova-lib/src/cordova/metadata/windows_parser.js b/cordova-lib/src/cordova/metadata/windows_parser.js
index eaeacbb..e7a8769 100644
--- a/cordova-lib/src/cordova/metadata/windows_parser.js
+++ b/cordova-lib/src/cordova/metadata/windows_parser.js
@@ -223,7 +223,10 @@ module.exports.prototype = {
         shell.cp('-rf', path.join(app_www, '*'), this.www_dir());
 
         // Copy all files from merges directory.
+        // CB-6976 Windows Universal Apps. For smooth transition from 'windows8' platform
+        // we allow using 'windows8' merges for new 'windows' platform
         this.copy_merges('windows8');
+        this.copy_merges('windows');
 
         // Copy over stock platform www assets (cordova.js)
         shell.cp('-rf', path.join(platform_www, '*'), this.www_dir());