You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by be...@apache.org on 2013/07/15 06:13:43 UTC
git commit: [windowsphone] Add www contents from root www folder
indead of the project one
Updated Branches:
refs/heads/master 1151fae78 -> 8a1ddfb28
[windowsphone] Add www contents from root www folder indead of the project one
Project: http://git-wip-us.apache.org/repos/asf/cordova-cli/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-cli/commit/8a1ddfb2
Tree: http://git-wip-us.apache.org/repos/asf/cordova-cli/tree/8a1ddfb2
Diff: http://git-wip-us.apache.org/repos/asf/cordova-cli/diff/8a1ddfb2
Branch: refs/heads/master
Commit: 8a1ddfb28077b580c7dde8fc31e3a0ec10eda1c3
Parents: 1151fae
Author: Benn Mapes <be...@gmail.com>
Authored: Sun Jul 14 21:13:20 2013 -0700
Committer: Benn Mapes <be...@gmail.com>
Committed: Sun Jul 14 21:13:20 2013 -0700
----------------------------------------------------------------------
src/metadata/wp7_parser.js | 5 +++--
src/metadata/wp8_parser.js | 5 +++--
2 files changed, 6 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-cli/blob/8a1ddfb2/src/metadata/wp7_parser.js
----------------------------------------------------------------------
diff --git a/src/metadata/wp7_parser.js b/src/metadata/wp7_parser.js
index 2a852de..88ed93c 100644
--- a/src/metadata/wp7_parser.js
+++ b/src/metadata/wp7_parser.js
@@ -188,8 +188,9 @@ module.exports.prototype = {
}
}
- // now add all www references back in
- var www_files = this.folder_contents('www', this.www_dir());
+ // now add all www references back in from the root www folder
+ var project_root = util.isCordova(this.wp7_proj_dir);
+ var www_files = this.folder_contents('www', util.projectWww(project_root));
for(file in www_files) {
var item = new et.Element('ItemGroup');
var content = new et.Element('Content');
http://git-wip-us.apache.org/repos/asf/cordova-cli/blob/8a1ddfb2/src/metadata/wp8_parser.js
----------------------------------------------------------------------
diff --git a/src/metadata/wp8_parser.js b/src/metadata/wp8_parser.js
index dfcfd16..07f5e0b 100644
--- a/src/metadata/wp8_parser.js
+++ b/src/metadata/wp8_parser.js
@@ -189,8 +189,9 @@ module.exports.prototype = {
}
}
- // now add all www references back in
- var www_files = this.folder_contents('www', this.www_dir());
+ // now add all www references back in from the root www folder
+ var project_root = util.isCordova(this.wp8_proj_dir);
+ var www_files = this.folder_contents('www', util.projectWww(project_root));
for(file in www_files) {
var item = new et.Element('ItemGroup');
var content = new et.Element('Content');