[BuildManifest] NFC: Route uses of getCommandName and getLLBuild* through product/target descriptions

Instead of looking through the build description and passing data from
it down to underlying module/product, let's provided convenient APIs
directly on build descriptions.

Author: xedin

Sources/Build/BuildManifest/LLBuildManifestBuilder+Clang.swift

@@ -93,7 +93,7 @@ extension LLBuildManifestBuilder {
         let additionalInputs = try addBuildToolPlugins(.clang(target))
 
         // Create a phony node to represent the entire target.
-        let targetName = target.target.getLLBuildTargetName(buildParameters: target.buildParameters)
+        let targetName = target.getLLBuildTargetName()
         let output: Node = .virtual(targetName)
 
         self.manifest.addNode(output, toTarget: targetName)

Sources/Build/BuildManifest/LLBuildManifestBuilder+Product.swift

@@ -11,11 +11,14 @@
 //===----------------------------------------------------------------------===//
 
 import struct Basics.AbsolutePath
+import struct Basics.InternalError
 import struct LLBuildManifest.Node
+import struct SPMBuildCore.BuildParameters
+import struct PackageGraph.ResolvedProduct
 
 extension LLBuildManifestBuilder {
     func createProductCommand(_ buildProduct: ProductBuildDescription) throws {
-        let cmdName = try buildProduct.product.getCommandName(buildParameters: buildProduct.buildParameters)
+        let cmdName = try buildProduct.getCommandName()
 
         // Add dependency on Info.plist generation on Darwin platforms.
         let testInputs: [AbsolutePath]
@@ -34,7 +37,7 @@ extension LLBuildManifestBuilder {
         }
 
         // Create a phony node to represent the entire target.
-        let targetName = try buildProduct.product.getLLBuildTargetName(buildParameters: buildProduct.buildParameters)
+        let targetName = try buildProduct.getLLBuildTargetName()
         let output: Node = .virtual(targetName)
 
         let finalProductNode: Node
@@ -85,7 +88,7 @@ extension LLBuildManifestBuilder {
                     outputPath: plistPath
                 )
 
-                let cmdName = try buildProduct.product.getCommandName(buildParameters: buildProduct.buildParameters)
+                let cmdName = try buildProduct.getCommandName()
                 let codeSigningOutput = Node.virtual(targetName + "-CodeSigning")
                 try self.manifest.addShellCmd(
                     name: "\(cmdName)-entitlements",
@@ -120,3 +123,44 @@ extension LLBuildManifestBuilder {
         )
     }
 }
+
+extension ProductBuildDescription {
+    public func getLLBuildTargetName() throws -> String {
+        try self.product.getLLBuildTargetName(buildParameters: self.buildParameters)
+    }
+
+    public func getCommandName() throws -> String {
+        try "C.\(self.getLLBuildTargetName())\(self.buildParameters.suffix)"
+    }
+}
+
+extension ResolvedProduct {
+    public func getLLBuildTargetName(buildParameters: BuildParameters) throws -> String {
+        let triple = buildParameters.triple.tripleString
+        let config = buildParameters.buildConfig
+        let suffix = buildParameters.suffix
+        let potentialExecutableTargetName = "\(name)-\(triple)-\(config)\(suffix).exe"
+        let potentialLibraryTargetName = "\(name)-\(triple)-\(config)\(suffix).dylib"
+
+        switch type {
+        case .library(.dynamic):
+            return potentialLibraryTargetName
+        case .test:
+            return "\(name)-\(triple)-\(config)\(suffix).test"
+        case .library(.static):
+            return "\(name)-\(triple)-\(config)\(suffix).a"
+        case .library(.automatic):
+            throw InternalError("automatic library not supported")
+        case .executable, .snippet:
+            return potentialExecutableTargetName
+        case .macro:
+            #if BUILD_MACROS_AS_DYLIBS
+            return potentialLibraryTargetName
+            #else
+            return potentialExecutableTargetName
+            #endif
+        case .plugin:
+            throw InternalError("unexpectedly asked for the llbuild target name of a plugin product")
+        }
+    }
+}

Sources/Build/BuildManifest/LLBuildManifestBuilder+Resources.swift

@@ -45,7 +45,7 @@ extension LLBuildManifestBuilder {
             outputs.append(output)
         }
 
-        let cmdName = target.target.getLLBuildResourcesCmdName(buildParameters: target.buildParameters)
+        let cmdName = target.getLLBuildResourcesCmdName()
         self.manifest.addPhonyCmd(name: cmdName, inputs: outputs, outputs: [.virtual(cmdName)])
 
         return .virtual(cmdName)

Sources/Build/BuildManifest/LLBuildManifestBuilder+Swift.swift

@@ -375,7 +375,7 @@ extension LLBuildManifestBuilder {
         cmdOutputs: [Node]
     ) throws {
         let isLibrary = target.target.type == .library || target.target.type == .test
-        let cmdName = target.target.getCommandName(buildParameters: target.defaultBuildParameters)
+        let cmdName = target.getCommandName()
 
         self.manifest.addWriteSourcesFileListCommand(sources: target.sources, sourcesFileListPath: target.sourcesFileListPath)
         self.manifest.addSwiftCmd(
@@ -495,7 +495,7 @@ extension LLBuildManifestBuilder {
     /// Adds a top-level phony command that builds the entire target.
     private func addTargetCmd(_ target: SwiftTargetBuildDescription, cmdOutputs: [Node]) {
         // Create a phony node to represent the entire target.
-        let targetName = target.target.getLLBuildTargetName(buildParameters: target.defaultBuildParameters)
+        let targetName = target.getLLBuildTargetName()
         let targetOutput: Node = .virtual(targetName)
 
         self.manifest.addNode(targetOutput, toTarget: targetName)
@@ -601,3 +601,13 @@ extension Driver {
         }
     }
 }
+
+extension SwiftTargetBuildDescription {
+    public func getCommandName() -> String {
+        "C." + self.getLLBuildTargetName()
+    }
+
+    public func getLLBuildTargetName() -> String {
+        self.target.getLLBuildTargetName(buildParameters: self.defaultBuildParameters)
+    }
+}

Sources/Build/BuildManifest/LLBuildManifestBuilder.swift

@@ -316,52 +316,21 @@ extension TargetBuildDescription {
     }
 }
 
-extension ResolvedModule {
-    public func getCommandName(buildParameters: BuildParameters) -> String {
-        "C." + self.getLLBuildTargetName(buildParameters: buildParameters)
-    }
-
-    public func getLLBuildTargetName(buildParameters: BuildParameters) -> String {
-        "\(self.name)-\(buildParameters.triple.tripleString)-\(buildParameters.buildConfig)\(buildParameters.suffix(triple: self.buildTriple)).module"
-    }
-
-    public func getLLBuildResourcesCmdName(buildParameters: BuildParameters) -> String {
-        "\(self.name)-\(buildParameters.triple.tripleString)-\(buildParameters.buildConfig)\(buildParameters.suffix(triple: self.buildTriple)).module-resources"
+extension TargetBuildDescription {
+    public func getLLBuildResourcesCmdName() -> String {
+        "\(self.target.name)-\(self.buildParameters.triple.tripleString)-\(self.buildParameters.buildConfig)\(self.buildParameters.suffix).module-resources"
     }
 }
 
-extension ResolvedProduct {
-    public func getLLBuildTargetName(buildParameters: BuildParameters) throws -> String {
-        let triple = buildParameters.triple.tripleString
-        let config = buildParameters.buildConfig
-        let suffix = buildParameters.suffix(triple: self.buildTriple)
-        let potentialExecutableTargetName = "\(name)-\(triple)-\(config)\(suffix).exe"
-        let potentialLibraryTargetName = "\(name)-\(triple)-\(config)\(suffix).dylib"
-
-        switch type {
-        case .library(.dynamic):
-            return potentialLibraryTargetName
-        case .test:
-            return "\(name)-\(triple)-\(config)\(suffix).test"
-        case .library(.static):
-            return "\(name)-\(triple)-\(config)\(suffix).a"
-        case .library(.automatic):
-            throw InternalError("automatic library not supported")
-        case .executable, .snippet:
-            return potentialExecutableTargetName
-        case .macro:
-            #if BUILD_MACROS_AS_DYLIBS
-            return potentialLibraryTargetName
-            #else
-            return potentialExecutableTargetName
-            #endif
-        case .plugin:
-            throw InternalError("unexpectedly asked for the llbuild target name of a plugin product")
-        }
+extension ClangTargetBuildDescription {
+    public func getLLBuildTargetName() -> String {
+        self.target.getLLBuildTargetName(buildParameters: self.buildParameters)
     }
+}
 
-    public func getCommandName(buildParameters: BuildParameters) throws -> String {
-        try "C.\(self.getLLBuildTargetName(buildParameters: buildParameters))\(buildParameters.suffix(triple: self.buildTriple))"
+extension ResolvedModule {
+    public func getLLBuildTargetName(buildParameters: BuildParameters) -> String {
+        "\(self.name)-\(buildParameters.triple.tripleString)-\(buildParameters.buildConfig)\(buildParameters.suffix).module"
     }
 }