You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by pu...@apache.org on 2015/05/12 23:11:56 UTC
[1/2] cordova-windows git commit: CB-8856 Fix 'Id' attribute is
invalid when creating Windows Store submission build
Repository: cordova-windows
Updated Branches:
refs/heads/master 70d33fea4 -> 76b129eaa
CB-8856 Fix 'Id' attribute is invalid when creating Windows Store submission build
Project: http://git-wip-us.apache.org/repos/asf/cordova-windows/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-windows/commit/258a21db
Tree: http://git-wip-us.apache.org/repos/asf/cordova-windows/tree/258a21db
Diff: http://git-wip-us.apache.org/repos/asf/cordova-windows/diff/258a21db
Branch: refs/heads/master
Commit: 258a21dbf6ac4bd020e304de8544992e5e3cd9f2
Parents: 973b45a
Author: sgrebnov <v-...@microsoft.com>
Authored: Tue Apr 14 15:49:23 2015 -0700
Committer: sgrebnov <v-...@microsoft.com>
Committed: Tue Apr 14 16:25:55 2015 -0700
----------------------------------------------------------------------
bin/lib/create.js | 2 +-
template/cordova/lib/package.js | 2 +-
template/cordova/lib/prepare.js | 7 +------
template/package.phone.appxmanifest | 4 ++--
template/package.windows.appxmanifest | 4 ++--
template/package.windows80.appxmanifest | 4 ++--
6 files changed, 9 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-windows/blob/258a21db/bin/lib/create.js
----------------------------------------------------------------------
diff --git a/bin/lib/create.js b/bin/lib/create.js
index e88f72c..88f708f 100644
--- a/bin/lib/create.js
+++ b/bin/lib/create.js
@@ -77,7 +77,7 @@ module.exports.run = function (argv) {
['package.windows.appxmanifest', 'package.windows80.appxmanifest', 'package.phone.appxmanifest'].forEach(function (file) {
var fileToReplace = path.join(projectPath, file);
shell.sed('-i', /\$guid1\$/g, guid, fileToReplace);
- shell.sed('-i', /\$safeprojectname\$/g, packageName, fileToReplace);
+ shell.sed('-i', /\$packagename\$/g, packageName, fileToReplace);
shell.sed('-i', /\$projectname\$/g, safeAppName, fileToReplace);
});
http://git-wip-us.apache.org/repos/asf/cordova-windows/blob/258a21db/template/cordova/lib/package.js
----------------------------------------------------------------------
diff --git a/template/cordova/lib/package.js b/template/cordova/lib/package.js
index 92ed76c..158ddf6 100644
--- a/template/cordova/lib/package.js
+++ b/template/cordova/lib/package.js
@@ -96,7 +96,7 @@ module.exports.getAppId = function (platformPath) {
module.exports.getPackageName = function (platformPath) {
var manifest = path.join(platformPath, 'package.windows.appxmanifest');
try {
- return Q.resolve(/Application Id="(.*?)"/gi.exec(fs.readFileSync(manifest, 'utf8'))[1]);
+ return Q.resolve(/Identity Name="(.*?)"/gi.exec(fs.readFileSync(manifest, 'utf8'))[1]);
} catch (e) {
return Q.reject('Can\'t read package name from manifest ' + e);
}
http://git-wip-us.apache.org/repos/asf/cordova-windows/blob/258a21db/template/cordova/lib/prepare.js
----------------------------------------------------------------------
diff --git a/template/cordova/lib/prepare.js b/template/cordova/lib/prepare.js
index 7bec13d..25aafed 100644
--- a/template/cordova/lib/prepare.js
+++ b/template/cordova/lib/prepare.js
@@ -122,12 +122,7 @@ function applyCoreProperties(config, manifest, manifestPath, xmlnsPrefix) {
if(!app) {
throw new Error('Invalid manifest file (no <Application> node): ' + manifestPath);
}
- if (pkgName) {
- // 64 symbols restriction goes from manifest schema definition
- // http://msdn.microsoft.com/en-us/library/windows/apps/br211415.aspx
- var appId = pkgName.length <= 64 ? pkgName : pkgName.substr(0, 64);
- app.attrib.Id = appId;
- }
+
app.attrib.StartPage = 'www/' + startPage;
var visualElementsName = './/' + xmlnsPrefix + 'VisualElements';
http://git-wip-us.apache.org/repos/asf/cordova-windows/blob/258a21db/template/package.phone.appxmanifest
----------------------------------------------------------------------
diff --git a/template/package.phone.appxmanifest b/template/package.phone.appxmanifest
index 332f429..7ff7667 100644
--- a/template/package.phone.appxmanifest
+++ b/template/package.phone.appxmanifest
@@ -18,7 +18,7 @@
under the License.
-->
<Package xmlns="http://schemas.microsoft.com/appx/2010/manifest" xmlns:m2="http://schemas.microsoft.com/appx/2013/manifest" xmlns:m3="http://schemas.microsoft.com/appx/2014/manifest" xmlns:mp="http://schemas.microsoft.com/appx/2014/phone/manifest">
- <Identity Name="$guid1$" Version="1.0.0.0" Publisher="CN=$username$" />
+ <Identity Name="$packagename$" Version="1.0.0.0" Publisher="CN=$username$" />
<mp:PhoneIdentity PhoneProductId="$guid1$" PhonePublisherId="db093ed5-53b1-45f7-af72-751e8f36ab80" />
<Properties>
<DisplayName>$projectname$</DisplayName>
@@ -33,7 +33,7 @@
<Resource Language="x-generate" />
</Resources>
<Applications>
- <Application Id="$safeprojectname$" StartPage="www/index.html">
+ <Application Id="App" StartPage="www/index.html">
<m3:VisualElements DisplayName="$projectname$"
Square150x150Logo="images\Square150x150Logo.png"
Square44x44Logo="images\Square44x44Logo.png"
http://git-wip-us.apache.org/repos/asf/cordova-windows/blob/258a21db/template/package.windows.appxmanifest
----------------------------------------------------------------------
diff --git a/template/package.windows.appxmanifest b/template/package.windows.appxmanifest
index 40deedf..9a8f8a4 100644
--- a/template/package.windows.appxmanifest
+++ b/template/package.windows.appxmanifest
@@ -18,7 +18,7 @@
under the License.
-->
<Package xmlns="http://schemas.microsoft.com/appx/2010/manifest" xmlns:m2="http://schemas.microsoft.com/appx/2013/manifest">
- <Identity Name="$guid1$" Version="1.0.0.0" Publisher="CN=$username$" />
+ <Identity Name="$packagename$" Version="1.0.0.0" Publisher="CN=$username$" />
<Properties>
<DisplayName>$projectname$</DisplayName>
<PublisherDisplayName>$username$</PublisherDisplayName>
@@ -32,7 +32,7 @@
<Resource Language="x-generate" />
</Resources>
<Applications>
- <Application Id="$safeprojectname$" StartPage="www/index.html">
+ <Application Id="App" StartPage="www/index.html">
<m2:VisualElements DisplayName="$projectname$"
Description="CordovaApp"
ForegroundText="light"
http://git-wip-us.apache.org/repos/asf/cordova-windows/blob/258a21db/template/package.windows80.appxmanifest
----------------------------------------------------------------------
diff --git a/template/package.windows80.appxmanifest b/template/package.windows80.appxmanifest
index 4062746..c964a4b 100644
--- a/template/package.windows80.appxmanifest
+++ b/template/package.windows80.appxmanifest
@@ -18,7 +18,7 @@
under the License.
-->
<Package xmlns="http://schemas.microsoft.com/appx/2010/manifest">
- <Identity Name="$guid1$" Version="1.0.0.0" Publisher="CN=$username$" />
+ <Identity Name="$packagename$" Version="1.0.0.0" Publisher="CN=$username$" />
<Properties>
<DisplayName>$projectname$</DisplayName>
<PublisherDisplayName>$username$</PublisherDisplayName>
@@ -32,7 +32,7 @@
<Resource Language="x-generate" />
</Resources>
<Applications>
- <Application Id="$safeprojectname$" StartPage="www/index.html">
+ <Application Id="App" StartPage="www/index.html">
<VisualElements DisplayName="$projectname$"
Logo="images\Square150x150Logo.png"
SmallLogo="images\Square30x30Logo.png"
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org
[2/2] cordova-windows git commit: Merge branch 'CB-8856' of
https://github.com/MSOpenTech/cordova-windows
Posted by pu...@apache.org.
Merge branch 'CB-8856' of https://github.com/MSOpenTech/cordova-windows
Project: http://git-wip-us.apache.org/repos/asf/cordova-windows/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-windows/commit/76b129ea
Tree: http://git-wip-us.apache.org/repos/asf/cordova-windows/tree/76b129ea
Diff: http://git-wip-us.apache.org/repos/asf/cordova-windows/diff/76b129ea
Branch: refs/heads/master
Commit: 76b129eaa8f01a110559c99fc51016049d150361
Parents: 70d33fe 258a21d
Author: Jesse MacFadyen <pu...@gmail.com>
Authored: Tue May 12 14:11:37 2015 -0700
Committer: Jesse MacFadyen <pu...@gmail.com>
Committed: Tue May 12 14:11:37 2015 -0700
----------------------------------------------------------------------
bin/lib/create.js | 2 +-
template/cordova/lib/package.js | 2 +-
template/cordova/lib/prepare.js | 7 +------
template/package.phone.appxmanifest | 4 ++--
template/package.windows.appxmanifest | 4 ++--
template/package.windows80.appxmanifest | 4 ++--
6 files changed, 9 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org