From bc7f0177f11050f951d18bb52c66454459ef2ac3 Mon Sep 17 00:00:00 2001 From: Paul Rouget Date: Wed, 12 Feb 2020 07:20:52 +0100 Subject: [PATCH] Adjust UWP packaging for submission. --- python/servo/package_commands.py | 11 +++++++---- .../hololens/ServoApp/Package.appxmanifest | 4 ++-- support/hololens/ServoApp/ServoApp.vcxproj | 3 ++- .../ServoApp/ServoApp_TemporaryKey.pfx | Bin 2568 -> 2528 bytes support/hololens/package.msbuild | 4 ++-- 5 files changed, 13 insertions(+), 9 deletions(-) diff --git a/python/servo/package_commands.py b/python/servo/package_commands.py index a663763a3985..f2fd607f784f 100644 --- a/python/servo/package_commands.py +++ b/python/servo/package_commands.py @@ -209,8 +209,11 @@ class PackageCommands(CommandBase): default=None, action='append', help='Create an APPX package') + @CommandArgument('--ms-app-store', + default=None, + action='store_true') def package(self, release=False, dev=False, android=None, magicleap=None, debug=False, - debugger=None, target=None, flavor=None, maven=False, uwp=None): + debugger=None, target=None, flavor=None, maven=False, uwp=None, ms_app_store=False): if android is None: android = self.config["build"]["android"] if target and android: @@ -234,7 +237,7 @@ def package(self, release=False, dev=False, android=None, magicleap=None, debug= target_dir = path.dirname(binary_path) if uwp: vs_info = self.vs_dirs() - build_uwp(uwp, dev, vs_info['msbuild']) + build_uwp(uwp, dev, vs_info['msbuild'], not ms_app_store) elif magicleap: if platform.system() not in ["Darwin"]: raise Exception("Magic Leap builds are only supported on macOS.") @@ -739,7 +742,7 @@ def call_git(cmd, **kwargs): return 0 -def build_uwp(platforms, dev, msbuild_dir): +def build_uwp(platforms, dev, msbuild_dir, sign_package): if any(map(lambda p: p not in ['x64', 'x86', 'arm64'], platforms)): raise Exception("Unsupported appx platforms: " + str(platforms)) if dev and len(platforms) > 1: @@ -764,7 +767,7 @@ def build_uwp(platforms, dev, msbuild_dir): ) build_file.close() # Generate an appxbundle. - subprocess.check_call([msbuild, "/m", build_file.name]) + subprocess.check_call([msbuild, "/m", build_file.name, "/p:AppxPackageSigningEnabled=" + str(sign_package)]) os.unlink(build_file.name) print("Creating ZIP") diff --git a/support/hololens/ServoApp/Package.appxmanifest b/support/hololens/ServoApp/Package.appxmanifest index 53255364338f..0c579a8631b1 100644 --- a/support/hololens/ServoApp/Package.appxmanifest +++ b/support/hololens/ServoApp/Package.appxmanifest @@ -1,6 +1,6 @@  - + Firefox Reality @@ -47,4 +47,4 @@ - + \ No newline at end of file diff --git a/support/hololens/ServoApp/ServoApp.vcxproj b/support/hololens/ServoApp/ServoApp.vcxproj index 917ec1176643..696de8577626 100644 --- a/support/hololens/ServoApp/ServoApp.vcxproj +++ b/support/hololens/ServoApp/ServoApp.vcxproj @@ -63,13 +63,14 @@ False + ServoApp_TemporaryKey.pfx False Always x64 1 OnApplicationRun False - 45A22CA001C9C6BE412BF449FBE70FEDE635831F + DC99ACEDA24EBA00BFB07A3986BB6892B0DE278B diff --git a/support/hololens/ServoApp/ServoApp_TemporaryKey.pfx b/support/hololens/ServoApp/ServoApp_TemporaryKey.pfx index 8917164b3bb536b2359938057359e65f28e40f1f..6aadf2b65b988b61da9269719b66cfefcd3b3187 100644 GIT binary patch delta 2396 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 + Properties="Configuration=%(ConfigAndPlatform.Identity);Platform=%(ConfigAndPlatform.Platform);AppxBundle=Always;AppxBundlePlatforms=%%PACKAGE_PLATFORMS%%;UseSubFolderForOutputDirDuringMultiPlatformBuild=false"/> - \ No newline at end of file +