Skip to content

Commit ec07ccb

Browse files
authored
build: use updated project names for packaging (#569)
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)
1 parent 3c9c4c6 commit ec07ccb

File tree

1 file changed

+16
-5
lines changed

1 file changed

+16
-5
lines changed

build.ps1

+16-5
Original file line numberDiff line numberDiff line change
@@ -1271,7 +1271,22 @@ function Install-HostToolchain() {
12711271
}
12721272

12731273
function Build-Installer() {
1274-
Build-WiXProject toolchain.wixproj -Arch $HostArch -Properties @{
1274+
Build-WiXProject bld.wixproj -Arch $HostArch -Properties @{
1275+
DEVTOOLS_ROOT = "$($HostArch.ToolchainInstallRoot)\";
1276+
TOOLCHAIN_ROOT = "$($HostArch.ToolchainInstallRoot)\";
1277+
}
1278+
1279+
Build-WiXProject cli.wixproj -Arch $HostArch -Properties @{
1280+
DEVTOOLS_ROOT = "$($HostArch.ToolchainInstallRoot)\";
1281+
TOOLCHAIN_ROOT = "$($HostArch.ToolchainInstallRoot)\";
1282+
}
1283+
1284+
Build-WiXProject dbg.wixproj -Arch $HostArch -Properties @{
1285+
DEVTOOLS_ROOT = "$($HostArch.ToolchainInstallRoot)\";
1286+
TOOLCHAIN_ROOT = "$($HostArch.ToolchainInstallRoot)\";
1287+
}
1288+
1289+
Build-WiXProject ide.wixproj -Arch $HostArch -Properties @{
12751290
DEVTOOLS_ROOT = "$($HostArch.ToolchainInstallRoot)\";
12761291
TOOLCHAIN_ROOT = "$($HostArch.ToolchainInstallRoot)\";
12771292
}
@@ -1288,10 +1303,6 @@ function Build-Installer() {
12881303
}
12891304
}
12901305

1291-
Build-WiXProject devtools.wixproj -Arch $HostArch -Properties @{
1292-
DEVTOOLS_ROOT = "$($HostArch.ToolchainInstallRoot)\";
1293-
}
1294-
12951306
Build-WiXProject installer.wixproj -Arch $HostArch -Bundle -Properties @{
12961307
OutputPath = "$($HostArch.BinaryRoot)\";
12971308
MSI_LOCATION = "$($HostArch.BinaryRoot)\msi\";

0 commit comments

Comments
 (0)