Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
89 changes: 50 additions & 39 deletions utils/build.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,9 @@ Default: @("Android", "AndroidExperimental")
An array of architectures for which the Android Swift SDK should be built.
Default: @("aarch64", "armv7", "i686", "x86_64")

.PARAMETER Windows
Build Windows SDKs.

.PARAMETER WinSDKVersion
The version number of the Windows SDK to be used.
Overrides the value resolved by the Visual Studio command prompt.
Expand Down Expand Up @@ -189,6 +192,7 @@ param
[string[]] $AndroidSDKArchitectures = @("aarch64", "armv7", "i686", "x86_64"),

# Windows SDK Options
[switch] $Windows = $true,
[ValidatePattern("^\d+\.\d+\.\d+(?:-\w+)?")]
[string] $WinSDKVersion = "",
[string[]] $WindowsSDKVersions = @("Windows", "WindowsExperimental"),
Expand Down Expand Up @@ -3812,7 +3816,12 @@ function Build-Installer([Hashtable] $Platform) {
}
}

$Properties["Platforms"] = "`"windows$(if ($Android) { ";android" })`"";
$Properties["Platforms"] = "`"$(
@(
if ($Windows) { "windows" }
if ($Android) { "android" }
) -Join ";"
)`"";
$Properties["AndroidArchitectures"] = "`"$(($AndroidSDKBuilds | ForEach-Object { $_.Architecture.LLVMName }) -Join ";")`""
$Properties["WindowsArchitectures"] = "`"$(($WindowsSDKBuilds | ForEach-Object { $_.Architecture.LLVMName }) -Join ";")`""
$Properties["ToolchainVariants"] = "`"asserts$(if ($IncludeNoAsserts) { ";noasserts" })`"";
Expand Down Expand Up @@ -3935,62 +3944,64 @@ if (-not $SkipBuild) {
SwiftSyntax_DIR = (Get-ProjectCMakeModules $BuildPlatform Compilers);
}

foreach ($Build in $WindowsSDKBuilds) {
if ($IncludeDS2) {
Invoke-BuildStep Build-DS2 $Build
if ($Windows) {
foreach ($Build in $WindowsSDKBuilds) {
if ($IncludeDS2) {
Invoke-BuildStep Build-DS2 $Build
}

Invoke-BuildStep Build-ZLib $Build
Invoke-BuildStep Build-XML2 $Build
Invoke-BuildStep Build-CURL $Build
}

Invoke-BuildStep Build-ZLib $Build
Invoke-BuildStep Build-XML2 $Build
Invoke-BuildStep Build-CURL $Build
}
foreach ($SDK in $WindowsSDKVersions) {
switch ($SDK) {
Windows {
foreach ($Build in $WindowsSDKBuilds) {
Invoke-BuildStep Build-SDK $Build

foreach ($SDK in $WindowsSDKVersions) {
switch ($SDK) {
Windows {
foreach ($Build in $WindowsSDKBuilds) {
Invoke-BuildStep Build-SDK $Build
Get-ChildItem "$(Get-SwiftSDK Windows)\usr\lib\swift\windows" -Filter "*.lib" -File -ErrorAction Ignore | ForEach-Object {
Write-Host -BackgroundColor DarkRed -ForegroundColor White "$($_.FullName) is not nested in an architecture directory"
Move-Item $_.FullName "$(Get-SwiftSDK Windows)\usr\lib\swift\windows\$($Build.Architecture.LLVMName)\" | Out-Null
}

Get-ChildItem "$(Get-SwiftSDK Windows)\usr\lib\swift\windows" -Filter "*.lib" -File -ErrorAction Ignore | ForEach-Object {
Write-Host -BackgroundColor DarkRed -ForegroundColor White "$($_.FullName) is not nested in an architecture directory"
Move-Item $_.FullName "$(Get-SwiftSDK Windows)\usr\lib\swift\windows\$($Build.Architecture.LLVMName)\" | Out-Null
# FIXME(compnerd) how do we select which SDK is meant to be re-distributed?
Copy-Directory "$(Get-SwiftSDK Windows)\usr\bin" "$([IO.Path]::Combine((Get-InstallDir $Build), "Runtimes", $ProductVersion, "usr"))"
}

# FIXME(compnerd) how do we select which SDK is meant to be re-distributed?
Copy-Directory "$(Get-SwiftSDK Windows)\usr\bin" "$([IO.Path]::Combine((Get-InstallDir $Build), "Runtimes", $ProductVersion, "usr"))"
Install-SDK $WindowsSDKBuilds
Write-SDKSettings Windows
}

Install-SDK $WindowsSDKBuilds
Write-SDKSettings Windows
}
WindowsExperimental {
foreach ($Build in $WindowsSDKBuilds) {
Invoke-BuildStep Build-ExperimentalSDK $Build

WindowsExperimental {
foreach ($Build in $WindowsSDKBuilds) {
Invoke-BuildStep Build-ExperimentalSDK $Build
$SDKROOT = Get-SwiftSDK Windows -Identifier WindowsExperimental

$SDKROOT = Get-SwiftSDK Windows -Identifier WindowsExperimental
Get-ChildItem "$(Get-SwiftSDK Windows -Identifier WindowsExperimental)\usr\lib\swift\windows" -Filter "*.lib" -File -ErrorAction Ignore | ForEach-Object {
Write-Host -BackgroundColor DarkRed -ForegroundColor White "$($_.FullName) is not nested in an architecture directory"
Move-Item $_.FullName "$SDKROOT\usr\lib\swift\windows\$($Build.Architecture.LLVMName)\" | Out-Null
}

Get-ChildItem "$(Get-SwiftSDK Windows -Identifier WindowsExperimental)\usr\lib\swift\windows" -Filter "*.lib" -File -ErrorAction Ignore | ForEach-Object {
Write-Host -BackgroundColor DarkRed -ForegroundColor White "$($_.FullName) is not nested in an architecture directory"
Move-Item $_.FullName "$SDKROOT\usr\lib\swift\windows\$($Build.Architecture.LLVMName)\" | Out-Null
}
Get-ChildItem "$(Get-SwiftSDK Windows -Identifier WindowsExperimental)\usr\lib\swift_static\windows" -Filter "*.lib" -File -ErrorAction Ignore | ForEach-Object {
Write-Host -BackgroundColor DarkRed -ForegroundColor White "$($_.FullName) is not nested in an architecture directory"
Move-Item $_.FullName "$SDKROOT\usr\lib\swift_static\windows\$($Build.Architecture.LLVMName)\" | Out-Null
}

Get-ChildItem "$(Get-SwiftSDK Windows -Identifier WindowsExperimental)\usr\lib\swift_static\windows" -Filter "*.lib" -File -ErrorAction Ignore | ForEach-Object {
Write-Host -BackgroundColor DarkRed -ForegroundColor White "$($_.FullName) is not nested in an architecture directory"
Move-Item $_.FullName "$SDKROOT\usr\lib\swift_static\windows\$($Build.Architecture.LLVMName)\" | Out-Null
# FIXME(compnerd) how do we select which SDK is meant to be re-distributed?
Copy-Directory "$(Get-SwiftSDK Windows -Identifier WindowsExperimental)\usr\bin" "$([IO.Path]::Combine((Get-InstallDir $Build), "Runtimes", "$ProductVersion.experimental", "usr"))"
}

# FIXME(compnerd) how do we select which SDK is meant to be re-distributed?
Copy-Directory "$(Get-SwiftSDK Windows -Identifier WindowsExperimental)\usr\bin" "$([IO.Path]::Combine((Get-InstallDir $Build), "Runtimes", "$ProductVersion.experimental", "usr"))"
Install-SDK $WindowsSDKBuilds -Identifier WindowsExperimental
Write-SDKSettings Windows -Identifier WindowsExperimental
}

Install-SDK $WindowsSDKBuilds -Identifier WindowsExperimental
Write-SDKSettings Windows -Identifier WindowsExperimental
}
}
}

Write-PlatformInfoPlist Windows
Write-PlatformInfoPlist Windows
}

if ($Android) {
foreach ($Build in $AndroidSDKBuilds) {
Expand Down