Rename Build module to NativeBuildSupport

This module is intended to contain code exclusive to the native build system, in order to help more clearly identify the delineation between the three build system backends, and identify layering violations and new higher-level abstractions that will need to be created to delegate to the appropriate backend (SourceKit support is one major example).

Author: jakepetroules

Package.swift

@@ -77,7 +77,7 @@ let swiftPMDataModelProduct = (
 let swiftPMProduct = (
     name: "SwiftPM",
     targets: swiftPMDataModelProduct.targets + [
-        "Build",
+        "NativeBuildSupport",
         "LLBuildManifest",
         "SourceKitLSPAPI",
         "SPMLLBuild",
@@ -205,11 +205,11 @@ let package = Package(
             name: "SourceKitLSPAPI",
             dependencies: [
                 "Basics",
-                "Build",
                 "PackageGraph",
                 "PackageLoading",
                 "PackageModel",
                 "SPMBuildCore",
+                "NativeBuildSupport",
             ],
             exclude: ["CMakeLists.txt"],
             swiftSettings: commonExperimentalFeatures + [
@@ -451,29 +451,28 @@ let package = Package(
             ]
         ),
         .target(
-            /** Builds Modules and Products */
-            name: "Build",
+            name: "DriverSupport",
             dependencies: [
                 "Basics",
-                "LLBuildManifest",
-                "PackageGraph",
-                "SPMBuildCore",
-                "SPMLLBuild",
+                "PackageModel",
                 .product(name: "SwiftDriver", package: "swift-driver"),
-                .product(name: "OrderedCollections", package: "swift-collections"),
-                "DriverSupport",
             ],
             exclude: ["CMakeLists.txt"],
             swiftSettings: commonExperimentalFeatures + [
                 .unsafeFlags(["-static"]),
             ]
         ),
         .target(
-            name: "DriverSupport",
+            name: "NativeBuildSupport",
             dependencies: [
                 "Basics",
-                "PackageModel",
+                "LLBuildManifest",
+                "PackageGraph",
+                "SPMBuildCore",
+                "SPMLLBuild",
                 .product(name: "SwiftDriver", package: "swift-driver"),
+                .product(name: "OrderedCollections", package: "swift-collections"),
+                "DriverSupport",
             ],
             exclude: ["CMakeLists.txt"],
             swiftSettings: commonExperimentalFeatures + [
@@ -500,7 +499,9 @@ let package = Package(
                 "PackageGraph",
             ],
             exclude: ["CMakeLists.txt", "README.md"],
-            swiftSettings: commonExperimentalFeatures
+            swiftSettings: commonExperimentalFeatures + [
+                .unsafeFlags(["-static"]),
+            ]
         ),
         .target(
             /** High level functionality */
@@ -544,11 +545,11 @@ let package = Package(
             dependencies: [
                 .product(name: "ArgumentParser", package: "swift-argument-parser"),
                 "Basics",
-                "Build",
                 "PackageLoading",
                 "PackageModel",
                 "PackageGraph",
                 "Workspace",
+                "NativeBuildSupport",
                 "XCBuildSupport",
                 "SwiftBuildSupport",
             ],
@@ -565,12 +566,12 @@ let package = Package(
                 .product(name: "ArgumentParser", package: "swift-argument-parser"),
                 .product(name: "OrderedCollections", package: "swift-collections"),
                 "Basics",
-                "Build",
                 "CoreCommands",
                 "PackageGraph",
                 "PackageModelSyntax",
                 "SourceControl",
                 "Workspace",
+                "NativeBuildSupport",
                 "XCBuildSupport",
                 "SwiftBuildSupport",
             ] + swiftSyntaxDependencies(["SwiftIDEUtils"]),
@@ -666,10 +667,10 @@ let package = Package(
                 .product(name: "ArgumentParser", package: "swift-argument-parser"),
                 .product(name: "OrderedCollections", package: "swift-collections"),
                 "Basics",
-                "Build",
                 "PackageGraph",
                 "PackageLoading",
                 "PackageModel",
+                "NativeBuildSupport",
                 "XCBuildSupport",
                 "SwiftBuildSupport",
             ],
@@ -749,7 +750,7 @@ let package = Package(
                 /** SwiftPM internal build test suite support library */
                 name: "_InternalBuildTestSupport",
                 dependencies: [
-                    "Build",
+                    "NativeBuildSupport",
                     "XCBuildSupport",
                     "SwiftBuildSupport",
                     "_InternalTestSupport"
@@ -830,7 +831,7 @@ let package = Package(
         ),
         .testTarget(
             name: "BuildTests",
-            dependencies: ["Build", "PackageModel", "Commands", "_InternalTestSupport", "_InternalBuildTestSupport"]
+            dependencies: ["NativeBuildSupport", "PackageModel", "Commands", "_InternalTestSupport", "_InternalBuildTestSupport"]
         ),
         .testTarget(
             name: "LLBuildManifestTests",
@@ -982,7 +983,7 @@ if ProcessInfo.processInfo.environment["SWIFTCI_DISABLE_SDK_DEPENDENT_TESTS"] ==
             dependencies: [
                 "swift-package-manager",
                 "Basics",
-                "Build",
+                "NativeBuildSupport",
                 "Commands",
                 "PackageModel",
                 "PackageModelSyntax",

Sources/CMakeLists.txt

@@ -10,12 +10,12 @@ add_compile_definitions(USE_IMPL_ONLY_IMPORTS)
 
 add_subdirectory(_AsyncFileSystem)
 add_subdirectory(Basics)
-add_subdirectory(Build)
 add_subdirectory(Commands)
 add_subdirectory(CompilerPluginSupport)
 add_subdirectory(CoreCommands)
 add_subdirectory(DriverSupport)
 add_subdirectory(LLBuildManifest)
+add_subdirectory(NativeBuildSupport)
 add_subdirectory(PackageDescription)
 add_subdirectory(PackageFingerprint)
 add_subdirectory(PackageGraph)

Sources/Commands/PackageCommands/SwiftPackageCommand.swift

@@ -20,7 +20,6 @@ import PackageModel
 import SourceControl
 import SPMBuildCore
 import Workspace
-import XCBuildSupport
 
 import enum TSCUtility.Diagnostics
 

Sources/Commands/SwiftBuildCommand.swift

@@ -13,16 +13,15 @@
 import ArgumentParser
 import Basics
 
-import Build
-
 @_spi(SwiftPMInternal)
 import CoreCommands
 
 import PackageGraph
 
 import SPMBuildCore
-import XCBuildSupport
-import SwiftBuildSupport
+
+private import NativeBuildSupport
+private import SwiftBuildSupport
 
 import class Basics.AsyncProcess
 import var TSCBasic.stdoutStream

Sources/CoreCommands/BuildSystemSupport.swift

@@ -11,13 +11,14 @@
 //===----------------------------------------------------------------------===//
 
 import Basics
-import Build
 import SPMBuildCore
-import XCBuildSupport
-import SwiftBuildSupport
 import PackageGraph
 import Workspace
 
+private import NativeBuildSupport
+private import XCBuildSupport
+private import SwiftBuildSupport
+
 import class Basics.ObservabilityScope
 import struct PackageGraph.ModulesGraph
 import struct PackageLoading.FileRuleDescription

Sources/Build/BuildDescription/ClangModuleBuildDescription.swift renamed to Sources/NativeBuildSupport/BuildDescription/ClangModuleBuildDescription.swift

@@ -205,7 +205,7 @@ extension ResolvedProduct {
             guard let macroModule = self.modules.first else {
                 throw InternalError("macro product \(self.name) has no targets")
             }
-            return Build.getLLBuildTargetName(macro: macroModule, buildParameters: buildParameters)
+            return NativeBuildSupport.getLLBuildTargetName(macro: macroModule, buildParameters: buildParameters)
         case .plugin:
             throw InternalError("unexpectedly asked for the llbuild target name of a plugin product")
         }

Sources/Build/BuildDescription/ModuleBuildDescription.swift renamed to Sources/NativeBuildSupport/BuildDescription/ModuleBuildDescription.swift

@@ -6,7 +6,7 @@
 # See http://swift.org/LICENSE.txt for license information
 # See http://swift.org/CONTRIBUTORS.txt for Swift project authors
 
-add_library(Build
+add_library(NativeBuildSupport
   BuildDescription/ClangModuleBuildDescription.swift
   BuildDescription/PluginBuildDescription.swift
   BuildDescription/ProductBuildDescription.swift
@@ -30,26 +30,26 @@ add_library(Build
   LLBuildProgressTracker.swift
   SwiftCompilerOutputParser.swift
   TestObservation.swift)
-target_link_libraries(Build PUBLIC
+target_link_libraries(NativeBuildSupport PUBLIC
   TSCBasic
   Basics
   SwiftCollections::OrderedCollections
   PackageGraph
   SPMBuildCore)
-target_link_libraries(Build PRIVATE
+target_link_libraries(NativeBuildSupport PRIVATE
   DriverSupport
   LLBuildManifest
   SPMLLBuild
   SwiftDriver)
-target_link_libraries(Build INTERFACE
+target_link_libraries(NativeBuildSupport INTERFACE
   llbuildSwift)
 
 # NOTE(compnerd) workaround for CMake not setting up include flags yet
-set_target_properties(Build PROPERTIES
+set_target_properties(NativeBuildSupport PROPERTIES
   INTERFACE_INCLUDE_DIRECTORIES ${CMAKE_Swift_MODULE_DIRECTORY})
 
-install(TARGETS Build
+install(TARGETS NativeBuildSupport
   ARCHIVE DESTINATION lib
   LIBRARY DESTINATION lib
   RUNTIME DESTINATION bin)
-set_property(GLOBAL APPEND PROPERTY SwiftPM_EXPORTS Build)
+set_property(GLOBAL APPEND PROPERTY SwiftPM_EXPORTS NativeBuildSupport)

Sources/Build/BuildDescription/PluginBuildDescription.swift renamed to Sources/NativeBuildSupport/BuildDescription/PluginBuildDescription.swift

@@ -16,7 +16,7 @@ import TSCBasic
 // Ideally wouldn't expose these (it defeats the purpose of this module), but we should replace this entire API with
 // a BSP server, so this is good enough for now (and LSP is using all these types internally anyway).
 import Basics
-import Build
+import NativeBuildSupport
 import PackageGraph
 internal import PackageLoading
 internal import PackageModel
@@ -201,14 +201,14 @@ private struct WrappedSwiftTargetBuildDescription: BuildTarget {
 }
 
 public struct BuildDescription {
-    private let buildPlan: Build.BuildPlan
+    private let buildPlan: NativeBuildSupport.BuildPlan
 
     /// The inputs of the build plan so we don't need to re-compute them  on every call to
     /// `fileAffectsSwiftOrClangBuildSettings`.
-    private let inputs: [Build.BuildPlan.Input]
+    private let inputs: [NativeBuildSupport.BuildPlan.Input]
 
     /// Wrap an already constructed build plan.
-    public init(buildPlan: Build.BuildPlan) {
+    public init(buildPlan: NativeBuildSupport.BuildPlan) {
         self.buildPlan = buildPlan
         self.inputs = buildPlan.inputs
     }

Sources/Build/BuildDescription/ProductBuildDescription.swift renamed to Sources/NativeBuildSupport/BuildDescription/ProductBuildDescription.swift

@@ -13,7 +13,7 @@
 import Basics
 
 @_spi(SwiftPMInternal)
-import Build
+import NativeBuildSupport
 
 import _InternalTestSupport
 import struct PackageGraph.ModulesGraph
@@ -37,7 +37,7 @@ public func mockBuildPlan(
     targetSanitizers: EnabledSanitizers = .init(),
     fileSystem fs: any FileSystem,
     observabilityScope: ObservabilityScope
-) async throws -> Build.BuildPlan {
+) async throws -> NativeBuildSupport.BuildPlan {
     try await mockBuildPlan(
         buildPath: buildPath,
         config: environment.configuration ?? .debug,
@@ -70,7 +70,7 @@ public func mockBuildPlan(
     targetSanitizers: EnabledSanitizers = .init(),
     fileSystem fs: any FileSystem,
     observabilityScope: ObservabilityScope
-) async throws -> Build.BuildPlan {
+) async throws -> NativeBuildSupport.BuildPlan {
     let inferredTriple: Basics.Triple
     if let platform {
         precondition(triple == nil)
@@ -160,17 +160,17 @@ enum BuildError: Swift.Error {
 }
 
 public struct BuildPlanResult {
-    public let plan: Build.BuildPlan
+    public let plan: NativeBuildSupport.BuildPlan
 
-    public var productMap: IdentifiableSet<Build.ProductBuildDescription> {
+    public var productMap: IdentifiableSet<NativeBuildSupport.ProductBuildDescription> {
         self.plan.productMap
     }
 
-    public var targetMap: IdentifiableSet<Build.ModuleBuildDescription> {
+    public var targetMap: IdentifiableSet<NativeBuildSupport.ModuleBuildDescription> {
         self.plan.targetMap
     }
 
-    public init(plan: Build.BuildPlan) throws {
+    public init(plan: NativeBuildSupport.BuildPlan) throws {
         self.plan = plan
     }
 
@@ -182,7 +182,7 @@ public struct BuildPlanResult {
         XCTAssertEqual(self.productMap.count, count, file: file, line: line)
     }
 
-    public func moduleBuildDescription(for name: String) throws -> Build.ModuleBuildDescription {
+    public func moduleBuildDescription(for name: String) throws -> NativeBuildSupport.ModuleBuildDescription {
         let matches = self.targetMap.filter({ $0.module.name == name })
         guard matches.count == 1 else {
             if matches.isEmpty {
@@ -194,7 +194,7 @@ public struct BuildPlanResult {
         return matches.first!
     }
 
-    public func buildProduct(for name: String) throws -> Build.ProductBuildDescription {
+    public func buildProduct(for name: String) throws -> NativeBuildSupport.ProductBuildDescription {
         let matches = self.productMap.filter({ $0.product.name == name })
         guard matches.count == 1 else {
             if matches.isEmpty {
@@ -208,7 +208,7 @@ public struct BuildPlanResult {
     }
 }
 
-extension Build.ModuleBuildDescription {
+extension NativeBuildSupport.ModuleBuildDescription {
     public func swift() throws -> SwiftModuleBuildDescription {
         switch self {
         case .swift(let description):

Sources/Build/BuildDescription/ResolvedModule+BuildDescription.swift renamed to Sources/NativeBuildSupport/BuildDescription/ResolvedModule+BuildDescription.swift

@@ -13,7 +13,6 @@
 import ArgumentParser
 import Basics
 import _Concurrency
-import Build
 import Dispatch
 
 @_spi(SwiftPMInternal)
@@ -25,8 +24,10 @@ import PackageGraph
 import PackageLoading
 import PackageModel
 import SPMBuildCore
-import XCBuildSupport
-import SwiftBuildSupport
+
+private import NativeBuildSupport
+private import XCBuildSupport
+private import SwiftBuildSupport
 
 import struct TSCBasic.KeyedPair
 import func TSCBasic.topologicalSort

Sources/Build/BuildDescription/SwiftModuleBuildDescription.swift renamed to Sources/NativeBuildSupport/BuildDescription/SwiftModuleBuildDescription.swift

@@ -74,7 +74,6 @@ class WalkTests: XCTestCase {
             .appending(component: "Sources")
         var expected = [
             root.appending(component: "Basics"),
-            root.appending(component: "Build"),
             root.appending(component: "Commands"),
         ]
         for x in try! walk(root) {

Sources/Build/BuildManifest/LLBuildManifestBuilder+Clang.swift renamed to Sources/NativeBuildSupport/BuildManifest/LLBuildManifestBuilder+Clang.swift

@@ -10,7 +10,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-@testable import Build
+@testable import NativeBuildSupport
 @testable import PackageModel
 
 import Basics