Unify swift-bootstrap with swift-build and swift-test

Package.swift

@@ -602,6 +602,7 @@ let package = Package(
                 .product(name: "ArgumentParser", package: "swift-argument-parser"),
                 "Basics",
                 "Build",
+                "CoreCommands",
                 "PackageGraph",
                 "PackageLoading",
                 "PackageModel",

Sources/Commands/CMakeLists.txt

@@ -41,7 +41,6 @@ add_library(Commands
   SwiftBuildCommand.swift
   SwiftRunCommand.swift
   SwiftTestCommand.swift
-  CommandWorkspaceDelegate.swift
   Utilities/APIDigester.swift
   Utilities/DependenciesSerializer.swift
   Utilities/DescribedPackage.swift

Sources/Commands/SwiftBuildCommand.swift

@@ -191,9 +191,3 @@ public struct SwiftBuildCommand: AsyncSwiftCommand {
 
     public init() {}
 }
-
-public extension _SwiftCommand {
-    func buildSystemProvider(_ swiftCommandState: SwiftCommandState) throws -> BuildSystemProvider {
-        swiftCommandState.defaultBuildSystemProvider
-    }
-}

Sources/Commands/Utilities/MultiRootSupport.swift

@@ -110,3 +110,11 @@ public struct XcodeWorkspaceLoader: WorkspaceLoader {
         }
     }
 }
+
+public extension _SwiftCommand {
+    var workspaceLoaderProvider: WorkspaceLoaderProvider {
+        return {
+            XcodeWorkspaceLoader(fileSystem: $0, observabilityScope: $1)
+        }
+    }
+}

Sources/CoreCommands/CMakeLists.txt

@@ -8,6 +8,7 @@
 
 add_library(CoreCommands
   BuildSystemSupport.swift
+  CommandWorkspaceDelegate.swift
   SwiftCommandState.swift
   SwiftCommandObservabilityHandler.swift
   Options.swift)

Sources/Commands/CommandWorkspaceDelegate.swift → Sources/CoreCommands/CommandWorkspaceDelegate.swift

@@ -11,7 +11,6 @@
 //===----------------------------------------------------------------------===//
 
 import Basics
-import CoreCommands
 import Dispatch
 import class Foundation.NSLock
 import struct Foundation.URL
@@ -275,10 +274,4 @@ public extension _SwiftCommand {
             )
         }
     }
-
-    var workspaceLoaderProvider: WorkspaceLoaderProvider {
-        return {
-            XcodeWorkspaceLoader(fileSystem: $0, observabilityScope: $1)
-        }
-    }
 }

Sources/CoreCommands/SwiftCommandState.swift

@@ -1185,3 +1185,9 @@ extension Basics.Diagnostic {
         .error(arguments.map { "'\($0)'" }.spm_localizedJoin(type: .conjunction) + " are mutually exclusive")
     }
 }
+
+public extension _SwiftCommand {
+    func buildSystemProvider(_ swiftCommandState: SwiftCommandState) throws -> BuildSystemProvider {
+        swiftCommandState.defaultBuildSystemProvider
+    }
+}

Sources/swift-bootstrap/CMakeLists.txt

@@ -7,11 +7,16 @@
 # See http://swift.org/CONTRIBUTORS.txt for Swift project authors
 
 add_executable(swift-bootstrap
-    main.swift)
+  SwiftBootstrapCommand.swift)
+
+target_compile_options(swift-bootstrap PRIVATE
+  -parse-as-library)
+
 target_link_libraries(swift-bootstrap PRIVATE
   ArgumentParser
   Basics
   Build
+  Commands
   PackageGraph
   PackageLoading
   PackageModel

Sources/swift-bootstrap/SwiftBootstrapCommand.swift

@@ -0,0 +1,69 @@
+//===----------------------------------------------------------------------===//
+//
+// This source file is part of the Swift open source project
+//
+// Copyright (c) 2022-2024 Apple Inc. and the Swift project authors
+// Licensed under Apache License v2.0 with Runtime Library Exception
+//
+// See http://swift.org/LICENSE.txt for license information
+// See http://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
+//
+//===----------------------------------------------------------------------===//
+
+import ArgumentParser
+import Basics
+import _Concurrency
+import Build
+import CoreCommands
+import Dispatch
+
+@_spi(SwiftPMInternal)
+import DriverSupport
+
+import Foundation
+import OrderedCollections
+import PackageGraph
+import PackageLoading
+import PackageModel
+import SPMBuildCore
+import XCBuildSupport
+
+import struct TSCBasic.KeyedPair
+import var TSCBasic.stdoutStream
+import enum TSCBasic.GraphError
+import struct TSCBasic.OrderedSet
+import enum TSCUtility.Diagnostics
+import struct TSCUtility.Version
+
+@main
+struct SwiftBootstrapCommand: AsyncSwiftCommand {
+    /// If the test should be built.
+    @Flag(help: "Build both source and test targets")
+    var buildTests: Bool = false
+
+    @OptionGroup(visibility: .hidden)
+    var globalOptions: GlobalOptions
+
+    var workspaceLoaderProvider: CoreCommands.WorkspaceLoaderProvider {
+        { _, _ in EmptyWorkspaceLoader() }
+    }
+
+    static let configuration = CommandConfiguration(
+        commandName: "swift-bootstrap",
+        abstract: "Bootstrapping build tool, only use in the context of bootstrapping SwiftPM itself",
+        shouldDisplay: false
+    )
+
+    public init() {}
+
+    public func run(_ swiftCommandState: SwiftCommandState) async throws {
+        let buildSystem = try await swiftCommandState.createBuildSystem(traitConfiguration: .init())
+        try await buildSystem.build(subset: self.buildTests ? .allIncludingTests : .allExcludingTests)
+    }
+}
+
+private struct EmptyWorkspaceLoader: WorkspaceLoader {
+    func load(workspace: AbsolutePath) throws -> [AbsolutePath] {
+        []
+    }
+}