cordova-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dase...@apache.org
Subject 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
Date Tue, 07 Feb 2017 10:51:26 GMT
Repository: cordova-windows
Updated Branches:
  refs/heads/master ece4d0ffe -> 306b0e381


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/306b0e38
Tree: http://git-wip-us.apache.org/repos/asf/cordova-windows/tree/306b0e38
Diff: http://git-wip-us.apache.org/repos/asf/cordova-windows/diff/306b0e38

Branch: refs/heads/master
Commit: 306b0e381e311671ed26aba092f94c7d817153da
Parents: ece4d0f
Author: daserge <v-seshak@microsoft.com>
Authored: Mon Feb 6 21:27:48 2017 +0300
Committer: daserge <v-seshak@microsoft.com>
Committed: Tue Feb 7 13:50:41 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/306b0e38/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/306b0e38/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


Mime
View raw message