Skip to content

Commit 99d0221

Browse files
committed
utils: adjust installer build and staging
Update the property to include the SDK MSI for Windows as we start adding additional platforms. Update the file name patterns to reflect the new naming.
1 parent 3ab2a3e commit 99d0221

File tree

1 file changed

+3
-5
lines changed

1 file changed

+3
-5
lines changed

utils/build.ps1

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2819,7 +2819,7 @@ function Build-Installer($Arch) {
28192819
}
28202820

28212821
foreach ($SDK in $WindowsSDKArchs) {
2822-
$Properties["INCLUDE_$($SDK.VSName.ToUpperInvariant())_SDK"] = "true"
2822+
$Properties["INCLUDE_WINDOWS_$($SDK.VSName.ToUpperInvariant())_SDK"] = "true"
28232823
$Properties["PLATFORM_ROOT_$($SDK.VSName.ToUpperInvariant())"] = "$($SDK.PlatformInstallRoot)\"
28242824
$Properties["SDK_ROOT_$($SDK.VSName.ToUpperInvariant())"] = "$($SDK.SDKInstallRoot)\"
28252825
}
@@ -2830,11 +2830,9 @@ function Build-Installer($Arch) {
28302830
function Stage-BuildArtifacts($Arch) {
28312831
Copy-File "$($Arch.BinaryCache)\installer\Release\$($Arch.VSName)\*.cab" "$Stage\"
28322832
Copy-File "$($Arch.BinaryCache)\installer\Release\$($Arch.VSName)\*.msi" "$Stage\"
2833-
Copy-File "$($Arch.BinaryCache)\installer\Release\$($Arch.VSName)\rtl.cab" "$Stage\"
2834-
Copy-File "$($Arch.BinaryCache)\installer\Release\$($Arch.VSName)\rtl.msi" "$Stage\"
28352833
foreach ($SDK in $WindowsSDKArchs) {
2836-
Copy-File "$($Arch.BinaryCache)\installer\Release\$($SDK.VSName)\sdk.$($SDK.VSName).cab" "$Stage\"
2837-
Copy-File "$($Arch.BinaryCache)\installer\Release\$($SDK.VSName)\sdk.$($SDK.VSName).msi" "$Stage\"
2834+
Copy-File "$($Arch.BinaryCache)\installer\Release\$($SDK.VSName)\sdk.windows.$($SDK.VSName).cab" "$Stage\"
2835+
Copy-File "$($Arch.BinaryCache)\installer\Release\$($SDK.VSName)\sdk.windows.$($SDK.VSName).msi" "$Stage\"
28382836
Copy-File "$($Arch.BinaryCache)\installer\Release\$($SDK.VSName)\rtl.$($SDK.VSName).msm" "$Stage\"
28392837
}
28402838
Copy-File "$($Arch.BinaryCache)\installer\Release\$($Arch.VSName)\installer.exe" "$Stage\"

0 commit comments

Comments
 (0)