@@ -454,6 +454,7 @@ enum HostComponent {
454
454
LMDB
455
455
SymbolKit
456
456
DocC
457
+ SwiftInspect
457
458
}
458
459
459
460
function Get-HostProjectBinaryCache ([HostComponent ]$Project ) {
@@ -2636,18 +2637,20 @@ function Install-HostToolchain() {
2636
2637
}
2637
2638
2638
2639
function Build-Inspect () {
2639
- $OutDir = Join-Path - Path $HostArch.BinaryCache - ChildPath swift- inspect
2640
- $SDKInstallRoot = (Get-HostSwiftSDK ) `
2640
+ $SDKRoot = Get-HostSwiftSDK
2641
2641
2642
- Isolate- EnvVars {
2643
- $env: SWIFTCI_USE_LOCAL_DEPS = 1
2644
- Build-SPMProject `
2645
- - Action Build `
2646
- - Src $SourceCache \swift\tools\swift- inspect `
2647
- - Bin $OutDir `
2648
- - Arch $HostArch `
2649
- - Xcc " -I$SDKInstallRoot \usr\include\swift\SwiftRemoteMirror" - Xlinker " $SDKInstallRoot \usr\lib\swift\windows\$ ( $HostArch.LLVMName ) \swiftRemoteMirror.lib"
2650
- }
2642
+ Build-CMakeProject `
2643
+ - Src $SourceCache \swift\tools\swift- inspect `
2644
+ - Bin (Get-HostProjectBinaryCache SwiftInspect) `
2645
+ - InstallTo " $ ( $HostArch.ToolchainInstallRoot ) \usr" `
2646
+ - Arch $HostArch `
2647
+ - UseBuiltCompilers Swift `
2648
+ - UseSwiftSwiftDriver `
2649
+ - SwiftSDK $SDKRoot `
2650
+ - Defines @ {
2651
+ CMAKE_Swift_FLAGS = @ (" -Xcc" , " -I$SDKRoot \usr\include\swift\SwiftRemoteMirror" );
2652
+ ArgumentParser_DIR = (Get-HostProjectCMakeModules ArgumentParser);
2653
+ }
2651
2654
}
2652
2655
2653
2656
function Build-DocC () {
@@ -2686,17 +2689,14 @@ function Test-PackageManager() {
2686
2689
function Build-Installer ($Arch ) {
2687
2690
# TODO(hjyamauchi) Re-enable the swift-inspect and swift-docc builds
2688
2691
# when cross-compiling https://github.com/apple/swift/issues/71655
2689
- $INCLUDE_SWIFT_INSPECT = if ($IsCrossCompiling ) { " false" } else { " true" }
2690
2692
$INCLUDE_SWIFT_DOCC = if ($IsCrossCompiling ) { " false" } else { " true" }
2691
2693
$ENABLE_MIMALLOC = if ($Allocator -eq " mimalloc" -and $Arch -eq $ArchX64 ) { " true" } else { " false" }
2692
2694
2693
2695
$Properties = @ {
2694
2696
BundleFlavor = " offline" ;
2695
2697
TOOLCHAIN_ROOT = " $ ( $Arch.ToolchainInstallRoot ) \" ;
2696
- INCLUDE_SWIFT_INSPECT = $INCLUDE_SWIFT_INSPECT ;
2697
- SWIFT_INSPECT_BUILD = " $ ( $Arch.BinaryCache ) \swift-inspect\release" ;
2698
- INCLUDE_SWIFT_DOCC = $INCLUDE_SWIFT_DOCC ;
2699
2698
ENABLE_MIMALLOC = $ENABLE_MIMALLOC ;
2699
+ INCLUDE_SWIFT_DOCC = $INCLUDE_SWIFT_DOCC ;
2700
2700
SWIFT_DOCC_BUILD = " $ ( $Arch.BinaryCache ) \swift-docc\release" ;
2701
2701
SWIFT_DOCC_RENDER_ARTIFACT_ROOT = " ${SourceCache} \swift-docc-render-artifact" ;
2702
2702
}
0 commit comments