Skip to content

utils: minor build.ps1 tweaks #79029

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jan 30, 2025
Merged

utils: minor build.ps1 tweaks #79029

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e3a90d7
utils: remove a dead parameter in `build.ps1`
compnerd Jan 29, 2025
ffdebdd
utils: merge adjacent build blocks
compnerd Jan 29, 2025
3f4d0d2
utils: remove an unnecessary parenthetical
compnerd Jan 29, 2025
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
11 changes: 3 additions & 8 deletions utils/build.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,6 @@ param(
[string] $WinSDKVersion = "",
[switch] $Android = $false,
[switch] $SkipBuild = $false,
[switch] $SkipRedistInstall = $false,
[switch] $SkipPackaging = $false,
[switch] $IncludeDS2 = $false,
[string[]] $Test = @(),
Expand Down Expand Up @@ -2084,11 +2083,11 @@ function Build-Foundation([Platform]$Platform, $Arch, [switch]$Test = $false) {
-Platform $Platform `
-UseBuiltCompilers ASM,C,CXX,Swift `
-SwiftSDK:$SDKRoot `
-Defines (@{
-Defines @{
CMAKE_FIND_PACKAGE_PREFER_CONFIG = "YES";
CMAKE_NINJA_FORCE_RESPONSE_FILE = "YES";
ENABLE_TESTING = "NO";
FOUNDATION_BUILD_TOOLS = if ($Platform -eq "Windows") { "YES" } else { "NO" };
CMAKE_FIND_PACKAGE_PREFER_CONFIG = "YES";
CURL_DIR = "$LibraryRoot\curl-8.9.1\usr\lib\$Platform\$ShortArch\cmake\CURL";
LibXml2_DIR = "$LibraryRoot\libxml2-2.11.5\usr\lib\$Platform\$ShortArch\cmake\libxml2-2.11.5";
ZLIB_LIBRARY = if ($Platform -eq "Windows") {
Expand All @@ -2103,7 +2102,7 @@ function Build-Foundation([Platform]$Platform, $Arch, [switch]$Test = $false) {
_SwiftFoundationICU_SourceDIR = "$SourceCache\swift-foundation-icu";
_SwiftCollections_SourceDIR = "$SourceCache\swift-collections";
SwiftFoundation_MACRO = "$(Get-BuildProjectBinaryCache FoundationMacros)\bin"
})
}
}
}
}
Expand Down Expand Up @@ -2953,9 +2952,7 @@ if (-not $SkipBuild) {
Invoke-BuildStep Build-CMark $HostArch
Invoke-BuildStep Build-XML2 Windows $HostArch
Invoke-BuildStep Build-Compilers $HostArch
}

if (-not $SkipBuild) {
foreach ($Arch in $WindowsSDKArchs) {
Invoke-BuildStep Build-ZLib Windows $Arch
Invoke-BuildStep Build-XML2 Windows $Arch
Expand Down Expand Up @@ -2995,9 +2992,7 @@ if (-not $SkipBuild) {
Invoke-BuildStep Write-SDKSettingsPlist Android $Arch
Invoke-BuildStep Write-PlatformInfoPlist $Arch
}
}

if (-not $SkipBuild) {
# Build Macros for distribution
Invoke-BuildStep Build-FoundationMacros Windows $HostArch
Invoke-BuildStep Build-TestingMacros Windows $HostArch
Expand Down