Move many Apple platforms build rules under the darwin domain

owenv · owenv · commit 88c9134bcd0b · 2025-12-10T15:49:13.000-08:00
diff --git a/Sources/SWBApplePlatform/AppIntentsMetadataTaskProducer.swift b/Sources/SWBApplePlatform/AppIntentsMetadataTaskProducer.swift
@@ -49,6 +49,9 @@ final class AppIntentsMetadataTaskProducer: PhasedTaskProducer, TaskProducer {
 
     func generateTasks() async -> [any PlannedTask] {
         let tasks: [any PlannedTask] = []
+        guard let compilerSpec = self.context.appShortcutStringsMetadataCompilerSpec else {
+            return []
+        }
         guard !context.settings.globalScope.evaluate(BuiltinMacros.LM_SKIP_METADATA_EXTRACTION) else {
             return []
         }
@@ -151,7 +154,7 @@ final class AppIntentsMetadataTaskProducer: PhasedTaskProducer, TaskProducer {
                 let inputs = appShortcutStringsSources + assistantIntentsStringsSources
                 if inputs.count > 0, appShortcutStringsSources.count < 2, assistantIntentsStringsSources.count < 2 {
                     let appShortcutsMetadataCbc = CommandBuildContext(producer: self.context, scope: scope, inputs: inputs, resourcesDir: buildFilesProcessingContext.resourcesDir)
-                    await self.context.appShortcutStringsMetadataCompilerSpec.constructTasks(appShortcutsMetadataCbc, delegate)
+                    await compilerSpec.constructTasks(appShortcutsMetadataCbc, delegate)
                 }
 
                 // Only construct SSU task by default for public SDK clients. Internal default behavior should skip SSU task construction.
diff --git a/Sources/SWBApplePlatform/Specs/AppIntentsMetadata.xcspec b/Sources/SWBApplePlatform/Specs/AppIntentsMetadata.xcspec
@@ -12,6 +12,7 @@
 
 (
     {
+        _Domain = darwin;
         Type = Compiler;
         Identifier = "com.apple.compilers.appintentsmetadata";
         Name = "App Intents Metadata Extractor";
diff --git a/Sources/SWBApplePlatform/Specs/AppIntentsNLTraining.xcspec b/Sources/SWBApplePlatform/Specs/AppIntentsNLTraining.xcspec
@@ -12,6 +12,7 @@
 
 (
     {
+        _Domain = darwin;
         Type = Compiler;
         Identifier = "com.apple.compilers.appintents-ssu-training";
         Name = "App Intents SSU Training Processor";
diff --git a/Sources/SWBApplePlatform/Specs/AppShortcutStringsMetadata.xcspec b/Sources/SWBApplePlatform/Specs/AppShortcutStringsMetadata.xcspec
@@ -12,6 +12,7 @@
 
 (
     {
+        _Domain = darwin;
         Type = Compiler;
         Identifier = "com.apple.compilers.appshortcutstringsmetadata";
         Name = "App Shortcut Strings Metadata Extractor";
diff --git a/Sources/SWBApplePlatform/Specs/AssetCatalogCompiler.xcspec b/Sources/SWBApplePlatform/Specs/AssetCatalogCompiler.xcspec
@@ -12,6 +12,7 @@
 
 (
     {
+        _Domain = darwin;
         Type = Compiler;
         Identifier = com.apple.compilers.assetcatalog;
         Name = "Asset Catalog Compiler";
diff --git a/Sources/SWBApplePlatform/Specs/CompileSkybox.xcspec b/Sources/SWBApplePlatform/Specs/CompileSkybox.xcspec
@@ -12,6 +12,7 @@
 
 (
     {
+        _Domain = darwin;
         Identifier = "com.apple.build-tasks.compile-skybox.xcplugin";
         Type = Compiler;
         Name = "Compile Skybox";
diff --git a/Sources/SWBApplePlatform/Specs/CopyPNGFile.xcspec b/Sources/SWBApplePlatform/Specs/CopyPNGFile.xcspec
@@ -12,7 +12,9 @@
 
 (
 
-    {   Type = Compiler;
+    {
+        _Domain = darwin;
+        Type = Compiler;
         Identifier = com.apple.build-tasks.copy-png-file;
         Name = "Compress PNG Files";
         Description = "Copies a .png file resource, optionally compressing it.";
diff --git a/Sources/SWBApplePlatform/Specs/CopyTiffFile.xcspec b/Sources/SWBApplePlatform/Specs/CopyTiffFile.xcspec
@@ -11,7 +11,9 @@
 //===----------------------------------------------------------------------===//
 
 (
-    {   Identifier = com.apple.build-tasks.copy-tiff-file;
+    {
+        _Domain = darwin;
+        Identifier = com.apple.build-tasks.copy-tiff-file;
         Type = Compiler;
         Name = "Copy Tiff File";
         Description = "Copies a .tiff file resource with optional compression of the destination file";
diff --git a/Sources/SWBApplePlatform/Specs/CoreData.xcspec b/Sources/SWBApplePlatform/Specs/CoreData.xcspec
@@ -89,6 +89,7 @@
         UTI = "com.apple.xcode.model.class";
     },
     {
+        _Domain = darwin;
         Type = Compiler;
         Identifier = "com.apple.compilers.model.coredata";
         Name = "Data Model Compiler (MOMC)";
diff --git a/Sources/SWBApplePlatform/Specs/CoreML.xcspec b/Sources/SWBApplePlatform/Specs/CoreML.xcspec
@@ -41,6 +41,7 @@
         UTI = "com.apple.coreml.mlpackage";
     },
     {
+        _Domain = darwin;
         Type = Compiler;
         Identifier = "com.apple.compilers.coreml";
         Name = "CoreML Model Compiler";
diff --git a/Sources/SWBApplePlatform/Specs/EXUtil.xcspec b/Sources/SWBApplePlatform/Specs/EXUtil.xcspec
@@ -12,6 +12,7 @@
 
 (
     {
+        _Domain = darwin;
         Type = Compiler;
         Identifier = "com.apple.compilers.extract-appextensionpoints";
         Name = "ExtensionPoint Extractor";
diff --git a/Sources/SWBApplePlatform/Specs/EmbeddedBinaryValidationUtility.xcspec b/Sources/SWBApplePlatform/Specs/EmbeddedBinaryValidationUtility.xcspec
@@ -12,6 +12,7 @@
 
 (
     {
+        _Domain = darwin;
         Type = Tool;
         Identifier = "com.apple.tools.validate-embedded-binary-utility";
         Name = "Embedded Binary Validation Utility";
diff --git a/Sources/SWBApplePlatform/Specs/GenerateAppPlaygroundAssetCatalog.xcspec b/Sources/SWBApplePlatform/Specs/GenerateAppPlaygroundAssetCatalog.xcspec
@@ -12,6 +12,7 @@
 
 (
     {
+        _Domain = darwin;
         Type = Tool;
         Identifier = "com.apple.tools.generate-app-playground-asset-catalog";
         Name = "App Playground Asset Catalog Generator";
diff --git a/Sources/SWBApplePlatform/Specs/GenerateTextureAtlas.xcspec b/Sources/SWBApplePlatform/Specs/GenerateTextureAtlas.xcspec
@@ -12,6 +12,7 @@
 
 (
     {
+        _Domain = darwin;
         Identifier = "com.apple.build-tasks.generate-texture-atlas.xcplugin";
         Type = Compiler;
         Name = "Generate SpriteKit Texture Atlas";
diff --git a/Sources/SWBApplePlatform/Specs/IBCompiler.xcspec b/Sources/SWBApplePlatform/Specs/IBCompiler.xcspec
@@ -12,6 +12,7 @@
 
 (
     {
+        _Domain = darwin;
         Type = Compiler;
         Identifier = "com.apple.xcode.tools.ibtool.compiler";
         Name = "Interface Builder XIB Compiler";
diff --git a/Sources/SWBApplePlatform/Specs/IBPostprocessor.xcspec b/Sources/SWBApplePlatform/Specs/IBPostprocessor.xcspec
@@ -12,6 +12,7 @@
 
 (
     {
+        _Domain = darwin;
         Type = Compiler;
         Identifier = "com.apple.xcode.tools.ibtool.postprocessor";
         Name = "Interface Builder NIB Postprocessor";
diff --git a/Sources/SWBApplePlatform/Specs/IBStoryboardCompiler.xcspec b/Sources/SWBApplePlatform/Specs/IBStoryboardCompiler.xcspec
@@ -12,6 +12,7 @@
 
 (
     {
+        _Domain = darwin;
         Type = Compiler;
         Identifier = "com.apple.xcode.tools.ibtool.storyboard.compiler";
         Name = "Interface Builder Storyboard Compiler";
diff --git a/Sources/SWBApplePlatform/Specs/IBStoryboardLinker.xcspec b/Sources/SWBApplePlatform/Specs/IBStoryboardLinker.xcspec
@@ -12,6 +12,7 @@
 
 (
     {
+        _Domain = darwin;
         Type = Compiler;
         Identifier = "com.apple.xcode.tools.ibtool.storyboard.linker";
         Name = "Interface Builder Storyboard Linker";
diff --git a/Sources/SWBApplePlatform/Specs/IBStoryboardPostprocessor.xcspec b/Sources/SWBApplePlatform/Specs/IBStoryboardPostprocessor.xcspec
@@ -12,6 +12,7 @@
 
 (
     {
+        _Domain = darwin;
         Type = Compiler;
         Identifier = "com.apple.xcode.tools.ibtool.storyboard.postprocessor";
         Name = "Interface Builder Storyboard Postprocessor";
diff --git a/Sources/SWBApplePlatform/Specs/Iconutil.xcspec b/Sources/SWBApplePlatform/Specs/Iconutil.xcspec
@@ -11,7 +11,9 @@
 //===----------------------------------------------------------------------===//
 
 (
-    {   Identifier = com.apple.compilers.iconutil;
+    {
+        _Domain = darwin;
+        Identifier = com.apple.compilers.iconutil;
         Type = Compiler;
         Name = "Iconutil";
         Description = "Icon conversion utility";
diff --git a/Sources/SWBApplePlatform/Specs/Iig.xcspec b/Sources/SWBApplePlatform/Specs/Iig.xcspec
@@ -11,7 +11,9 @@
 //===----------------------------------------------------------------------===//
 
 (
-    {   Identifier = com.apple.compilers.iig;
+    {
+        _Domain = darwin;
+        Identifier = com.apple.compilers.iig;
         Type = Compiler;
         Name = "IOKit Interface Generator";
         Description = "Invoke the 'iig' command line utility to compile an IIG file.";
diff --git a/Sources/SWBApplePlatform/Specs/InstrumentsPackage.xcspec b/Sources/SWBApplePlatform/Specs/InstrumentsPackage.xcspec
@@ -75,6 +75,7 @@
     },
 
     {
+        _Domain = darwin;
         Type = Compiler;
         Identifier = "com.apple.compilers.instruments-package-builder";
         Name = "Instruments Package Builder";
diff --git a/Sources/SWBApplePlatform/Specs/Intents.xcspec b/Sources/SWBApplePlatform/Specs/Intents.xcspec
@@ -27,6 +27,7 @@
     },
 
     {
+        _Domain = darwin;
         Type = Compiler;
         Identifier = "com.apple.compilers.intents";
         Name = "Intent Definition Compiler";
diff --git a/Sources/SWBApplePlatform/Specs/LSRegisterURL.xcspec b/Sources/SWBApplePlatform/Specs/LSRegisterURL.xcspec
@@ -11,7 +11,9 @@
 //===----------------------------------------------------------------------===//
 
 (
-    {   Identifier = com.apple.build-tasks.ls-register-url;
+    {
+        _Domain = darwin;
+        Identifier = com.apple.build-tasks.ls-register-url;
         Type = Compiler;
         Name = "LSRegisterURL";
         Description = "Registers the file at a URL with LaunchServices";
diff --git a/Sources/SWBApplePlatform/Specs/MetalCompiler.xcspec b/Sources/SWBApplePlatform/Specs/MetalCompiler.xcspec
@@ -12,6 +12,7 @@
 
 (
     {
+        _Domain = darwin;
         Type = Compiler;
         Identifier = "com.apple.compilers.metal";
         Name = "Metal Compiler";
diff --git a/Sources/SWBApplePlatform/Specs/MetalLinker.xcspec b/Sources/SWBApplePlatform/Specs/MetalLinker.xcspec
@@ -12,6 +12,7 @@
 
 (
     {
+        _Domain = darwin;
         Type = Compiler;
         Identifier = "com.apple.compilers.metal-linker";
         Name = "Metal Linker";
diff --git a/Sources/SWBApplePlatform/Specs/MiG.xcspec b/Sources/SWBApplePlatform/Specs/MiG.xcspec
@@ -11,7 +11,9 @@
 //===----------------------------------------------------------------------===//
 
 (
-    {   Type = Compiler;
+    {
+        _Domain = darwin;
+        Type = Compiler;
         Identifier = com.apple.compilers.mig;
         Name = "MiG";
         Description = "Mach Interface Stub Generator";
diff --git a/Sources/SWBApplePlatform/Specs/OSACompile.xcspec b/Sources/SWBApplePlatform/Specs/OSACompile.xcspec
@@ -12,6 +12,7 @@
 
 (
     {
+        _Domain = darwin;
         Identifier = "com.apple.compilers.osacompile";
         Type = Compiler;
         Name = "OSACompile";
diff --git a/Sources/SWBApplePlatform/Specs/RealityAssets.xcspec b/Sources/SWBApplePlatform/Specs/RealityAssets.xcspec
@@ -12,6 +12,7 @@
 
 (
     {
+        _Domain = darwin;
         Identifier = "com.apple.build-tasks.compile-rk-assets.xcplugin";
         Type = Compiler;
         Name = "Compile Reality Assets";
diff --git a/Sources/SWBApplePlatform/Specs/ReferenceObject.xcspec b/Sources/SWBApplePlatform/Specs/ReferenceObject.xcspec
@@ -25,6 +25,7 @@
         UTI = "com.apple.arkit.referenceobject";
     },
     {
+        _Domain = darwin;
         Type = Compiler;
         Identifier = "com.apple.compilers.referenceobject";
         Name = "Reference Object Compiler";
diff --git a/Sources/SWBApplePlatform/Specs/ResMerger.xcspec b/Sources/SWBApplePlatform/Specs/ResMerger.xcspec
@@ -11,7 +11,9 @@
 //===----------------------------------------------------------------------===//
 
 (
-    {   Type = Linker;
+    {
+        _Domain = darwin;
+        Type = Linker;
         Identifier = com.apple.pbx.linkers.resmerger;
         Name = "ResMerger";
         Description = "Create a Carbon resource file using Apple's Carbon Resource Merger";
diff --git a/Sources/SWBApplePlatform/Specs/Rez.xcspec b/Sources/SWBApplePlatform/Specs/Rez.xcspec
@@ -11,7 +11,9 @@
 //===----------------------------------------------------------------------===//
 
 (
-    {   Identifier = com.apple.compilers.rez;
+    {
+        _Domain = darwin;
+        Identifier = com.apple.compilers.rez;
         Type = Tool;
         Name = "Rez";
         Description = "Resource Manager Resource Compiler";
diff --git a/Sources/SWBApplePlatform/Specs/SceneKitTools.xcspec b/Sources/SWBApplePlatform/Specs/SceneKitTools.xcspec
@@ -12,6 +12,7 @@
 
 (
     {
+        _Domain = darwin;
         Identifier = "com.apple.compilers.scntool";
         Type = Compiler;
         Name = "Process SceneKit Document";
@@ -73,6 +74,7 @@
         );
     },
     {
+        _Domain = darwin;
         Identifier = "com.apple.build-tasks.copy-scenekit-assets";
         Type = Compiler;
         Name = "Copy SceneKit Assets";
@@ -138,6 +140,7 @@
     },
 
     {
+        _Domain = darwin;
         Identifier = "com.apple.build-tasks.compile-scenekit-shadercache";
         Type = Compiler;
         Name = "Compile SceneKit Shaders";
diff --git a/Sources/SWBApplePlatform/Specs/TiffUtil.xcspec b/Sources/SWBApplePlatform/Specs/TiffUtil.xcspec
@@ -11,7 +11,9 @@
 //===----------------------------------------------------------------------===//
 
 (
-    {   Identifier = com.apple.compilers.tiffutil;
+    {
+        _Domain = darwin;
+        Identifier = com.apple.compilers.tiffutil;
         Type = Compiler;
         Name = "TiffUtil";
         Description = "Combine a set of images at different resolutions into one HiDPI compliant file using TiffUtil";
diff --git a/Sources/SWBApplePlatform/Specs/XCAppExtensionPoints.xcspec b/Sources/SWBApplePlatform/Specs/XCAppExtensionPoints.xcspec
@@ -12,6 +12,7 @@
 
 (
     {
+        _Domain = darwin;
         Identifier = com.apple.compilers.process-xcappextensionpoints;
         Type = Compiler;
         Name = "Process XCAppExtensionPoints";
diff --git a/Sources/SWBApplePlatform/Specs/XCStrings.xcspec b/Sources/SWBApplePlatform/Specs/XCStrings.xcspec
@@ -26,6 +26,7 @@
     },
 
     {
+        _Domain = darwin;
         Type = Compiler;
         Identifier = "com.apple.compilers.xcstrings";
         Name = "XCStrings Compiler";
diff --git a/Sources/SWBApplePlatform/Specs/tvOSShared.xcspec b/Sources/SWBApplePlatform/Specs/tvOSShared.xcspec
@@ -36,7 +36,7 @@
         _Domain = appletvos-shared;
         Type = Compiler;
         Identifier = "com.apple.compilers.assetcatalog";
-        BasedOn = "default:com.apple.compilers.assetcatalog";
+        BasedOn = "darwin:com.apple.compilers.assetcatalog";
         Options = (
             {
                 Name = "ASSETCATALOG_COMPILER_LEADERBOARD_IDENTIFIER_PREFIX";
diff --git a/Sources/SWBApplePlatform/Specs/watchOSShared.xcspec b/Sources/SWBApplePlatform/Specs/watchOSShared.xcspec
@@ -122,7 +122,7 @@
         _Domain = watchos-shared;
         Type = Compiler;
         Identifier = "com.apple.compilers.assetcatalog";
-        BasedOn = "default:com.apple.compilers.assetcatalog";
+        BasedOn = "darwin:com.apple.compilers.assetcatalog";
         Options = (
             {
                 Name = "ASSETCATALOG_COMPILER_COMPLICATION_NAME";
diff --git a/Sources/SWBApplePlatform/Specs/xrOSShared.xcspec b/Sources/SWBApplePlatform/Specs/xrOSShared.xcspec
@@ -15,7 +15,7 @@
         _Domain = xros-shared;
         Type = Compiler;
         Identifier = "com.apple.compilers.assetcatalog";
-        BasedOn = "default:com.apple.compilers.assetcatalog";
+        BasedOn = "darwin:com.apple.compilers.assetcatalog";
         Options = (
             {
                 Name = "ASSETCATALOG_COMPILER_FLATTENED_APP_ICON_PATH";
diff --git a/Sources/SWBCore/Settings/Settings.swift b/Sources/SWBCore/Settings/Settings.swift
diff --git a/Sources/SWBCore/TaskGeneration.swift b/Sources/SWBCore/TaskGeneration.swift
diff --git a/Sources/SWBTaskConstruction/TaskProducers/BuildPhaseTaskProducers/CopyFilesTaskProducer.swift b/Sources/SWBTaskConstruction/TaskProducers/BuildPhaseTaskProducers/CopyFilesTaskProducer.swift
diff --git a/Sources/SWBTaskConstruction/TaskProducers/OtherTaskProducers/ProductPostprocessingTaskProducer.swift b/Sources/SWBTaskConstruction/TaskProducers/OtherTaskProducers/ProductPostprocessingTaskProducer.swift
diff --git a/Sources/SWBTaskConstruction/TaskProducers/TaskProducer.swift b/Sources/SWBTaskConstruction/TaskProducers/TaskProducer.swift
diff --git a/Sources/SWBTestSupport/CommandLineToolSpecDiscoveredInfo.swift b/Sources/SWBTestSupport/CommandLineToolSpecDiscoveredInfo.swift
diff --git a/Sources/SWBTestSupport/DummyCommandProducer.swift b/Sources/SWBTestSupport/DummyCommandProducer.swift
diff --git a/Tests/SWBApplePlatformTests/AppleCommandLineToolSpecDiscoveredInfoTests.swift b/Tests/SWBApplePlatformTests/AppleCommandLineToolSpecDiscoveredInfoTests.swift
diff --git a/Tests/SWBCoreTests/SpecLoadingTests.swift b/Tests/SWBCoreTests/SpecLoadingTests.swift

Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,7 @@`
`12`	`12`
`13`	`13`	`(`
`14`	`14`	`{`
	`15`	`+ _Domain = darwin;`
`15`	`16`	`Type = Compiler;`
`16`	`17`	`Identifier = "com.apple.compilers.appintentsmetadata";`
`17`	`18`	`Name = "App Intents Metadata Extractor";`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,9 @@`
`12`	`12`
`13`	`13`	`(`
`14`	`14`
`15`		`- { Type = Compiler;`
	`15`	`+ {`
	`16`	`+ _Domain = darwin;`
	`17`	`+ Type = Compiler;`
`16`	`18`	`Identifier = com.apple.build-tasks.copy-png-file;`
`17`	`19`	`Name = "Compress PNG Files";`
`18`	`20`	`Description = "Copies a .png file resource, optionally compressing it.";`
Original file line number	Diff line number	Diff line change
`@@ -89,6 +89,7 @@`
`89`	`89`	`UTI = "com.apple.xcode.model.class";`
`90`	`90`	`},`
`91`	`91`	`{`
	`92`	`+ _Domain = darwin;`
`92`	`93`	`Type = Compiler;`
`93`	`94`	`Identifier = "com.apple.compilers.model.coredata";`
`94`	`95`	`Name = "Data Model Compiler (MOMC)";`
Original file line number	Diff line number	Diff line change
`@@ -41,6 +41,7 @@`
`41`	`41`	`UTI = "com.apple.coreml.mlpackage";`
`42`	`42`	`},`
`43`	`43`	`{`
	`44`	`+ _Domain = darwin;`
`44`	`45`	`Type = Compiler;`
`45`	`46`	`Identifier = "com.apple.compilers.coreml";`
`46`	`47`	`Name = "CoreML Model Compiler";`