fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup!…

… Add CI artifacts and nightly build for UWP.
servo · Sep 12, 2019 · db0f49b · db0f49b
1 parent 6ce186b
commit db0f49b
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 23 deletions.
diff --git a/python/servo/package_commands.py b/python/servo/package_commands.py
@@ -750,24 +750,19 @@ def build_uwp(platforms, dev, msbuild_dir):
     else:
         Configuration = "Release"
 
-    # execute msbuild
-    # Note: /m implies to use as many CPU cores as possible while building.
-    # msbuild /m /p:project=ServoApp .\support\hololens\servoapp.sln
-    # /p:Configuration="Debug" /p:Platform="x64" /property:AppxBundle=Always;AppxBundlePlatforms="x64"
     msbuild = path.join(msbuild_dir, "msbuild.exe")
-    project = path.join('.', 'support', 'hololens', 'ServoApp.sln')
-    args = [
-        msbuild,
-        "/m",
-        "/p:project=ServoApp",
-        project,
-        "/p:Configuration=" + Configuration,
-        "/p:AppxBundle=Always",
-        "/p:AppxBundlePlatforms=%s" % '|'.join(platforms),
-    ]
-
-    if len(platforms) == 1:
-        args += ["/p:Platform=%s" % platforms[0]]
-
-    # Generate an appxbundle.
-    subprocess.check_call(args)
+    build_file_template = path.join('support', 'hololens', 'package.msbuild')
+    with open(build_file_template) as f:
+        template_contents = f.read()
+        build_file = tempfile.NamedTemporaryFile(delete=False)
+        build_file.write(
+            template_contents
+                .replace("%%BUILD_PLATFORMS%%", ';'.join(platforms))
+                .replace("%%PACKAGE_PLATFORMS%%", '|'.join(platforms))
+                .replace("%%CONFIGURATION%%", Configuration)
+                .replace("%%SOLUTION%%", path.join(os.getcwd(), 'support', 'hololens', 'ServoApp.sln'))
+        )
+        build_file.close()
+        # Generate an appxbundle.
+        subprocess.check_call([msbuild, "/m", build_file.name])
+        os.unlink(build_file.name)
diff --git a/support/hololens/ServoApp.sln b/support/hololens/ServoApp.sln
@@ -19,9 +19,9 @@ Global
 		{0EAB7D8B-97FD-4C92-8BB2-D5691B3D5ABD}.Debug|x64.ActiveCfg = Debug|x64
 		{0EAB7D8B-97FD-4C92-8BB2-D5691B3D5ABD}.Debug|x64.Build.0 = Debug|x64
 		{0EAB7D8B-97FD-4C92-8BB2-D5691B3D5ABD}.Debug|x64.Deploy.0 = Debug|x64
-		{0EAB7D8B-97FD-4C92-8BB2-D5691B3D5ABD}.Release|ARM64.ActiveCfg = Release|x64
-		{0EAB7D8B-97FD-4C92-8BB2-D5691B3D5ABD}.Release|ARM64.Build.0 = Release|x64
-		{0EAB7D8B-97FD-4C92-8BB2-D5691B3D5ABD}.Release|ARM64.Deploy.0 = Release|x64
+		{0EAB7D8B-97FD-4C92-8BB2-D5691B3D5ABD}.Release|ARM64.ActiveCfg = Release|ARM64
+		{0EAB7D8B-97FD-4C92-8BB2-D5691B3D5ABD}.Release|ARM64.Build.0 = Release|ARM64
+		{0EAB7D8B-97FD-4C92-8BB2-D5691B3D5ABD}.Release|ARM64.Deploy.0 = Release|ARM64
 		{0EAB7D8B-97FD-4C92-8BB2-D5691B3D5ABD}.Release|x64.ActiveCfg = Release|x64
 		{0EAB7D8B-97FD-4C92-8BB2-D5691B3D5ABD}.Release|x64.Build.0 = Release|x64
 		{0EAB7D8B-97FD-4C92-8BB2-D5691B3D5ABD}.Release|x64.Deploy.0 = Release|x64

diff --git a/support/hololens/package.msbuild b/support/hololens/package.msbuild
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="FullRebuild">
+  <Target Name="FullRebuild">
+    <ItemGroup>
+      <Configurations Include="%%CONFIGURATION%%"/>
+      <Platforms Include="%%BUILD_PLATFORMS%%"/>
+      <ConfigAndPlatform Include="@(Configurations)">
+        <Platform>%(Platforms.Identity)</Platform>
+      </ConfigAndPlatform>
+    </ItemGroup>
+    <MSBuild Projects="%%SOLUTION%%" Targets="Build"
+             Properties="Configuration=%(ConfigAndPlatform.Identity);Platform=%(ConfigAndPlatform.Platform);AppxBundle=Always;AppxBundlePlatforms=%%PACKAGE_PLATFORMS%%;UseSubFolderForOutputDirDuringMultiPlatformBuild=false"/>
+  </Target>
+</Project>