Build SwiftBuild as part of CMake bootstrapping

owenv · owenv · commit a95a93d8a03c · 2025-04-27T20:57:24.000-07:00
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -45,6 +45,7 @@ if(FIND_PM_DEPS)
   find_package(SwiftASN1 CONFIG REQUIRED)
   find_package(SwiftCertificates CONFIG REQUIRED)
   find_package(SwiftCrypto CONFIG REQUIRED)
+  find_package(SwiftBuild CONFIG REQUIRED)
 endif()
 
 find_package(dispatch QUIET)
diff --git a/Sources/SwiftBuildSupport/CMakeLists.txt b/Sources/SwiftBuildSupport/CMakeLists.txt
@@ -23,6 +23,8 @@ target_link_libraries(SwiftBuildSupport PUBLIC
   TSCBasic
   TSCUtility
   PackageGraph
+  SwiftBuild::SwiftBuild
+  SwiftBuild::SWBBuildService
 )
 
 set_target_properties(SwiftBuildSupport PROPERTIES
diff --git a/Sources/SwiftBuildSupport/PackagePIFBuilder+Helpers.swift b/Sources/SwiftBuildSupport/PackagePIFBuilder+Helpers.swift
@@ -61,8 +61,6 @@ func targetName(forProductName name: String, suffix: String? = nil) -> String {
     return "\(name)\(suffix)-product"
 }
 
-#if canImport(SwiftBuild)
-
 import enum SwiftBuild.ProjectModel
 
 // MARK: - PIF GUID Helpers
@@ -1215,4 +1213,3 @@ extension UserDefaults {
     }
 }
 
-#endif
diff --git a/Sources/SwiftBuildSupport/PackagePIFBuilder+Plugins.swift b/Sources/SwiftBuildSupport/PackagePIFBuilder+Plugins.swift
@@ -17,8 +17,6 @@ import let Basics.localFileSystem
 import enum Basics.Sandbox
 import struct Basics.SourceControlURL
 
-#if canImport(SwiftBuild)
-
 import enum SwiftBuild.ProjectModel
 
 extension PackagePIFBuilder {
@@ -135,4 +133,3 @@ extension PackagePIFBuilder {
     }
 }
 
-#endif
diff --git a/Sources/SwiftBuildSupport/PackagePIFBuilder.swift b/Sources/SwiftBuildSupport/PackagePIFBuilder.swift
@@ -30,8 +30,6 @@ import struct PackageGraph.ModulesGraph
 import struct PackageGraph.ResolvedModule
 import struct PackageGraph.ResolvedPackage
 
-#if canImport(SwiftBuild)
-
 import enum SwiftBuild.ProjectModel
 
 typealias GUID = SwiftBuild.ProjectModel.GUID
@@ -660,5 +658,3 @@ extension PackagePIFBuilder.LinkedPackageBinary {
         }
     }
 }
-
-#endif
diff --git a/Sources/SwiftBuildSupport/PackagePIFProjectBuilder+Modules.swift b/Sources/SwiftBuildSupport/PackagePIFProjectBuilder+Modules.swift
@@ -26,8 +26,6 @@ import class PackageModel.SystemLibraryModule
 import struct PackageGraph.ResolvedModule
 import struct PackageGraph.ResolvedPackage
 
-#if canImport(SwiftBuild)
-
 import enum SwiftBuild.ProjectModel
 
 /// Extension to create PIF **modules** for a given package.
@@ -869,5 +867,3 @@ extension PackagePIFProjectBuilder {
         self.builtModulesAndProducts.append(systemModule)
     }
 }
-
-#endif
diff --git a/Sources/SwiftBuildSupport/PackagePIFProjectBuilder+Products.swift b/Sources/SwiftBuildSupport/PackagePIFProjectBuilder+Products.swift
@@ -28,8 +28,6 @@ import struct PackageGraph.ResolvedModule
 import struct PackageGraph.ResolvedPackage
 import struct PackageGraph.ResolvedProduct
 
-#if canImport(SwiftBuild)
-
 import enum SwiftBuild.ProjectModel
 
 /// Extension to create PIF **products** for a given package.
@@ -1001,4 +999,3 @@ private struct PackageRegistrySignature: Encodable {
     let formatVersion = 2
 }
 
-#endif
diff --git a/Sources/SwiftBuildSupport/PackagePIFProjectBuilder.swift b/Sources/SwiftBuildSupport/PackagePIFProjectBuilder.swift
@@ -31,8 +31,6 @@ import struct PackageGraph.ResolvedPackage
 import struct PackageLoading.FileRuleDescription
 import struct PackageLoading.TargetSourcesBuilder
 
-#if canImport(SwiftBuild)
-
 import struct SwiftBuild.Pair
 import enum SwiftBuild.ProjectModel
 import struct SwiftBuild.SwiftBuildFileType
@@ -549,4 +547,3 @@ struct PackagePIFProjectBuilder {
     }
 }
 
-#endif
diff --git a/Sources/SwiftBuildSupport/SwiftBuildSystem.swift b/Sources/SwiftBuildSupport/SwiftBuildSystem.swift
@@ -30,13 +30,10 @@ import func TSCBasic.withTemporaryFile
 
 import enum TSCUtility.Diagnostics
 
-#if canImport(SwiftBuild)
 import Foundation
 import SWBBuildService
 import SwiftBuild
-#endif
 
-#if canImport(SwiftBuild)
 
 struct SessionFailedError: Error {
     var error: Error
@@ -155,7 +152,6 @@ private final class PlanningOperationDelegate: SWBPlanningOperationDelegate, Sen
         .deferred
     }
 }
-#endif
 
 public final class SwiftBuildSystem: SPMBuildCore.BuildSystem {
     private let buildParameters: BuildParameters
@@ -232,7 +228,6 @@ public final class SwiftBuildSystem: SPMBuildCore.BuildSystem {
     }
 
     public func build(subset: BuildSubset) async throws {
-        #if canImport(SwiftBuild)
         guard !buildParameters.shouldSkipBuilding else {
             return
         }
@@ -246,12 +241,9 @@ public final class SwiftBuildSystem: SPMBuildCore.BuildSystem {
 
         try await startSWBuildOperation(pifTargetName: subset.pifTargetName)
 
-        #else
-        fatalError("Swift Build support is not linked in.")
-        #endif
+       
     }
 
-    #if canImport(SwiftBuild)
     private func startSWBuildOperation(pifTargetName: String) async throws {
         let buildStartTime = ContinuousClock.Instant.now
 
@@ -510,7 +502,6 @@ public final class SwiftBuildSystem: SPMBuildCore.BuildSystem {
             return pifBuilder
         }
     }
-    #endif
 
     public func cancel(deadline: DispatchTime) throws {}
 
diff --git a/Utilities/bootstrap b/Utilities/bootstrap
@@ -243,6 +243,7 @@ def parse_global_args(args):
     args.source_dirs["swift-certificates"]    = os.path.join(args.project_root, "..", "swift-certificates")
     args.source_dirs["swift-asn1"]            = os.path.join(args.project_root, "..", "swift-asn1")
     args.source_dirs["swift-syntax"]          = os.path.join(args.project_root, "..", "swift-syntax")
+    args.source_dirs["swift-build"]           = os.path.join(args.project_root, "..", "swift-build")
     args.source_root                          = os.path.join(args.project_root, "Sources")
 
     if platform.system() == 'Darwin':
@@ -442,6 +443,16 @@ def build(args):
         build_dependency(args, "swift-certificates",
             ["-DSwiftASN1_DIR=" + os.path.join(args.build_dirs["swift-asn1"], "cmake/modules"),
              "-DSwiftCrypto_DIR=" + os.path.join(args.build_dirs["swift-crypto"], "cmake/modules")])
+        swift_build_cmake_flags = [
+            get_llbuild_cmake_arg(args),
+            "-DSwiftSystem_DIR="    + os.path.join(args.build_dirs["swift-system"], "cmake/modules"),
+            "-DSwiftASN1_DIR=" + os.path.join(args.build_dirs["swift-asn1"], "cmake/modules"),
+            "-DSwiftCrypto_DIR=" + os.path.join(args.build_dirs["swift-crypto"], "cmake/modules"),
+            "-DTSC_DIR=" + os.path.join(args.build_dirs["tsc"], "cmake/modules"),
+            "-DArgumentParser_DIR=" + os.path.join(args.build_dirs["swift-argument-parser"], "cmake/modules"),
+            "-DSwiftDriver_DIR=" + os.path.join(args.build_dirs["swift-driver"], "cmake/modules"),
+        ]
+        build_dependency(args, "swift-build", swift_build_cmake_flags)
         build_swiftpm_with_cmake(args)
 
     build_swiftpm_with_swiftpm(args,integrated_swift_driver=False)
@@ -718,6 +729,7 @@ def build_swiftpm_with_cmake(args):
         "-DSwiftCrypto_DIR="       + os.path.join(args.build_dirs["swift-crypto"],          "cmake/modules"),
         "-DSwiftASN1_DIR="         + os.path.join(args.build_dirs["swift-asn1"],            "cmake/modules"),
         "-DSwiftCertificates_DIR=" + os.path.join(args.build_dirs["swift-certificates"],    "cmake/modules"),
+        "-DSwiftBuild_DIR="        + os.path.join(args.build_dirs["swift-build"],           "cmake/modules"),
         "-DSWIFTPM_PATH_TO_SWIFT_SYNTAX_SOURCE=" + args.source_dirs["swift-syntax"],
     ]
 
@@ -738,6 +750,7 @@ def build_swiftpm_with_cmake(args):
         add_rpath_for_cmake_build(args, os.path.join(args.build_dirs["swift-collections"],     "lib"))
         add_rpath_for_cmake_build(args, os.path.join(args.build_dirs["swift-asn1"],            "lib"))
         add_rpath_for_cmake_build(args, os.path.join(args.build_dirs["swift-certificates"],    "lib"))
+        add_rpath_for_cmake_build(args, os.path.join(args.build_dirs["swift-build"],          "lib"))
 
         # rpaths for compatibility libraries
         for lib_path in get_swift_backdeploy_library_paths(args):
@@ -875,6 +888,7 @@ def get_swiftpm_env_cmd(args):
             os.path.join(args.build_dirs["swift-collections"],     "lib"),
             os.path.join(args.build_dirs["swift-asn1"],            "lib"),
             os.path.join(args.build_dirs["swift-certificates"],    "lib"),
+            os.path.join(args.build_dirs["swift-build"],           "lib"),
         ]
 
         if platform.system() == 'Darwin':

Original file line number	Diff line number	Diff line change
`@@ -23,6 +23,8 @@ target_link_libraries(SwiftBuildSupport PUBLIC`
`23`	`23`	`TSCBasic`
`24`	`24`	`TSCUtility`
`25`	`25`	`PackageGraph`
	`26`	`+ SwiftBuild::SwiftBuild`
	`27`	`+ SwiftBuild::SWBBuildService`
`26`	`28`	`)`
`27`	`29`
`28`	`30`	`set_target_properties(SwiftBuildSupport PROPERTIES`
Original file line number	Diff line number	Diff line change
`@@ -61,8 +61,6 @@ func targetName(forProductName name: String, suffix: String? = nil) -> String {`
`61`	`61`	`return "\(name)\(suffix)-product"`
`62`	`62`	`}`
`63`	`63`
`64`		`-#if canImport(SwiftBuild)`
`65`		`-`
`66`	`64`	`import enum SwiftBuild.ProjectModel`
`67`	`65`
`68`	`66`	`// MARK: - PIF GUID Helpers`
`@@ -1215,4 +1213,3 @@ extension UserDefaults {`
`1215`	`1213`	`}`
`1216`	`1214`	`}`
`1217`	`1215`
`1218`		`-#endif`
Original file line number	Diff line number	Diff line change
`@@ -17,8 +17,6 @@ import let Basics.localFileSystem`
`17`	`17`	`import enum Basics.Sandbox`
`18`	`18`	`import struct Basics.SourceControlURL`
`19`	`19`
`20`		`-#if canImport(SwiftBuild)`
`21`		`-`
`22`	`20`	`import enum SwiftBuild.ProjectModel`
`23`	`21`
`24`	`22`	`extension PackagePIFBuilder {`
`@@ -135,4 +133,3 @@ extension PackagePIFBuilder {`
`135`	`133`	`}`
`136`	`134`	`}`
`137`	`135`
`138`		`-#endif`
Original file line number	Diff line number	Diff line change
`@@ -30,8 +30,6 @@ import struct PackageGraph.ModulesGraph`
`30`	`30`	`import struct PackageGraph.ResolvedModule`
`31`	`31`	`import struct PackageGraph.ResolvedPackage`
`32`	`32`
`33`		`-#if canImport(SwiftBuild)`
`34`		`-`
`35`	`33`	`import enum SwiftBuild.ProjectModel`
`36`	`34`
`37`	`35`	`typealias GUID = SwiftBuild.ProjectModel.GUID`
`@@ -660,5 +658,3 @@ extension PackagePIFBuilder.LinkedPackageBinary {`
`660`	`658`	`}`
`661`	`659`	`}`
`662`	`660`	`}`
`663`		`-`
`664`		`-#endif`
Original file line number	Diff line number	Diff line change
`@@ -26,8 +26,6 @@ import class PackageModel.SystemLibraryModule`
`26`	`26`	`import struct PackageGraph.ResolvedModule`
`27`	`27`	`import struct PackageGraph.ResolvedPackage`
`28`	`28`
`29`		`-#if canImport(SwiftBuild)`
`30`		`-`
`31`	`29`	`import enum SwiftBuild.ProjectModel`
`32`	`30`
`33`	`31`	`/// Extension to create PIF modules for a given package.`
`@@ -869,5 +867,3 @@ extension PackagePIFProjectBuilder {`
`869`	`867`	`self.builtModulesAndProducts.append(systemModule)`
`870`	`868`	`}`
`871`	`869`	`}`
`872`		`-`
`873`		`-#endif`
Original file line number	Diff line number	Diff line change
`@@ -31,8 +31,6 @@ import struct PackageGraph.ResolvedPackage`
`31`	`31`	`import struct PackageLoading.FileRuleDescription`
`32`	`32`	`import struct PackageLoading.TargetSourcesBuilder`
`33`	`33`
`34`		`-#if canImport(SwiftBuild)`
`35`		`-`
`36`	`34`	`import struct SwiftBuild.Pair`
`37`	`35`	`import enum SwiftBuild.ProjectModel`
`38`	`36`	`import struct SwiftBuild.SwiftBuildFileType`
`@@ -549,4 +547,3 @@ struct PackagePIFProjectBuilder {`
`549`	`547`	`}`
`550`	`548`	`}`
`551`	`549`
`552`		`-#endif`
Original file line number	Diff line number	Diff line change
`@@ -30,13 +30,10 @@ import func TSCBasic.withTemporaryFile`
`30`	`30`
`31`	`31`	`import enum TSCUtility.Diagnostics`
`32`	`32`
`33`		`-#if canImport(SwiftBuild)`
`34`	`33`	`import Foundation`
`35`	`34`	`import SWBBuildService`
`36`	`35`	`import SwiftBuild`
`37`		`-#endif`
`38`	`36`
`39`		`-#if canImport(SwiftBuild)`
`40`	`37`
`41`	`38`	`struct SessionFailedError: Error {`
`42`	`39`	`var error: Error`
`@@ -155,7 +152,6 @@ private final class PlanningOperationDelegate: SWBPlanningOperationDelegate, Sen`
`155`	`152`	`.deferred`
`156`	`153`	`}`
`157`	`154`	`}`
`158`		`-#endif`
`159`	`155`
`160`	`156`	`public final class SwiftBuildSystem: SPMBuildCore.BuildSystem {`
`161`	`157`	`private let buildParameters: BuildParameters`
`@@ -232,7 +228,6 @@ public final class SwiftBuildSystem: SPMBuildCore.BuildSystem {`
`232`	`228`	`}`
`233`	`229`
`234`	`230`	`public func build(subset: BuildSubset) async throws {`
`235`		`- #if canImport(SwiftBuild)`
`236`	`231`	`guard !buildParameters.shouldSkipBuilding else {`
`237`	`232`	`return`
`238`	`233`	`}`
`@@ -246,12 +241,9 @@ public final class SwiftBuildSystem: SPMBuildCore.BuildSystem {`
`246`	`241`
`247`	`242`	`try await startSWBuildOperation(pifTargetName: subset.pifTargetName)`
`248`	`243`
`249`		`- #else`
`250`		`- fatalError("Swift Build support is not linked in.")`
`251`		`- #endif`
	`244`	`+`
`252`	`245`	`}`
`253`	`246`
`254`		`- #if canImport(SwiftBuild)`
`255`	`247`	`private func startSWBuildOperation(pifTargetName: String) async throws {`
`256`	`248`	`let buildStartTime = ContinuousClock.Instant.now`
`257`	`249`
`@@ -510,7 +502,6 @@ public final class SwiftBuildSystem: SPMBuildCore.BuildSystem {`
`510`	`502`	`return pifBuilder`
`511`	`503`	`}`
`512`	`504`	`}`
`513`		`- #endif`
`514`	`505`
`515`	`506`	`public func cancel(deadline: DispatchTime) throws {}`
`516`	`507`