We link against SwiftBuild (and not SWBProjectModel)

pmattos · pmattos · commit f368a7372a72 · 2025-03-25T17:05:18.000-07:00
diff --git a/Sources/SwiftBuildSupport/PackagePIFBuilder+Helpers.swift b/Sources/SwiftBuildSupport/PackagePIFBuilder+Helpers.swift
@@ -55,7 +55,7 @@ import struct PackageGraph.ResolvedProduct
 
 import func PackageLoading.pkgConfigArgs
 
-import enum SWBProjectModel.PIF
+import enum SwiftBuild.PIF
 
 // MARK: - PIF GUID Helpers
 
@@ -139,8 +139,8 @@ extension PackageModel.Package {
         self.manifest.displayName
     }
 
-    var packageBaseBuildSettings: SWBProjectModel.PIF.BuildSettings {
-        var settings = SWBProjectModel.PIF.BuildSettings()
+    var packageBaseBuildSettings: SwiftBuild.PIF.BuildSettings {
+        var settings = SwiftBuild.PIF.BuildSettings()
         settings.SDKROOT = "auto"
         settings.SDK_VARIANT = "auto"
 
@@ -203,14 +203,14 @@ extension PackageModel.Platform {
 }
 
 extension Sequence<PackageModel.PackageCondition> {
-    func toPlatformFilter(toolsVersion: ToolsVersion) -> Set<SWBProjectModel.PIF.PlatformFilter> {
-        let pifPlatforms = self.flatMap { packageCondition -> [SWBProjectModel.PIF.BuildSettings.Platform] in
+    func toPlatformFilter(toolsVersion: ToolsVersion) -> Set<SwiftBuild.PIF.PlatformFilter> {
+        let pifPlatforms = self.flatMap { packageCondition -> [SwiftBuild.PIF.BuildSettings.Platform] in
             guard let platforms = packageCondition.platformsCondition?.platforms else {
                 return []
             }
 
-            var pifPlatformsForCondition: [SWBProjectModel.PIF.BuildSettings.Platform] = platforms
-                .map { SWBProjectModel.PIF.BuildSettings.Platform(from: $0) }
+            var pifPlatformsForCondition: [SwiftBuild.PIF.BuildSettings.Platform] = platforms
+                .map { SwiftBuild.PIF.BuildSettings.Platform(from: $0) }
 
             // Treat catalyst like macOS for backwards compatibility with older tools versions.
             if pifPlatformsForCondition.contains(.macOS), toolsVersion < ToolsVersion.v5_5 {
@@ -313,7 +313,7 @@ extension PackageGraph.ResolvedPackage {
 }
 
 extension PackageGraph.ResolvedPackage {
-    public var packageBaseBuildSettings: SWBProjectModel.PIF.BuildSettings {
+    public var packageBaseBuildSettings: SwiftBuild.PIF.BuildSettings {
         self.underlying.packageBaseBuildSettings
     }
 }
@@ -793,12 +793,12 @@ extension TSCUtility.Version {
 // MARK: - Swift Build PIF Helpers
 
 /// Helpers for building custom PIF targets by `PIFPackageBuilder` clients.
-extension SWBProjectModel.PIF.Project {
+extension SwiftBuild.PIF.Project {
     @discardableResult
     public func addTarget(
         packageProductName: String,
-        productType: SWBProjectModel.PIF.Target.ProductType
-    ) throws -> SWBProjectModel.PIF.Target {
+        productType: SwiftBuild.PIF.Target.ProductType
+    ) throws -> SwiftBuild.PIF.Target {
         let pifTarget = try self.addTargetThrowing(
             id: PIFPackageBuilder.targetGUID(forProductName: packageProductName),
             productType: productType,
@@ -811,8 +811,8 @@ extension SWBProjectModel.PIF.Project {
     @discardableResult
     public func addTarget(
         packageModuleName: String,
-        productType: SWBProjectModel.PIF.Target.ProductType
-    ) throws -> SWBProjectModel.PIF.Target {
+        productType: SwiftBuild.PIF.Target.ProductType
+    ) throws -> SwiftBuild.PIF.Target {
         let pifTarget = try self.addTargetThrowing(
             id: PIFPackageBuilder.targetGUID(forModuleName: packageModuleName),
             productType: productType,
@@ -823,7 +823,7 @@ extension SWBProjectModel.PIF.Project {
     }
 }
 
-extension SWBProjectModel.PIF.BuildSettings {
+extension SwiftBuild.PIF.BuildSettings {
     /// Internal helper function that appends list of string values to a declaration.
     /// If a platform is specified, then the values are appended to the `platformSpecificSettings`,
     /// otherwise they are appended to the platform-neutral settings.
@@ -895,7 +895,7 @@ extension SWBProjectModel.PIF.BuildSettings {
     }
 }
 
-extension SWBProjectModel.PIF.BuildSettings.Platform {
+extension SwiftBuild.PIF.BuildSettings.Platform {
     init(from platform: PackageModel.Platform) {
         self = switch platform {
         case .macOS: .macOS
@@ -915,7 +915,7 @@ extension SWBProjectModel.PIF.BuildSettings.Platform {
     }
 }
 
-extension SWBProjectModel.PIF.BuildSettings {
+extension SwiftBuild.PIF.BuildSettings {
     /// Configure necessary settings for a dynamic library/framework.
     mutating func configureDynamicSettings(
         productName: String,
@@ -959,7 +959,7 @@ extension SWBProjectModel.PIF.BuildSettings {
     }
 }
 
-extension SWBProjectModel.PIF.BuildSettings.Declaration {
+extension SwiftBuild.PIF.BuildSettings.Declaration {
     init(from declaration: PackageModel.BuildSettings.Declaration) {
         self = switch declaration {
         // Swift.
diff --git a/Sources/SwiftBuildSupport/PackagePIFBuilder+Plugins.swift b/Sources/SwiftBuildSupport/PackagePIFBuilder+Plugins.swift
@@ -17,7 +17,7 @@ import let Basics.localFileSystem
 import enum Basics.Sandbox
 import struct Basics.SourceControlURL
 
-import enum SWBProjectModel.PIF
+import enum SwiftBuild.PIF
 
 extension PIFPackageBuilder {
     /// Contains all of the information resulting from applying a build tool plugin to a package target thats affect how
diff --git a/Sources/SwiftBuildSupport/PackagePIFBuilder.swift b/Sources/SwiftBuildSupport/PackagePIFBuilder.swift
@@ -30,7 +30,7 @@ import struct PackageGraph.ModulesGraph
 import struct PackageGraph.ResolvedModule
 import struct PackageGraph.ResolvedPackage
 
-import enum SWBProjectModel.PIF
+import enum SwiftBuild.PIF
 
 /// A builder for generating the PIF object from a package.
 public final class PIFPackageBuilder {
@@ -41,12 +41,12 @@ public final class PIFPackageBuilder {
     let packageManifest: PackageModel.Manifest // FIXME: Can't we just use `package.manifest` instead? —— Paulo
 
     /// The built PIF project object.
-    public var pifProject: SWBProjectModel.PIF.Project {
+    public var pifProject: SwiftBuild.PIF.Project {
         assert(self._pifProject != nil, "Call build() method to build the PIF first")
         return self._pifProject!
     }
 
-    private var _pifProject: SWBProjectModel.PIF.Project?
+    private var _pifProject: SwiftBuild.PIF.Project?
 
     /// Scope for logging informational debug messages (intended for developers, not end users).
     let observabilityScope: ObservabilityScope
@@ -85,7 +85,7 @@ public final class PIFPackageBuilder {
 
         /// For executables — only executables for now — we check to see if there is a custom package product type
         /// provider that can provide this information.
-        func customProductType(forExecutable product: PackageModel.Product) -> SWBProjectModel.PIF.Target.ProductType?
+        func customProductType(forExecutable product: PackageModel.Product) -> SwiftBuild.PIF.Target.ProductType?
 
         /// Returns all *device family* IDs for all SDK variants.
         func deviceFamilyIDs() -> Set<Int>
@@ -97,12 +97,12 @@ public final class PIFPackageBuilder {
         var isPluginExecutionSandboxingDisabled: Bool { get }
 
         /// Hook to customize the project-wide build settings.
-        func configureProjectBuildSettings(_ buildSettings: inout SWBProjectModel.PIF.BuildSettings)
+        func configureProjectBuildSettings(_ buildSettings: inout SwiftBuild.PIF.BuildSettings)
 
         /// Hook to customize source module build settings.
         func configureSourceModuleBuildSettings(
             sourceModule: PackageGraph.ResolvedModule,
-            settings: inout SWBProjectModel.PIF.BuildSettings
+            settings: inout SwiftBuild.PIF.BuildSettings
         )
 
         /// Custom install path for the specified product, if any.
@@ -118,13 +118,13 @@ public final class PIFPackageBuilder {
         func customSDKOptions(forPlatform: PackageModel.Platform) -> [String]
 
         /// Create additional custom PIF targets after all targets have been built.
-        func addCustomTargets(pifProject: SWBProjectModel.PIF.Project) throws -> [PIFPackageBuilder.ModuleOrProduct]
+        func addCustomTargets(pifProject: SwiftBuild.PIF.Project) throws -> [PIFPackageBuilder.ModuleOrProduct]
 
         /// Should we suppresses the specific product dependency, updating the provided build settings if necessary?
         /// The specified product may be in the same package or a different one.
         func shouldSuppressProductDependency(
             product: PackageModel.Product,
-            buildSettings: inout SWBProjectModel.PIF.BuildSettings
+            buildSettings: inout SwiftBuild.PIF.BuildSettings
         ) -> Bool
 
         /// Should we set the install path for a dynamic library/framework?
@@ -133,8 +133,8 @@ public final class PIFPackageBuilder {
         /// Provides additional configuration and files for the specified library product.
         func configureLibraryProduct(
             product: PackageModel.Product,
-            pifTarget: SWBProjectModel.PIF.Target,
-            additionalFiles: SWBProjectModel.PIF.Group
+            pifTarget: SwiftBuild.PIF.Target,
+            additionalFiles: SwiftBuild.PIF.Group
         )
 
         /// The de#tention behind this is to set a value for `watchOS`, `tvOS`, and `visionOS`
@@ -204,7 +204,7 @@ public final class PIFPackageBuilder {
 
     /// Build an empty PIF project for the specified `Package`.
 
-    public class func buildEmptyPIF(package: PackageModel.Package) -> SWBProjectModel.PIF.Project {
+    public class func buildEmptyPIF(package: PackageModel.Package) -> SwiftBuild.PIF.Project {
         self.buildEmptyPIF(
             id: "PACKAGE:\(package.identity)",
             path: package.manifest.path.pathString,
@@ -221,15 +221,15 @@ public final class PIFPackageBuilder {
         projectDir: String,
         name: String,
         developmentRegion: String? = nil
-    ) -> SWBProjectModel.PIF.Project {
-        let project = SWBProjectModel.PIF.Project(
+    ) -> SwiftBuild.PIF.Project {
+        let project = SwiftBuild.PIF.Project(
             id: id,
             path: path,
             projectDir: projectDir,
             name: name,
             developmentRegion: developmentRegion
         )
-        let settings = SWBProjectModel.PIF.BuildSettings()
+        let settings = SwiftBuild.PIF.BuildSettings()
 
         project.addBuildConfig(name: "Debug", settings: settings)
         project.addBuildConfig(name: "Release", settings: settings)
@@ -238,18 +238,18 @@ public final class PIFPackageBuilder {
     }
 
     public func buildPlaceholderPIF(id: String, path: String, projectDir: String, name: String) -> ModuleOrProduct {
-        let project = SWBProjectModel.PIF.Project(
+        let project = SwiftBuild.PIF.Project(
             id: id,
             path: path,
             projectDir: projectDir,
             name: name
         )
-        let projectSettings = SWBProjectModel.PIF.BuildSettings()
+        let projectSettings = SwiftBuild.PIF.BuildSettings()
         project.addBuildConfig(name: "Debug", settings: projectSettings)
         project.addBuildConfig(name: "Release", settings: projectSettings)
 
         let target = project.addAggregateTarget(id: "PACKAGE-PLACEHOLDER:\(id)", name: id)
-        let targetSettings: SWBProjectModel.PIF.BuildSettings = self.package.underlying.packageBaseBuildSettings
+        let targetSettings: SwiftBuild.PIF.BuildSettings = self.package.underlying.packageBaseBuildSettings
         target.addBuildConfig(name: "Debug", settings: targetSettings)
         target.addBuildConfig(name: "Release", settings: targetSettings)
 
@@ -280,7 +280,7 @@ public final class PIFPackageBuilder {
         public var moduleName: String?
         public var isDynamicLibraryVariant: Bool = false
 
-        public var pifTarget: SWBProjectModel.PIF.BaseTarget?
+        public var pifTarget: SwiftBuild.PIF.BaseTarget?
 
         public var indexableFileURLs: [SourceControlURL]
         public var headerFiles: Set<AbsolutePath>
@@ -333,7 +333,7 @@ public final class PIFPackageBuilder {
 
         public var description: String { rawValue }
 
-        init(from pifProductType: SWBProjectModel.PIF.Target.ProductType) {
+        init(from pifProductType: SwiftBuild.PIF.Target.ProductType) {
             self = switch pifProductType {
             case .application: .application
             case .staticArchive: .staticArchive
@@ -459,7 +459,7 @@ public final class PIFPackageBuilder {
     /// First we set those that are in common between the "Debug" and "Release" configurations, and then we set those
     /// that are different.
     private func addProjectBuildSettings(project: PackagePIFProjectBuilder) {
-        var settings = SWBProjectModel.PIF.BuildSettings()
+        var settings = SwiftBuild.PIF.BuildSettings()
         settings.PRODUCT_NAME = "$(TARGET_NAME)"
         settings.SUPPORTED_PLATFORMS = ["$(AVAILABLE_PLATFORMS)"]
         settings.SKIP_INSTALL = "YES"
@@ -508,7 +508,7 @@ public final class PIFPackageBuilder {
         self.delegate.configureProjectBuildSettings(&settings)
 
         for (platform, platformOptions) in self.package.sdkOptions(delegate: self.delegate) {
-            let pifPlatform = SWBProjectModel.PIF.BuildSettings.Platform(from: platform)
+            let pifPlatform = SwiftBuild.PIF.BuildSettings.Platform(from: platform)
             settings.platformSpecificSettings[pifPlatform]![.SPECIALIZATION_SDK_OPTIONS]!
                 .append(contentsOf: platformOptions)
         }
@@ -591,7 +591,7 @@ extension PIFPackageBuilder.ModuleOrProduct {
         type moduleOrProductType: PIFPackageBuilder.ModuleOrProductType,
         name: String,
         moduleName: String?,
-        pifTarget: SWBProjectModel.PIF.BaseTarget?,
+        pifTarget: SwiftBuild.PIF.BaseTarget?,
         indexableFileURLs: [SourceControlURL] = [],
         headerFiles: Set<AbsolutePath> = [],
         linkedPackageBinaries: [PIFPackageBuilder.LinkedPackageBinary] = [],
diff --git a/Sources/SwiftBuildSupport/PackagePIFProjectBuilder+Modules.swift b/Sources/SwiftBuildSupport/PackagePIFProjectBuilder+Modules.swift
@@ -25,7 +25,7 @@ import class PackageModel.SystemLibraryModule
 import struct PackageGraph.ResolvedModule
 import struct PackageGraph.ResolvedPackage
 
-import enum SWBProjectModel.PIF
+import enum SwiftBuild.PIF
 
 /// Extension to create PIF **modules** for a given package.
 extension PackagePIFProjectBuilder {
@@ -43,7 +43,7 @@ extension PackagePIFProjectBuilder {
         )
         log(.debug, "created \(type(of: pluginPifTarget)) '\(pluginPifTarget.id)' with name '\(pluginPifTarget.name)'")
 
-        var buildSettings: SWBProjectModel.PIF.BuildSettings = self.package.underlying.packageBaseBuildSettings
+        var buildSettings: SwiftBuild.PIF.BuildSettings = self.package.underlying.packageBaseBuildSettings
 
         // Add the dependencies.
         pluginModule.recursivelyTraverseDependencies { dependency in
@@ -167,8 +167,8 @@ extension PackagePIFProjectBuilder {
             dynamicLibraryVariant.isDynamicLibraryVariant = true
             self.builtModulesAndProducts.append(dynamicLibraryVariant)
 
-            let pifTarget = staticLibrary.pifTarget as? SWBProjectModel.PIF.Target
-            let dynamicPifTarget = dynamicLibraryVariant.pifTarget as? SWBProjectModel.PIF.Target
+            let pifTarget = staticLibrary.pifTarget as? SwiftBuild.PIF.Target
+            let dynamicPifTarget = dynamicLibraryVariant.pifTarget as? SwiftBuild.PIF.Target
 
             guard let pifTarget, let dynamicPifTarget else {
                 fatalError("Could not assign dynamic PIF target")
@@ -224,7 +224,7 @@ extension PackagePIFProjectBuilder {
 
         let pifTargetName: String
         let executableName: String
-        let productType: SWBProjectModel.PIF.Target.ProductType
+        let productType: SwiftBuild.PIF.Target.ProductType
 
         switch desiredModuleType {
         case .dynamicLibrary:
@@ -321,10 +321,10 @@ extension PackagePIFProjectBuilder {
         }
 
         // Create a set of build settings that will be imparted to any target that depends on this one.
-        var impartedSettings = SWBProjectModel.PIF.BuildSettings()
+        var impartedSettings = SwiftBuild.PIF.BuildSettings()
 
         // Configure the target-wide build settings. The details depend on the kind of product we're building.
-        var settings: SWBProjectModel.PIF.BuildSettings = self.package.underlying.packageBaseBuildSettings
+        var settings: SwiftBuild.PIF.BuildSettings = self.package.underlying.packageBaseBuildSettings
 
         if shouldGenerateBundleAccessor {
             settings.GENERATE_RESOURCE_ACCESSORS = "YES"
@@ -683,10 +683,10 @@ extension PackagePIFProjectBuilder {
         for (buildConfig, declarationsByPlatform) in allBuildSettings.targetSettings {
             for (platform, settingsByDeclaration) in declarationsByPlatform {
                 // A `nil` platform means that the declaration applies to *all* platforms.
-                let pifPlatform = platform.map { SWBProjectModel.PIF.BuildSettings.Platform(from: $0) }
+                let pifPlatform = platform.map { SwiftBuild.PIF.BuildSettings.Platform(from: $0) }
 
                 for (declaration, stringValues) in settingsByDeclaration {
-                    let pifDeclaration = SWBProjectModel.PIF.BuildSettings.Declaration(from: declaration)
+                    let pifDeclaration = SwiftBuild.PIF.BuildSettings.Declaration(from: declaration)
                     switch buildConfig {
                     case .debug:
                         debugSettings.append(values: stringValues, to: pifDeclaration, platform: pifPlatform)
@@ -700,10 +700,10 @@ extension PackagePIFProjectBuilder {
         // Impart the linker flags.
         for (platform, settingsByDeclaration) in sourceModule.allBuildSettings.impartedSettings {
             // A `nil` platform means that the declaration applies to *all* platforms.
-            let pifPlatform = platform.map { SWBProjectModel.PIF.BuildSettings.Platform(from: $0) }
+            let pifPlatform = platform.map { SwiftBuild.PIF.BuildSettings.Platform(from: $0) }
 
             for (declaration, stringValues) in settingsByDeclaration {
-                let pifDeclaration = SWBProjectModel.PIF.BuildSettings.Declaration(from: declaration)
+                let pifDeclaration = SwiftBuild.PIF.BuildSettings.Declaration(from: declaration)
                 impartedSettings.append(values: stringValues, to: pifDeclaration, platform: pifPlatform)
             }
         }
@@ -771,14 +771,14 @@ extension PackagePIFProjectBuilder {
             "created \(type(of: systemLibraryPifTarget)) '\(systemLibraryPifTarget.id)' with name '\(systemLibraryPifTarget.name)'"
         )
 
-        let settings: SWBProjectModel.PIF.BuildSettings = self.package.underlying.packageBaseBuildSettings
+        let settings: SwiftBuild.PIF.BuildSettings = self.package.underlying.packageBaseBuildSettings
         let pkgConfig = try systemLibrary.pkgConfig(
             package: self.package,
             observabilityScope: pifBuilder.observabilityScope
         )
 
         // Impart the header search path to all direct and indirect clients.
-        var impartedSettings = SWBProjectModel.PIF.BuildSettings()
+        var impartedSettings = SwiftBuild.PIF.BuildSettings()
         impartedSettings.OTHER_CFLAGS = ["-fmodule-map-file=\(systemLibrary.modulemapFileAbsolutePath)"] + pkgConfig
             .cFlags.prepending("$(inherited)")
         impartedSettings.OTHER_LDFLAGS = pkgConfig.libs.prepending("$(inherited)")
diff --git a/Sources/SwiftBuildSupport/PackagePIFProjectBuilder+Products.swift b/Sources/SwiftBuildSupport/PackagePIFProjectBuilder+Products.swift
diff --git a/Sources/SwiftBuildSupport/PackagePIFProjectBuilder.swift b/Sources/SwiftBuildSupport/PackagePIFProjectBuilder.swift
