From 1dc5116f7eecdd2e2efb72f94ec07ec1b48c0363 Mon Sep 17 00:00:00 2001
From: Saleem Abdulrasool <compnerd@compnerd.org>
Date: Tue, 13 Jun 2023 21:49:14 -0700
Subject: [PATCH] build: use updated project names for packaging

The rules for the packaging have been changed to reflect the split MSIs:
- bld (Build Tools)
- cli (CLI Tools)
- dbg (Debugging Tools)
- ide (IDE Integration Tools)
- sdk (Platform SDKs)
- runtime (Platform runtime)
---
 build.ps1 | 21 ++++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

diff --git a/build.ps1 b/build.ps1
index 6ce668a87..c73226c42 100644
--- a/build.ps1
+++ b/build.ps1
@@ -1345,7 +1345,22 @@ function Install-HostToolchain()
 
 function Build-Installer()
 {
-  Build-WiXProject toolchain.wixproj -Arch $HostArch -Properties @{
+  Build-WiXProject bld.wixproj -Arch $HostArch -Properties @{
+    DEVTOOLS_ROOT = "$($HostArch.ToolchainInstallRoot)\";
+    TOOLCHAIN_ROOT = "$($HostArch.ToolchainInstallRoot)\";
+  }
+
+  Build-WiXProject cli.wixproj -Arch $HostArch -Properties @{
+    DEVTOOLS_ROOT = "$($HostArch.ToolchainInstallRoot)\";
+    TOOLCHAIN_ROOT = "$($HostArch.ToolchainInstallRoot)\";
+  }
+
+  Build-WiXProject dbg.wixproj -Arch $HostArch -Properties @{
+    DEVTOOLS_ROOT = "$($HostArch.ToolchainInstallRoot)\";
+    TOOLCHAIN_ROOT = "$($HostArch.ToolchainInstallRoot)\";
+  }
+
+  Build-WiXProject ide.wixproj -Arch $HostArch -Properties @{
     DEVTOOLS_ROOT = "$($HostArch.ToolchainInstallRoot)\";
     TOOLCHAIN_ROOT = "$($HostArch.ToolchainInstallRoot)\";
   }
@@ -1363,10 +1378,6 @@ function Build-Installer()
     }
   }
 
-  Build-WiXProject devtools.wixproj -Arch $HostArch -Properties @{
-    DEVTOOLS_ROOT = "$($HostArch.ToolchainInstallRoot)\";
-  }
-
   Build-WiXProject installer.wixproj -Arch $HostArch -Bundle -Properties @{
     OutputPath = "$($HostArch.BinaryRoot)\";
     MSI_LOCATION = "$($HostArch.BinaryRoot)\msi\";