You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by sg...@apache.org on 2014/08/16 14:56:05 UTC
git commit: windows: update as per changed manifest file names
Repository: cordova-lib
Updated Branches:
refs/heads/master 8fd058300 -> 3c3b951b9
windows: update as per changed manifest file names
See https://github.com/apache/cordova-windows/commit/bdc4af329c02658ed989b3e9b4013f81c3626cd6
Project: http://git-wip-us.apache.org/repos/asf/cordova-lib/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-lib/commit/3c3b951b
Tree: http://git-wip-us.apache.org/repos/asf/cordova-lib/tree/3c3b951b
Diff: http://git-wip-us.apache.org/repos/asf/cordova-lib/diff/3c3b951b
Branch: refs/heads/master
Commit: 3c3b951b94f367c1e43bbe33f3e2dab932726264
Parents: 8fd0583
Author: sgrebnov <v-...@microsoft.com>
Authored: Sat Aug 16 16:55:45 2014 +0400
Committer: sgrebnov <v-...@microsoft.com>
Committed: Sat Aug 16 16:55:45 2014 +0400
----------------------------------------------------------------------
cordova-lib/src/plugman/platforms/windows.js | 4 ++--
cordova-lib/src/plugman/util/config-changes.js | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/3c3b951b/cordova-lib/src/plugman/platforms/windows.js
----------------------------------------------------------------------
diff --git a/cordova-lib/src/plugman/platforms/windows.js b/cordova-lib/src/plugman/platforms/windows.js
index 803a3c8..c8e1511 100644
--- a/cordova-lib/src/plugman/platforms/windows.js
+++ b/cordova-lib/src/plugman/platforms/windows.js
@@ -39,8 +39,8 @@ module.exports = {
package_name:function(project_dir) {
// CB-6976 Windows Universal Apps. To make platform backward compatible
// with old template we look for package.appxmanifest file as well.
- var manifestPath = fs.existsSync(path.join(project_dir, 'package.store.appxmanifest')) ?
- path.join(project_dir, 'package.store.appxmanifest') :
+ var manifestPath = fs.existsSync(path.join(project_dir, 'package.windows.appxmanifest')) ?
+ path.join(project_dir, 'package.windows.appxmanifest') :
path.join(project_dir, 'package.appxmanifest');
var manifest = xml_helpers.parseElementtreeSync(manifestPath);
http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/3c3b951b/cordova-lib/src/plugman/util/config-changes.js
----------------------------------------------------------------------
diff --git a/cordova-lib/src/plugman/util/config-changes.js b/cordova-lib/src/plugman/util/config-changes.js
index 45cde7d..8a580cc 100644
--- a/cordova-lib/src/plugman/util/config-changes.js
+++ b/cordova-lib/src/plugman/util/config-changes.js
@@ -201,7 +201,7 @@ function remove_plugin_changes(plugin_name, plugin_id, is_top_level) {
if (self.platform == 'windows' && file == 'package.appxmanifest' &&
!fs.existsSync(path.join(self.project_dir, 'package.appxmanifest'))) {
// New windows template separate manifest files for Windows8, Windows8.1 and WP8.1
- var substs = ['package.phone.appxmanifest', 'package.store.appxmanifest', 'package.store80.appxmanifest'];
+ var substs = ['package.phone.appxmanifest', 'package.windows.appxmanifest', 'package.windows80.appxmanifest'];
for (var subst in substs) {
events.emit('verbose', 'Applying munge to ' + substs[subst]);
self.apply_file_munge(substs[subst], munge.files[file], true);
@@ -260,7 +260,7 @@ function add_plugin_changes(plugin_id, plugin_vars, is_top_level, should_increme
// CB-6976 Windows Universal Apps. Compatibility fix for existing plugins.
if (self.platform == 'windows' && file == 'package.appxmanifest' &&
!fs.existsSync(path.join(self.project_dir, 'package.appxmanifest'))) {
- var substs = ['package.phone.appxmanifest', 'package.store.appxmanifest', 'package.store80.appxmanifest'];
+ var substs = ['package.phone.appxmanifest', 'package.windows.appxmanifest', 'package.windows80.appxmanifest'];
for (var subst in substs) {
events.emit('verbose', 'Applying munge to ' + substs[subst]);
self.apply_file_munge(substs[subst], munge.files[file]);