Merge pull request #983 from owenv/owenv/bundle

Exclude C/C++-only targets from resource bundle accessor generation

Author: owenv

Sources/SWBCore/SpecImplementations/Tools/SwiftCompiler.swift

@@ -3874,6 +3874,20 @@ public extension BuildPhaseWithBuildFiles {
         }
         return containsFiles(ofType: swiftFileType, referenceLookupContext, specLookupContext, scope, filePathResolver)
     }
+
+    /// Checks if the build phase contains any ObjC/ObjC++ source files.
+    func containsObjCSources(_ referenceLookupContext: any ReferenceLookupContext, _ specLookupContext: any SpecLookupContext, _ scope: MacroEvaluationScope, _ filePathResolver: FilePathResolver) -> Bool {
+        let objCFileType = specLookupContext.lookupFileType(identifier: "sourcecode.c.objc")
+        let objCPlusPlusFileType = specLookupContext.lookupFileType(identifier: "sourcecode.cpp.objcpp")
+
+        for fileType in [objCFileType, objCPlusPlusFileType] {
+            guard let fileType else { continue }
+            if containsFiles(ofType: fileType, referenceLookupContext, specLookupContext, scope, filePathResolver) {
+                return true
+            }
+        }
+        return false
+    }
 }
 
 struct SwiftOutputFileMap: Codable {

Sources/SWBTaskConstruction/TaskProducers/BuildPhaseTaskProducers/SourcesTaskProducer.swift

@@ -1852,8 +1852,10 @@ package final class SourcesTaskProducer: FilesBasedBuildPhaseTaskProducerBase, F
         // we don't need to worry about targets with mixed languages.
         if buildPhase.containsSwiftSources(workspace, context, scope, context.filePathResolver) {
             return await generatePackageTargetBundleAccessorForSwift(scope, bundleName: bundleName)
-        } else {
+        } else if buildPhase.containsObjCSources(workspace, context, scope, context.filePathResolver) {
             return await generatePackageTargetBundleAccessorForObjC(scope, bundleName: bundleName)
+        } else {
+            return nil
         }
     }
 

Tests/SWBTaskConstructionTests/PackageProductConstructionTests.swift

@@ -932,6 +932,7 @@ fileprivate struct PackageProductConstructionTests: CoreBasedTests {
                 children: [
                     TestFile("main.swift"),
                     TestFile("main.m"),
+                    TestFile("main.c"),
                     TestFile("Assets.xcassets"),
                 ]),
             buildConfigurations: [
@@ -947,7 +948,7 @@ fileprivate struct PackageProductConstructionTests: CoreBasedTests {
             targets: [
                 TestAggregateTarget(
                     "ALL",
-                    dependencies: ["tool", "objctool",
+                    dependencies: ["tool", "objctool", "ctool",
                                    "tool_without_resource_bundle_without_catalog",
                                    "tool_without_resource_bundle_with_catalog"]
                 ),
@@ -984,6 +985,21 @@ fileprivate struct PackageProductConstructionTests: CoreBasedTests {
                     ],
                     dependencies: ["mallory"]
                 ),
+                TestStandardTarget(
+                    "ctool", type: .commandLineTool,
+                    buildConfigurations: [
+                        TestBuildConfiguration("Debug", buildSettings: [
+                            "PRODUCT_NAME": "$(TARGET_NAME)",
+                            "USE_HEADERMAP": "NO",
+                            "DEFINES_MODULE": "YES",
+                            "PACKAGE_RESOURCE_BUNDLE_NAME": "tool_resources",
+                        ]),
+                    ],
+                    buildPhases: [
+                        TestSourcesBuildPhase(["main.c"]),
+                    ],
+                    dependencies: ["mallory"]
+                ),
                 TestStandardTarget(
                     "mallory", type: .bundle,
                     buildConfigurations: [
@@ -1078,6 +1094,15 @@ fileprivate struct PackageProductConstructionTests: CoreBasedTests {
                 }
             }
 
+            results.checkTarget("ctool") { target in
+                results.checkNoTask(.matchTarget(target), .matchRuleType("WriteAuxiliaryFile"), .matchRuleItemBasename("resource_bundle_accessor.m"))
+                results.checkNoTask(.matchTarget(target), .matchRuleType("WriteAuxiliaryFile"), .matchRuleItemBasename("resource_bundle_accessor.h"))
+
+                results.checkTask(.matchTarget(target), .matchRuleType("CompileC"), .matchRuleItemBasename("main.c")) { task in
+                    task.checkCommandLineDoesNotContain("-include")
+                }
+            }
+
             results.checkTarget("mallory") { target in
                 results.checkWriteAuxiliaryFileTask(.matchTarget(target), .matchRuleType("WriteAuxiliaryFile"), .matchRuleItemBasename("resource_bundle_accessor.swift")) { task, contents in
                     XCTAssertMatch(contents.unsafeStringValue, .contains("static let module: Bundle"))