Use SwiftPM's builtin resource rules to copy spec files

Author: owenv

Package.swift

@@ -126,10 +126,8 @@ let package = Package(
                 "SWBLLBuild",
             ],
             exclude: ["CMakeLists.txt"],
-            swiftSettings: swiftSettings(languageMode: .v5),
-            plugins: [
-                .plugin(name: "SWBSpecificationsPlugin")
-            ]),
+            resources: [.process("Specs")],
+            swiftSettings: swiftSettings(languageMode: .v5)),
         .target(
             name: "SWBCSupport",
             publicHeadersPath: ".",
@@ -212,47 +210,45 @@ let package = Package(
             name: "SWBAndroidPlatform",
             dependencies: ["SWBCore", "SWBMacro", "SWBUtil"],
             exclude: ["CMakeLists.txt"],
+            resources: [.process("Specs")],
             swiftSettings: swiftSettings(languageMode: .v6)),
         .target(
             name: "SWBApplePlatform",
             dependencies: ["SWBCore", "SWBMacro", "SWBUtil", "SWBTaskConstruction"],
             exclude: ["CMakeLists.txt"],
+            resources: [.process("Specs")],
             swiftSettings: swiftSettings(languageMode: .v6)),
         .target(
             name: "SWBGenericUnixPlatform",
             dependencies: ["SWBCore", "SWBUtil"],
             exclude: ["CMakeLists.txt"],
+            resources: [.process("Specs")],
             swiftSettings: swiftSettings(languageMode: .v6)),
         .target(
             name: "SWBQNXPlatform",
             dependencies: ["SWBCore", "SWBMacro", "SWBUtil"],
             exclude: ["CMakeLists.txt"],
+            resources: [.process("Specs")],
             swiftSettings: swiftSettings(languageMode: .v6)),
         .target(
             name: "SWBUniversalPlatform",
             dependencies: ["SWBCore", "SWBMacro", "SWBUtil"],
             exclude: ["CMakeLists.txt"],
+            resources: [.process("Specs")],
             swiftSettings: swiftSettings(languageMode: .v6)),
         .target(
             name: "SWBWebAssemblyPlatform",
             dependencies: ["SWBCore", "SWBMacro", "SWBUtil"],
             exclude: ["CMakeLists.txt"],
+            resources: [.process("Specs")],
             swiftSettings: swiftSettings(languageMode: .v6)),
         .target(
             name: "SWBWindowsPlatform",
             dependencies: ["SWBCore", "SWBMacro", "SWBUtil"],
             exclude: ["CMakeLists.txt"],
+            resources: [.process("Specs")],
             swiftSettings: swiftSettings(languageMode: .v6)),
 
-        // Helper targets for SwiftPM
-        .executableTarget(
-            name: "SWBSpecificationsCompiler",
-            swiftSettings: swiftSettings(languageMode: .v6)),
-        .plugin(
-            name: "SWBSpecificationsPlugin",
-            capability: .buildTool(),
-            dependencies: ["SWBSpecificationsCompiler"]),
-
         // Test support
         .target(
             name: "SwiftBuildTestSupport",
@@ -422,12 +418,6 @@ for target in package.targets {
     if ["SWBBuildService", "SWBTestSupport"].contains(target.name) {
         target.dependencies += pluginTargetNames.map { .target(name: $0) }
     }
-
-    if pluginTargetNames.contains(target.name) {
-        target.plugins = (target.plugins ?? []) + [
-            .plugin(name: "SWBSpecificationsPlugin")
-        ]
-    }
 }
 
 // `SWIFTCI_USE_LOCAL_DEPS` configures if dependencies are locally available to build

Plugins/SWBSpecificationsPlugin/SWBSpecificationsPlugin.swift

@@ -29,26 +29,26 @@ file(CONFIGURE
   ESCAPE_QUOTES @ONLY NEWLINE_STYLE LF)
 
 add_library(SWBApplePlatform STATIC
-  Specs/AssetCatalogCompiler.swift
-  Specs/CopyTiffFile.swift
-  Specs/CoreDataCompiler.swift
-  Specs/CoreMLCompiler.swift
-  Specs/DittoTool.swift
-  Specs/ExtensionPointsCompiler.swift
-  Specs/IIGCompiler.swift
-  Specs/InstrumentsPackageBuilderSpec.swift
-  Specs/IntentsCompiler.swift
-  Specs/InterfaceBuilderCompiler.swift
-  Specs/InterfaceBuilderShared.swift
-  Specs/MetalCompiler.swift
-  Specs/MiGCompiler.swift
-  Specs/OpenCLCompiler.swift
-  Specs/RealityAssetsCompilerSpec.swift
-  Specs/ReferenceObjectCompiler.swift
-  Specs/ResMergerLinkerSpec.swift
-  Specs/SceneKitToolSpec.swift
-  Specs/StoryboardLinker.swift
-  Specs/XCStringsCompiler.swift
+  AssetCatalogCompiler.swift
+  CopyTiffFile.swift
+  CoreDataCompiler.swift
+  CoreMLCompiler.swift
+  DittoTool.swift
+  ExtensionPointsCompiler.swift
+  IIGCompiler.swift
+  InstrumentsPackageBuilderSpec.swift
+  IntentsCompiler.swift
+  InterfaceBuilderCompiler.swift
+  InterfaceBuilderShared.swift
+  MetalCompiler.swift
+  MiGCompiler.swift
+  OpenCLCompiler.swift
+  RealityAssetsCompilerSpec.swift
+  ReferenceObjectCompiler.swift
+  ResMergerLinkerSpec.swift
+  SceneKitToolSpec.swift
+  StoryboardLinker.swift
+  XCStringsCompiler.swift
   ActoolInputFileGroupingStrategy.swift
   AssetCatalogCompilerOutputParser.swift
   CMakeLists.txt

Sources/SWBAndroidPlatform/Android.xcspec renamed to Sources/SWBAndroidPlatform/Specs/Android.xcspec

@@ -123,69 +123,69 @@ add_library(SWBCore
   ShellScript.swift
   SigningSupport.swift
   SwiftSDK.swift
-  Specs/CommandLineToolSpec.swift
-  Specs/CompilerSpec.swift
+  SpecImplementations/CommandLineToolSpec.swift
+  SpecImplementations/CompilerSpec.swift
   Specs/CoreBuildSystem.xcspec
   Specs/ExternalBuildSystem.xcspec
-  Specs/FileTypes.swift
-  Specs/LinkerSpec.swift
+  SpecImplementations/FileTypes.swift
+  SpecImplementations/LinkerSpec.swift
   Specs/NativeBuildSystem.xcspec
-  Specs/ProductTypes.swift
-  Specs/PropertyDomainSpec.swift
-  Specs/RegisterSpecs.swift
-  Specs/SpecParser.swift
-  Specs/SpecRegistry.swift
-  Specs/Specs.swift
-  Specs/Tools/AppIntentsMetadataCompiler.swift
-  Specs/Tools/AppIntentsSSUTrainingCompiler.swift
-  Specs/Tools/AppShortcutStringsMetadataCompiler.swift
-  Specs/Tools/CCompiler.swift
-  Specs/Tools/ClangModuleVerifierInputGenerator.swift
-  Specs/Tools/ClangStatCache.swift
-  Specs/Tools/CodeSign.swift
-  Specs/Tools/ConcatenateTool.swift
-  Specs/Tools/ConstructStubExecutorFileListTool.swift
-  Specs/Tools/CopyTool.swift
-  Specs/Tools/CreateAssetPackManifestTool.swift
-  Specs/Tools/CreateBuildDirectory.swift
-  Specs/Tools/DocumentationCompiler.swift
-  Specs/Tools/DsymutilTool.swift
-  Specs/Tools/Gate.swift
-  Specs/Tools/GCCCompatibleCompilerSupport.swift
-  Specs/Tools/GenerateAppPlaygroundAssetCatalog.swift
-  Specs/Tools/InfoPlistTool.swift
-  Specs/Tools/LaunchServicesRegisterTool.swift
-  Specs/Tools/LinkerTools.swift
-  Specs/Tools/Lipo.swift
-  Specs/Tools/MasterObjectLink.swift
-  Specs/Tools/MergeInfoPlist.swift
-  Specs/Tools/MkdirTool.swift
-  Specs/Tools/ModulesVerifierTool.swift
-  Specs/Tools/PLUtilTool.swift
-  Specs/Tools/ProcessSDKImports.swift
-  Specs/Tools/ProcessXCFrameworkLibrary.swift
-  Specs/Tools/ProductPackaging.swift
-  Specs/Tools/RegisterExecutionPolicyException.swift
-  Specs/Tools/SetAttributes.swift
-  Specs/Tools/ShellScriptTool.swift
-  Specs/Tools/SignatureCollection.swift
-  Specs/Tools/StripTool.swift
-  Specs/Tools/SwiftABICheckerTool.swift
-  Specs/Tools/SwiftABIGenerationTool.swift
-  Specs/Tools/SwiftCompiler.swift
-  Specs/Tools/SwiftHeaderTool.swift
-  Specs/Tools/SwiftStdLibTool.swift
-  Specs/Tools/SwiftSymbolExtractor.swift
-  Specs/Tools/SymlinkTool.swift
-  Specs/Tools/TAPISymbolExtractor.swift
-  Specs/Tools/TAPITools.swift
-  Specs/Tools/TiffUtilTool.swift
-  Specs/Tools/TouchTool.swift
-  Specs/Tools/UnifdefTool.swift
-  Specs/Tools/ValidateDevelopmentAssets.swift
-  Specs/Tools/ValidateEmbeddedBinaryTool.swift
-  Specs/Tools/ValidateProductTool.swift
-  Specs/Tools/WriteFile.swift
+  SpecImplementations/ProductTypes.swift
+  SpecImplementations/PropertyDomainSpec.swift
+  SpecImplementations/RegisterSpecs.swift
+  SpecImplementations/SpecParser.swift
+  SpecImplementations/SpecRegistry.swift
+  SpecImplementations/Specs.swift
+  SpecImplementations/Tools/AppIntentsMetadataCompiler.swift
+  SpecImplementations/Tools/AppIntentsSSUTrainingCompiler.swift
+  SpecImplementations/Tools/AppShortcutStringsMetadataCompiler.swift
+  SpecImplementations/Tools/CCompiler.swift
+  SpecImplementations/Tools/ClangModuleVerifierInputGenerator.swift
+  SpecImplementations/Tools/ClangStatCache.swift
+  SpecImplementations/Tools/CodeSign.swift
+  SpecImplementations/Tools/ConcatenateTool.swift
+  SpecImplementations/Tools/ConstructStubExecutorFileListTool.swift
+  SpecImplementations/Tools/CopyTool.swift
+  SpecImplementations/Tools/CreateAssetPackManifestTool.swift
+  SpecImplementations/Tools/CreateBuildDirectory.swift
+  SpecImplementations/Tools/DocumentationCompiler.swift
+  SpecImplementations/Tools/DsymutilTool.swift
+  SpecImplementations/Tools/Gate.swift
+  SpecImplementations/Tools/GCCCompatibleCompilerSupport.swift
+  SpecImplementations/Tools/GenerateAppPlaygroundAssetCatalog.swift
+  SpecImplementations/Tools/InfoPlistTool.swift
+  SpecImplementations/Tools/LaunchServicesRegisterTool.swift
+  SpecImplementations/Tools/LinkerTools.swift
+  SpecImplementations/Tools/Lipo.swift
+  SpecImplementations/Tools/MasterObjectLink.swift
+  SpecImplementations/Tools/MergeInfoPlist.swift
+  SpecImplementations/Tools/MkdirTool.swift
+  SpecImplementations/Tools/ModulesVerifierTool.swift
+  SpecImplementations/Tools/PLUtilTool.swift
+  SpecImplementations/Tools/ProcessSDKImports.swift
+  SpecImplementations/Tools/ProcessXCFrameworkLibrary.swift
+  SpecImplementations/Tools/ProductPackaging.swift
+  SpecImplementations/Tools/RegisterExecutionPolicyException.swift
+  SpecImplementations/Tools/SetAttributes.swift
+  SpecImplementations/Tools/ShellScriptTool.swift
+  SpecImplementations/Tools/SignatureCollection.swift
+  SpecImplementations/Tools/StripTool.swift
+  SpecImplementations/Tools/SwiftABICheckerTool.swift
+  SpecImplementations/Tools/SwiftABIGenerationTool.swift
+  SpecImplementations/Tools/SwiftCompiler.swift
+  SpecImplementations/Tools/SwiftHeaderTool.swift
+  SpecImplementations/Tools/SwiftStdLibTool.swift
+  SpecImplementations/Tools/SwiftSymbolExtractor.swift
+  SpecImplementations/Tools/SymlinkTool.swift
+  SpecImplementations/Tools/TAPISymbolExtractor.swift
+  SpecImplementations/Tools/TAPITools.swift
+  SpecImplementations/Tools/TiffUtilTool.swift
+  SpecImplementations/Tools/TouchTool.swift
+  SpecImplementations/Tools/UnifdefTool.swift
+  SpecImplementations/Tools/ValidateDevelopmentAssets.swift
+  SpecImplementations/Tools/ValidateEmbeddedBinaryTool.swift
+  SpecImplementations/Tools/ValidateProductTool.swift
+  SpecImplementations/Tools/WriteFile.swift
   SWBFeatureFlag.swift
   TargetDependencyResolver.swift
   TargetPlatformDiagnostics.swift