Skip to content

Commit 99462a6

Browse files
authored
Merge pull request swiftlang#83839 from compnerd/stage
build.ps1: stage the experimental SDK runtime
2 parents a14dbd2 + 20c2371 commit 99462a6

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

utils/build.ps1

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3810,6 +3810,7 @@ function Build-Installer([Hashtable] $Platform) {
38103810
$Properties["ToolchainVariants"] = "`"asserts$(if ($IncludeNoAsserts) { ";noasserts" })`"";
38113811
foreach ($Build in $WindowsSDKBuilds) {
38123812
$Properties["WindowsRuntime$($Build.Architecture.ShortName.ToUpperInvariant())"] = [IO.Path]::Combine((Get-InstallDir $Build), "Runtimes", "$ProductVersion");
3813+
$Properties["WindowsExperimentalRuntime$($Build.Architecture.ShortName.ToUpperInvariant())"] = [IO.Path]::Combine((Get-InstallDir $Build), "Runtimes", "$ProductVersion.experimental");
38133814
}
38143815

38153816
Build-WiXProject bundle\installer.wixproj -Platform $Platform -Bundle -Properties $Properties
@@ -3937,6 +3938,9 @@ if (-not $SkipBuild) {
39373938
Write-Host -BackgroundColor DarkRed -ForegroundColor White "$($_.FullName) is not nested in an architecture directory"
39383939
Move-Item $_.FullName "$(Get-SwiftSDK Windows -Identifier WindowsExperimental)\usr\lib\swift_static\windows\$($Build.Architecture.LLVMName)\" | Out-Null
39393940
}
3941+
3942+
# FIXME(compnerd) how do we select which SDK is meant to be re-distributed?
3943+
Copy-Directory "$(Get-SwiftSDK Windows -Identifier WindowsExperimental)\usr\bin" "$([IO.Path]::Combine((Get-InstallDir $Build), "Runtimes", "$ProductVersion.experimental", "usr"))"
39403944
}
39413945

39423946
Install-SDK $WindowsSDKBuilds -Identifier WindowsExperimental

0 commit comments

Comments
 (0)