Runtime: extract a Runtime subdirectory for SPM

Re-organise the "runtime" components (i.e. the Package Manifest runtime)
into a separate directory. Introduce a separate CMake project for the
build of this runtime to allow building the SPM tool with one version of
the Swift runtime and the SPM Manifest Runtime witih a separate Swift
runtime.

Author: compnerd

CMakeLists.txt

@@ -18,6 +18,7 @@ project(SwiftPM LANGUAGES C Swift)
 
 option(BUILD_SHARED_LIBS "Build shared libraries by default" YES)
 option(FIND_PM_DEPS "Search for all external Package Manager dependencies" YES)
+option(SwiftPM_ENABLE_RUNTIME "Build the runtime" YES)
 
 set(CMAKE_Swift_LANGUAGE_VERSION 5)
 set(CMAKE_Swift_MODULE_DIRECTORY ${CMAKE_BINARY_DIR}/swift)

Package.swift

@@ -80,6 +80,7 @@ let swiftPMProduct = (
         "LLBuildManifest",
         "SourceKitLSPAPI",
         "SPMLLBuild",
+        "SwiftBuildSupport",
     ]
 )
 
@@ -184,20 +185,6 @@ let package = Package(
         ),
     ],
     targets: [
-        // The `PackageDescription` target provides the API that is available
-        // to `Package.swift` manifests. Here we build a debug version of the
-        // library; the bootstrap scripts build the deployable version.
-        .target(
-            name: "PackageDescription",
-            exclude: ["CMakeLists.txt"],
-            swiftSettings: commonExperimentalFeatures + [
-                .define("USE_IMPL_ONLY_IMPORTS"),
-                .unsafeFlags(["-package-description-version", "999.0"]),
-                .unsafeFlags(["-enable-library-evolution"]),
-            ],
-            linkerSettings: packageLibraryLinkSettings
-        ),
-
         // The `AppleProductTypes` target provides additional product types
         // to `Package.swift` manifests. Here we build a debug version of the
         // library; the bootstrap scripts build the deployable version.
@@ -213,19 +200,6 @@ let package = Package(
                 .unsafeFlags(["-Xfrontend", "-module-link-name", "-Xfrontend", "AppleProductTypes"])
             ]),
 
-        // The `PackagePlugin` target provides the API that is available to
-        // plugin scripts. Here we build a debug version of the library; the
-        // bootstrap scripts build the deployable version.
-        .target(
-            name: "PackagePlugin",
-            exclude: ["CMakeLists.txt"],
-            swiftSettings: commonExperimentalFeatures + [
-                .unsafeFlags(["-package-description-version", "999.0"]),
-                .unsafeFlags(["-enable-library-evolution"]),
-            ],
-            linkerSettings: packageLibraryLinkSettings
-        ),
-
         .target(
             name: "SourceKitLSPAPI",
             dependencies: [
@@ -775,11 +749,41 @@ let package = Package(
             ]
         ),
 
+        // The `PackageDescription` target provides the API that is available
+        // to `Package.swift` manifests. Here we build a debug version of the
+        // library; the bootstrap scripts build the deployable version.
+        .target(
+            name: "PackageDescription",
+            path: "Sources/Runtimes/PackageDescription",
+            exclude: ["CMakeLists.txt"],
+            swiftSettings: commonExperimentalFeatures + [
+                .define("USE_IMPL_ONLY_IMPORTS"),
+                .unsafeFlags(["-package-description-version", "999.0"]),
+                .unsafeFlags(["-enable-library-evolution"]),
+            ],
+            linkerSettings: packageLibraryLinkSettings
+        ),
+
+        // The `PackagePlugin` target provides the API that is available to
+        // plugin scripts. Here we build a debug version of the library; the
+        // bootstrap scripts build the deployable version.
+        .target(
+            name: "PackagePlugin",
+            path: "Sources/Runtimes/PackagePlugin",
+            exclude: ["CMakeLists.txt"],
+            swiftSettings: commonExperimentalFeatures + [
+                .unsafeFlags(["-package-description-version", "999.0"]),
+                .unsafeFlags(["-enable-library-evolution"]),
+            ],
+            linkerSettings: packageLibraryLinkSettings
+        ),
+
         // MARK: Support for Swift macros, should eventually move to a plugin-based solution
 
         .target(
             name: "CompilerPluginSupport",
             dependencies: ["PackageDescription"],
+            path: "Sources/Runtimes/CompilerPluginSupport",
             exclude: ["CMakeLists.txt"],
             swiftSettings: commonExperimentalFeatures + [
                 .unsafeFlags(["-package-description-version", "999.0"]),
@@ -789,19 +793,19 @@ let package = Package(
 
         // MARK: Additional Test Dependencies
 
-            .target(
-                /** SwiftPM internal build test suite support library */
-                name: "_InternalBuildTestSupport",
-                dependencies: [
-                    "Build",
-                    "XCBuildSupport",
-                    "SwiftBuildSupport",
-                    "_InternalTestSupport"
-                ],
-                swiftSettings: [
-                    .unsafeFlags(["-static"]),
-                ]
-            ),
+        .target(
+            /** SwiftPM internal build test suite support library */
+            name: "_InternalBuildTestSupport",
+            dependencies: [
+                "Build",
+                "XCBuildSupport",
+                "SwiftBuildSupport",
+                "_InternalTestSupport"
+            ],
+            swiftSettings: [
+                .unsafeFlags(["-static"]),
+            ]
+        ),
 
         .target(
             /** SwiftPM internal test suite support library */

Sources/CMakeLists.txt

@@ -13,19 +13,16 @@ add_subdirectory(Basics)
 add_subdirectory(BinarySymbols)
 add_subdirectory(Build)
 add_subdirectory(Commands)
-add_subdirectory(CompilerPluginSupport)
 add_subdirectory(CoreCommands)
 add_subdirectory(DriverSupport)
 add_subdirectory(LLBuildManifest)
 add_subdirectory(PackageCollections)
 add_subdirectory(PackageCollectionsModel)
 add_subdirectory(PackageCollectionsSigning)
-add_subdirectory(PackageDescription)
 add_subdirectory(PackageFingerprint)
 add_subdirectory(PackageGraph)
 add_subdirectory(PackageLoading)
 add_subdirectory(PackageModel)
-add_subdirectory(PackagePlugin)
 add_subdirectory(PackageRegistry)
 add_subdirectory(PackageRegistryCommand)
 add_subdirectory(PackageSigning)
@@ -48,3 +45,29 @@ add_subdirectory(Workspace)
 add_subdirectory(XCBuildSupport)
 add_subdirectory(SwiftBuildSupport)
 add_subdirectory(tsan_utils)
+
+if(SwiftPM_ENABLE_RUNTIME)
+  add_subdirectory(Runtimes)
+  # NOTE: maintain the custom output directory for the ManifestAPI modules to
+  # allow the boostrap scripts to continue functioning as they have historically.
+  # This is unnecessary with the split runtime build, but is left here to
+  # minimize disruption.
+  set_target_properties(CompilerPluginSupport PROPERTIES
+    Swift_MODULE_DIRECTORY ${CMAKE_BINARY_DIR}/pm/ManifestAPI
+    OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/pm/ManifestAPI
+    ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/pm/ManifestAPI
+    LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/pm/ManifestAPI
+    RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/pm/ManifestAPI)
+  set_target_properties(PackageDescription PROPERTIES
+    Swift_MODULE_DIRECTORY ${CMAKE_BINARY_DIR}/pm/ManifestAPI
+    OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/pm/ManifestAPI
+    ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/pm/ManifestAPI
+    LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/pm/ManifestAPI
+    RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/pm/ManifestAPI)
+  set_target_properties(PackagePlugin PROPERTIES
+    Swift_MODULE_DIRECTORY ${CMAKE_BINARY_DIR}/pm/PluginAPI
+    OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/pm/PluginAPI
+    ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/pm/PluginAPI
+    LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/pm/PluginAPI
+    RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/pm/PluginAPI)
+endif()

Sources/CompilerPluginSupport/CMakeLists.txt

@@ -1 +1 @@
-../PackageDescription/PackageDescriptionSerialization.swift
+../Runtimes/PackageDescription/PackageDescriptionSerialization.swift