Repository: cordova-lib Updated Branches: refs/heads/rb_0.21.14 [created] 29915e65d
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/bbe1add5 Tree: http://git-wip-us.apache.org/repos/asf/cordova-lib/tree/bbe1add5 Diff: http://git-wip-us.apache.org/repos/asf/cordova-lib/diff/bbe1add5 Branch: refs/heads/rb_0.21.14 Commit: bbe1add5b9be03eba9e879df5cd118fc4e82aa52 Parents: db6b5f5 Author: sgrebnov <[email protected]> Authored: Thu Sep 18 12:38:43 2014 +0400 Committer: Vladimir Kotikov <[email protected]> Committed: Fri Sep 26 12:25:04 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/bbe1add5/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 aefb94e..b305301 100644 --- a/cordova-lib/src/cordova/metadata/windows_parser.js +++ b/cordova-lib/src/cordova/metadata/windows_parser.js @@ -222,7 +222,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());
