Skip to content

Commit 20c2371

Browse files
committed
build.ps1: stage the experimental SDK runtime
Setup the experimental runtime image. We currently inject a `.experimental` suffix to isolate it from the legacy image. This is a staging artifact and will be removed once we remove the legacy runtime build.
1 parent 7642d41 commit 20c2371

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
@@ -3808,6 +3808,7 @@ function Build-Installer([Hashtable] $Platform) {
38083808
$Properties["ToolchainVariants"] = "`"asserts$(if ($IncludeNoAsserts) { ";noasserts" })`"";
38093809
foreach ($Build in $WindowsSDKBuilds) {
38103810
$Properties["WindowsRuntime$($Build.Architecture.ShortName.ToUpperInvariant())"] = [IO.Path]::Combine((Get-InstallDir $Build), "Runtimes", "$ProductVersion");
3811+
$Properties["WindowsExperimentalRuntime$($Build.Architecture.ShortName.ToUpperInvariant())"] = [IO.Path]::Combine((Get-InstallDir $Build), "Runtimes", "$ProductVersion.experimental");
38113812
}
38123813

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

39403944
Install-SDK $WindowsSDKBuilds -Identifier WindowsExperimental

0 commit comments

Comments
 (0)