Build SwiftBuild as part of CMake bootstrapping

Author: owenv

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)

Package.swift

@@ -1108,8 +1108,7 @@ if ProcessInfo.processInfo.environment["ENABLE_APPLE_PRODUCT_TYPES"] == "1" {
     }
 }
 
-if ProcessInfo.processInfo.environment["SWIFTPM_SWBUILD_FRAMEWORK"] == nil &&
-    ProcessInfo.processInfo.environment["SWIFTPM_NO_SWBUILD_DEPENDENCY"] == nil {
+if ProcessInfo.processInfo.environment["SWIFTPM_SWBUILD_FRAMEWORK"] == nil {
 
     let swiftbuildsupport: Target = package.targets.first(where: { $0.name == "SwiftBuildSupport" } )!
     swiftbuildsupport.dependencies += [

Sources/SwiftBuildSupport/CMakeLists.txt

@@ -24,6 +24,8 @@ target_link_libraries(SwiftBuildSupport PUBLIC
   TSCBasic
   TSCUtility
   PackageGraph
+  SwiftBuild::SwiftBuild
+  SwiftBuild::SWBBuildService
 )
 
 set_target_properties(SwiftBuildSupport PROPERTIES

Sources/SwiftBuildSupport/DotPIFSerializer.swift

@@ -9,7 +9,6 @@ import Basics
 import Foundation
 import protocol TSCBasic.OutputByteStream
 
-#if canImport(SwiftBuild)
 import SwiftBuild
 
 /// Serializes the specified PIF as a **Graphviz** directed graph.
@@ -223,5 +222,3 @@ fileprivate extension String {
         "\""
     }
 }
-
-#endif

Sources/SwiftBuildSupport/PIF.swift

@@ -17,7 +17,6 @@ import PackageModel
 
 import struct TSCBasic.ByteString
 
-#if canImport(SwiftBuild)
 import enum SwiftBuild.ProjectModel
 
 /// The Project Interchange Format (PIF) is a structured representation of the
@@ -286,5 +285,3 @@ extension PIF {
         workspace.signature = try signature(of: workspace)
     }
 }
-
-#endif // SwiftBuild

Sources/SwiftBuildSupport/PIFBuilder.swift

@@ -24,9 +24,7 @@ import func TSCBasic.memoize
 import func TSCBasic.topologicalSort
 import var TSCBasic.stdoutStream
 
-#if canImport(SwiftBuild)
 import enum SwiftBuild.ProjectModel
-#endif
 
 /// The parameters required by `PIFBuilder`.
 struct PIFBuilderParameters {
@@ -103,7 +101,6 @@ public final class PIFBuilder {
         printPIFManifestGraphviz: Bool = false,
         buildParameters: BuildParameters
     ) throws -> String {
-        #if canImport(SwiftBuild)
         let encoder = prettyPrint ? JSONEncoder.makeWithDefaults() : JSONEncoder()
 
         if !preservePIFModelStructure {
@@ -129,13 +126,8 @@ public final class PIFBuilder {
         }
 
         return pifString
-        #else
-        fatalError("Swift Build support is not linked in.")
-        #endif
     }
-    
-    #if canImport(SwiftBuild)
-    
+
     private var cachedPIF: PIF.TopLevelObject?
 
     /// Constructs a `PIF.TopLevelObject` representing the package graph.
@@ -192,8 +184,6 @@ public final class PIFBuilder {
             return PIF.TopLevelObject(workspace: workspace)
         }
     }
-    
-    #endif
 
     // Convenience method for generating PIF.
     public static func generatePIF(
@@ -214,8 +204,6 @@ public final class PIFBuilder {
     }
 }
 
-#if canImport(SwiftBuild)
-
 fileprivate final class PackagePIFBuilderDelegate: PackagePIFBuilder.BuildDelegate {
     let package: ResolvedPackage
 
@@ -421,8 +409,6 @@ fileprivate func buildAggregateProject(
     return aggregateProject
 }
 
-#endif
-
 public enum PIFGenerationError: Error {
     case rootPackageNotFound, multipleRootPackagesFound
 

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
@@ -1216,4 +1214,3 @@ extension UserDefaults {
     }
 }
 
-#endif

Sources/SwiftBuildSupport/PackagePIFBuilder+Plugins.swift

@@ -18,8 +18,6 @@ import enum Basics.Sandbox
 import struct Basics.AbsolutePath
 import struct Basics.SourceControlURL
 
-#if canImport(SwiftBuild)
-
 import enum SwiftBuild.ProjectModel
 
 extension PackagePIFBuilder {
@@ -136,4 +134,3 @@ extension PackagePIFBuilder {
     }
 }
 
-#endif

Sources/SwiftBuildSupport/PackagePIFBuilder.swift

@@ -32,8 +32,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
@@ -668,5 +666,3 @@ extension PackagePIFBuilder.LinkedPackageBinary {
         }
     }
 }
-
-#endif

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.
@@ -884,5 +882,3 @@ extension PackagePIFProjectBuilder {
         self.builtModulesAndProducts.append(systemModule)
     }
 }
-
-#endif