Skip to content

Move many Apple platforms build rules under the darwin domain #973

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
owenv wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Move many Apple platforms build rules under the darwin domain #973

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion Sources/SWBApplePlatform/AppIntentsMetadataTaskProducer.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 []
}
Expand Down Expand Up @@ -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.
Expand Down
1 change: 1 addition & 0 deletions Sources/SWBApplePlatform/Specs/AppIntentsMetadata.xcspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@

(
{
_Domain = darwin;
Type = Compiler;
Identifier = "com.apple.compilers.appintentsmetadata";
Name = "App Intents Metadata Extractor";
Expand Down
1 change: 1 addition & 0 deletions Sources/SWBApplePlatform/Specs/AppIntentsNLTraining.xcspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@

(
{
_Domain = darwin;
Type = Compiler;
Identifier = "com.apple.compilers.appintents-ssu-training";
Name = "App Intents SSU Training Processor";
Expand Down
1 change: 1 addition & 0 deletions Sources/SWBApplePlatform/Specs/AppShortcutStringsMetadata.xcspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@

(
{
_Domain = darwin;
Type = Compiler;
Identifier = "com.apple.compilers.appshortcutstringsmetadata";
Name = "App Shortcut Strings Metadata Extractor";
Expand Down
1 change: 1 addition & 0 deletions Sources/SWBApplePlatform/Specs/AssetCatalogCompiler.xcspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@

(
{
_Domain = darwin;
Type = Compiler;
Identifier = com.apple.compilers.assetcatalog;
Name = "Asset Catalog Compiler";
Expand Down
1 change: 1 addition & 0 deletions Sources/SWBApplePlatform/Specs/CompileSkybox.xcspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@

(
{
_Domain = darwin;
Identifier = "com.apple.build-tasks.compile-skybox.xcplugin";
Type = Compiler;
Name = "Compile Skybox";
Expand Down
4 changes: 3 additions & 1 deletion Sources/SWBApplePlatform/Specs/CopyPNGFile.xcspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.";
Expand Down
4 changes: 3 additions & 1 deletion Sources/SWBApplePlatform/Specs/CopyTiffFile.xcspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
1 change: 1 addition & 0 deletions Sources/SWBApplePlatform/Specs/CoreData.xcspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)";
Expand Down
1 change: 1 addition & 0 deletions Sources/SWBApplePlatform/Specs/CoreML.xcspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@
UTI = "com.apple.coreml.mlpackage";
},
{
_Domain = darwin;
Type = Compiler;
Identifier = "com.apple.compilers.coreml";
Name = "CoreML Model Compiler";
Expand Down
1 change: 1 addition & 0 deletions Sources/SWBApplePlatform/Specs/EXUtil.xcspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@

(
{
_Domain = darwin;
Type = Compiler;
Identifier = "com.apple.compilers.extract-appextensionpoints";
Name = "ExtensionPoint Extractor";
Expand Down
1 change: 1 addition & 0 deletions Sources/SWBApplePlatform/Specs/EmbeddedBinaryValidationUtility.xcspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@

(
{
_Domain = darwin;
Type = Tool;
Identifier = "com.apple.tools.validate-embedded-binary-utility";
Name = "Embedded Binary Validation Utility";
Expand Down
1 change: 1 addition & 0 deletions Sources/SWBApplePlatform/Specs/GenerateAppPlaygroundAssetCatalog.xcspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@

(
{
_Domain = darwin;
Type = Tool;
Identifier = "com.apple.tools.generate-app-playground-asset-catalog";
Name = "App Playground Asset Catalog Generator";
Expand Down
1 change: 1 addition & 0 deletions Sources/SWBApplePlatform/Specs/GenerateTextureAtlas.xcspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@

(
{
_Domain = darwin;
Identifier = "com.apple.build-tasks.generate-texture-atlas.xcplugin";
Type = Compiler;
Name = "Generate SpriteKit Texture Atlas";
Expand Down
1 change: 1 addition & 0 deletions Sources/SWBApplePlatform/Specs/IBCompiler.xcspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@

(
{
_Domain = darwin;
Type = Compiler;
Identifier = "com.apple.xcode.tools.ibtool.compiler";
Name = "Interface Builder XIB Compiler";
Expand Down
1 change: 1 addition & 0 deletions Sources/SWBApplePlatform/Specs/IBPostprocessor.xcspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@

(
{
_Domain = darwin;
Type = Compiler;
Identifier = "com.apple.xcode.tools.ibtool.postprocessor";
Name = "Interface Builder NIB Postprocessor";
Expand Down
1 change: 1 addition & 0 deletions Sources/SWBApplePlatform/Specs/IBStoryboardCompiler.xcspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@

(
{
_Domain = darwin;
Type = Compiler;
Identifier = "com.apple.xcode.tools.ibtool.storyboard.compiler";
Name = "Interface Builder Storyboard Compiler";
Expand Down
1 change: 1 addition & 0 deletions Sources/SWBApplePlatform/Specs/IBStoryboardLinker.xcspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@

(
{
_Domain = darwin;
Type = Compiler;
Identifier = "com.apple.xcode.tools.ibtool.storyboard.linker";
Name = "Interface Builder Storyboard Linker";
Expand Down
1 change: 1 addition & 0 deletions Sources/SWBApplePlatform/Specs/IBStoryboardPostprocessor.xcspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@

(
{
_Domain = darwin;
Type = Compiler;
Identifier = "com.apple.xcode.tools.ibtool.storyboard.postprocessor";
Name = "Interface Builder Storyboard Postprocessor";
Expand Down
4 changes: 3 additions & 1 deletion Sources/SWBApplePlatform/Specs/Iconutil.xcspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,9 @@
//===----------------------------------------------------------------------===//

(
{ Identifier = com.apple.compilers.iconutil;
{
_Domain = darwin;
Identifier = com.apple.compilers.iconutil;
Type = Compiler;
Name = "Iconutil";
Description = "Icon conversion utility";
Expand Down
4 changes: 3 additions & 1 deletion Sources/SWBApplePlatform/Specs/Iig.xcspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.";
Expand Down
1 change: 1 addition & 0 deletions Sources/SWBApplePlatform/Specs/InstrumentsPackage.xcspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@
},

{
_Domain = darwin;
Type = Compiler;
Identifier = "com.apple.compilers.instruments-package-builder";
Name = "Instruments Package Builder";
Expand Down
1 change: 1 addition & 0 deletions Sources/SWBApplePlatform/Specs/Intents.xcspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
},

{
_Domain = darwin;
Type = Compiler;
Identifier = "com.apple.compilers.intents";
Name = "Intent Definition Compiler";
Expand Down
4 changes: 3 additions & 1 deletion Sources/SWBApplePlatform/Specs/LSRegisterURL.xcspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
1 change: 1 addition & 0 deletions Sources/SWBApplePlatform/Specs/MetalCompiler.xcspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@

(
{
_Domain = darwin;
Type = Compiler;
Identifier = "com.apple.compilers.metal";
Name = "Metal Compiler";
Expand Down
1 change: 1 addition & 0 deletions Sources/SWBApplePlatform/Specs/MetalLinker.xcspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@

(
{
_Domain = darwin;
Type = Compiler;
Identifier = "com.apple.compilers.metal-linker";
Name = "Metal Linker";
Expand Down
4 changes: 3 additions & 1 deletion Sources/SWBApplePlatform/Specs/MiG.xcspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,9 @@
//===----------------------------------------------------------------------===//

(
{ Type = Compiler;
{
_Domain = darwin;
Type = Compiler;
Identifier = com.apple.compilers.mig;
Name = "MiG";
Description = "Mach Interface Stub Generator";
Expand Down
1 change: 1 addition & 0 deletions Sources/SWBApplePlatform/Specs/OSACompile.xcspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@

(
{
_Domain = darwin;
Identifier = "com.apple.compilers.osacompile";
Type = Compiler;
Name = "OSACompile";
Expand Down
1 change: 1 addition & 0 deletions Sources/SWBApplePlatform/Specs/RealityAssets.xcspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@

(
{
_Domain = darwin;
Identifier = "com.apple.build-tasks.compile-rk-assets.xcplugin";
Type = Compiler;
Name = "Compile Reality Assets";
Expand Down
1 change: 1 addition & 0 deletions Sources/SWBApplePlatform/Specs/ReferenceObject.xcspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
UTI = "com.apple.arkit.referenceobject";
},
{
_Domain = darwin;
Type = Compiler;
Identifier = "com.apple.compilers.referenceobject";
Name = "Reference Object Compiler";
Expand Down
4 changes: 3 additions & 1 deletion Sources/SWBApplePlatform/Specs/ResMerger.xcspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
4 changes: 3 additions & 1 deletion Sources/SWBApplePlatform/Specs/Rez.xcspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
3 changes: 3 additions & 0 deletions Sources/SWBApplePlatform/Specs/SceneKitTools.xcspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@

(
{
_Domain = darwin;
Identifier = "com.apple.compilers.scntool";
Type = Compiler;
Name = "Process SceneKit Document";
Expand Down Expand Up @@ -73,6 +74,7 @@
);
},
{
_Domain = darwin;
Identifier = "com.apple.build-tasks.copy-scenekit-assets";
Type = Compiler;
Name = "Copy SceneKit Assets";
Expand Down Expand Up @@ -138,6 +140,7 @@
},

{
_Domain = darwin;
Identifier = "com.apple.build-tasks.compile-scenekit-shadercache";
Type = Compiler;
Name = "Compile SceneKit Shaders";
Expand Down
4 changes: 3 additions & 1 deletion Sources/SWBApplePlatform/Specs/TiffUtil.xcspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
1 change: 1 addition & 0 deletions Sources/SWBApplePlatform/Specs/XCAppExtensionPoints.xcspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@

(
{
_Domain = darwin;
Identifier = com.apple.compilers.process-xcappextensionpoints;
Type = Compiler;
Name = "Process XCAppExtensionPoints";
Expand Down
1 change: 1 addition & 0 deletions Sources/SWBApplePlatform/Specs/XCStrings.xcspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
},

{
_Domain = darwin;
Type = Compiler;
Identifier = "com.apple.compilers.xcstrings";
Name = "XCStrings Compiler";
Expand Down
2 changes: 1 addition & 1 deletion Sources/SWBApplePlatform/Specs/tvOSShared.xcspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
2 changes: 1 addition & 1 deletion Sources/SWBApplePlatform/Specs/watchOSShared.xcspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
2 changes: 1 addition & 1 deletion Sources/SWBApplePlatform/Specs/xrOSShared.xcspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
Loading
Loading