You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by da...@apache.org on 2017/02/07 12:44:12 UTC
[2/4] cordova-windows git commit: CB-12298 [Windows]
bundle.appxupload not generated for Windows 10 target Generate appxupload for
non-bundle builds as well This closes #227
CB-12298 [Windows] bundle.appxupload not generated for Windows 10 target
Generate appxupload for non-bundle builds as well
This closes #227
Project: http://git-wip-us.apache.org/repos/asf/cordova-windows/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-windows/commit/21ee3867
Tree: http://git-wip-us.apache.org/repos/asf/cordova-windows/tree/21ee3867
Diff: http://git-wip-us.apache.org/repos/asf/cordova-windows/diff/21ee3867
Branch: refs/heads/5.0.x
Commit: 21ee3867aa36c9d76a29a7c5bcf2d4dabfe8f99a
Parents: 9edcf26
Author: daserge <v-...@microsoft.com>
Authored: Mon Feb 6 21:27:48 2017 +0300
Committer: daserge <v-...@microsoft.com>
Committed: Tue Feb 7 15:43:37 2017 +0300
----------------------------------------------------------------------
spec/e2e/endtoend.spec.js | 16 ++++++++++++++--
template/cordova/lib/build.js | 8 ++++----
2 files changed, 18 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-windows/blob/21ee3867/spec/e2e/endtoend.spec.js
----------------------------------------------------------------------
diff --git a/spec/e2e/endtoend.spec.js b/spec/e2e/endtoend.spec.js
index aa08bed..ac86ab0 100644
--- a/spec/e2e/endtoend.spec.js
+++ b/spec/e2e/endtoend.spec.js
@@ -103,15 +103,27 @@ describe('Cordova create and build', function(){
});
});
- it('spec.6 should build Windows 8.1 project bundle appxupload', function(){
+ it('spec.6 should generate appxupload for Windows 8.1 project bundle release build', function(){
shell.exec(buildScriptPath + ' --release --win --bundle --archs=\"x64 x86 arm\"', {silent : true});
var packages = shell.ls(appPackagesFolder);
expect(packages.filter(function(file) { return file.match(/.*bundle\.appxupload$/); }).length > 0).toBeTruthy();
});
- it('spec.7 should build Windows 10 project bundle appxupload', function(){
+ it('spec.6.1 should generate appxupload for Windows 8.1 project non-bundle release build', function(){
+ shell.exec(buildScriptPath + ' --release --win --archs=\"x64 x86 arm\"', {silent : true});
+ var packages = shell.ls(appPackagesFolder);
+ expect(packages.filter(function(file) { return file.match(/.*\.appxupload$/); }).length).toBe(3);
+ });
+
+ it('spec.7 should generate appxupload for Windows 10 project bundle release build', function(){
shell.exec(buildScriptPath + ' --release --win --appx=uap --bundle --archs=\"x64 x86 arm\"', {silent : true});
var packages = shell.ls(appPackagesFolder);
expect(packages.filter(function(file) { return file.match(/.*bundle\.appxupload$/); }).length > 0).toBeTruthy();
});
+
+ it('spec.7.1 should generate appxupload for Windows 10 project non-bundle release build', function(){
+ shell.exec(buildScriptPath + ' --release --win --appx=uap --archs=\"x64 x86 arm\"', {silent : true});
+ var packages = shell.ls(appPackagesFolder);
+ expect(packages.filter(function(file) { return file.match(/.*\.appxupload$/); }).length).toBe(3);
+ });
});
http://git-wip-us.apache.org/repos/asf/cordova-windows/blob/21ee3867/template/cordova/lib/build.js
----------------------------------------------------------------------
diff --git a/template/cordova/lib/build.js b/template/cordova/lib/build.js
index 8159c8b..ca79fcf 100644
--- a/template/cordova/lib/build.js
+++ b/template/cordova/lib/build.js
@@ -342,11 +342,11 @@ function buildTargets(allMsBuildVersions, config) {
// Only add the CordovaBundlePlatforms argument when on the last build step
var bundleArchs = (index === configsArray.length - 1) ? bundleTerms : build.arch;
otherProperties.push('/p:CordovaBundlePlatforms=' + bundleArchs);
+ }
- // https://issues.apache.org/jira/browse/CB-12298
- if (config.targetProject === 'windows10') {
- otherProperties.push('/p:UapAppxPackageBuildMode=StoreUpload');
- }
+ // https://issues.apache.org/jira/browse/CB-12298
+ if (config.targetProject === 'windows10' && config.buildType === 'release') {
+ otherProperties.push('/p:UapAppxPackageBuildMode=StoreUpload');
}
return msbuild.buildProject(path.join(ROOT, build.target), config.buildType, build.arch, otherProperties);
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org