Skip to content

Commit 8d43f8e

Browse files
committed
Ensure individual spec files don't mix different domains
1 parent f4a8141 commit 8d43f8e

File tree

10 files changed

+208
-200
lines changed

10 files changed

+208
-200
lines changed
Lines changed: 204 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,204 @@
1+
//===----------------------------------------------------------------------===//
2+
//
3+
// This source file is part of the Swift open source project
4+
//
5+
// Copyright (c) 2025 Apple Inc. and the Swift project authors
6+
// Licensed under Apache License v2.0 with Runtime Library Exception
7+
//
8+
// See http://swift.org/LICENSE.txt for license information
9+
// See http://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
10+
//
11+
//===----------------------------------------------------------------------===//
12+
13+
(
14+
{
15+
Type = FileType;
16+
Identifier = "file.referenceobject";
17+
BasedOn = sourcecode;
18+
Name = "ARKit Reference Object";
19+
Extensions = (
20+
referenceobject,
21+
);
22+
AppliesToBuildRules = YES;
23+
IncludeInIndex = YES;
24+
CanSetIncludeInIndex = YES;
25+
UTI = "com.apple.arkit.referenceobject";
26+
},
27+
{
28+
Type = FileType;
29+
Identifier = "text.json.xcstrings";
30+
BasedOn = text.json;
31+
Name = "XCStrings files";
32+
UTI = "com.apple.xcode.xcstrings";
33+
Extensions = (
34+
xcstrings,
35+
);
36+
AppliesToBuildRules = YES;
37+
IncludeInIndex = YES;
38+
CanSetIncludeInIndex = YES;
39+
},
40+
{
41+
AppliesToBuildRules = YES;
42+
CanSetIncludeInIndex = YES;
43+
Extensions = (
44+
rkassets,
45+
);
46+
Identifier = "folder.rkassets";
47+
IncludeInIndex = YES;
48+
IsFolder = YES;
49+
IsTextFile = NO;
50+
IsWrapperFolder = YES;
51+
Name = "Reality Assets";
52+
Type = FileType;
53+
UTI = "com.apple.rkassets";
54+
},
55+
{
56+
Type = FileType;
57+
Identifier = "com.apple.instruments.package-definition";
58+
BasedOn = text.xml;
59+
Name = "Instruments Package Definition";
60+
Extensions = (instrpkg);
61+
AppliesToBuildRules = Yes;
62+
UTI = "com.apple.instruments.package-definition";
63+
},
64+
{
65+
Type = FileType;
66+
Identifier = "com.apple.instruments.instrdst";
67+
BasedOn = wrapper;
68+
Name = "Instruments Distribution Package";
69+
Extensions = (instrdst);
70+
UTI = "com.apple.instruments.instrdst";
71+
},
72+
{
73+
Type = FileType;
74+
Identifier = "file.intentdefinition";
75+
BasedOn = sourcecode;
76+
Name = "SiriKit Intent Definition";
77+
Extensions = (
78+
intentdefinition,
79+
);
80+
AppliesToBuildRules = YES;
81+
IncludeInIndex = YES;
82+
CanSetIncludeInIndex = YES;
83+
UTI = "com.apple.sirikit.intentdefinition";
84+
"FallbackAutoroutingBuildPhase" = Resources;
85+
},
86+
{
87+
Name = "XCAppExtensionPoints";
88+
Type = FileType;
89+
Identifier = text.plist.xcappextensionpoints;
90+
BasedOn = text.plist;
91+
Extensions = (
92+
xcappextensionpoints
93+
);
94+
IsTransparent = NO;
95+
AppliesToBuildRules = YES;
96+
UTI = "com.apple.dt.xcappextensionpoints";
97+
},
98+
{
99+
Type = FileType;
100+
Identifier = "file.mlmodel";
101+
BasedOn = sourcecode;
102+
Name = "CoreML Machine Learning Model";
103+
Extensions = (
104+
mlmodel,
105+
mlkitmodel,
106+
);
107+
AppliesToBuildRules = YES;
108+
IncludeInIndex = YES;
109+
CanSetIncludeInIndex = YES;
110+
UTI = "com.apple.coreml.model";
111+
},
112+
{
113+
Type = FileType;
114+
Identifier = "folder.mlpackage";
115+
BasedOn = wrapper;
116+
Name = "CoreML Machine Learning Model Package";
117+
Extensions = (
118+
mlpackage,
119+
);
120+
IsWrapperFolder = YES;
121+
IsFolder = YES;
122+
AppliesToBuildRules = YES;
123+
IncludeInIndex = YES;
124+
CanSetIncludeInIndex = YES;
125+
UTI = "com.apple.coreml.mlpackage";
126+
},
127+
// XDesign file types
128+
{
129+
Identifier = wrapper.xcdatamodel;
130+
Type = FileType;
131+
// Has to base on 'sourcecode' so that when we are adding data model file to a target,
132+
// it gets dropped into the source code bucket to be compiled later.
133+
BasedOn = sourcecode;
134+
Name = "Data model files";
135+
Extensions = (xcdatamodel);
136+
AppliesToBuildRules = yes;
137+
138+
// from wrapper
139+
IsWrapperFolder = YES;
140+
IsFolder = NO;
141+
IncludeInIndex = YES;
142+
CanSetIncludeInIndex = YES;
143+
144+
// Don't set encoding
145+
IsTextFile = NO;
146+
147+
UTI = "com.apple.xcode.model.data";
148+
},
149+
150+
{
151+
Identifier = wrapper.xcdatamodeld;
152+
Type = FileType;
153+
// Has to base on 'sourcecode' so that when we are adding data model file to a target,
154+
// it gets dropped into the source code bucket to be compiled later.
155+
BasedOn = sourcecode;
156+
Name = "Data model version files";
157+
Extensions = (xcdatamodeld);
158+
AppliesToBuildRules = yes;
159+
160+
// from wrapper
161+
IsWrapperFolder = YES;
162+
IsFolder = YES;
163+
IncludeInIndex = YES;
164+
CanSetIncludeInIndex = YES;
165+
166+
// Don't set encoding
167+
IsTextFile = NO;
168+
169+
UTI = "com.apple.xcode.model.data-version";
170+
},
171+
172+
{
173+
Identifier = wrapper.xcmappingmodel;
174+
Type = FileType;
175+
// Has to base on 'sourcecode' so that when we are adding data model file to a target,
176+
// it gets dropped into the source code bucket to be compiled later.
177+
BasedOn = sourcecode;
178+
Name = "Mapping model files";
179+
Extensions = (xcmappingmodel);
180+
AppliesToBuildRules = yes;
181+
182+
// from wrapper
183+
IsWrapperFolder = YES;
184+
IsFolder = NO;
185+
IncludeInIndex = YES;
186+
CanSetIncludeInIndex = YES;
187+
188+
// Don't set encoding
189+
IsTextFile = NO;
190+
191+
UTI = "com.apple.xcode.model.data-mapping";
192+
},
193+
194+
{
195+
Identifier = wrapper.xcclassmodel;
196+
Type = FileType;
197+
BasedOn = wrapper;
198+
Name = "Class model files";
199+
Extensions = (xcclassmodel);
200+
IsTransparent = NO;
201+
AppliesToBuildRules = yes;
202+
UTI = "com.apple.xcode.model.class";
203+
},
204+
)

Sources/SWBApplePlatform/Specs/CoreData.xcspec

Lines changed: 1 addition & 77 deletions
Original file line numberDiff line numberDiff line change
@@ -11,83 +11,6 @@
1111
//===----------------------------------------------------------------------===//
1212

1313
(
14-
// XDesign file types
15-
{
16-
Identifier = wrapper.xcdatamodel;
17-
Type = FileType;
18-
// Has to base on 'sourcecode' so that when we are adding data model file to a target,
19-
// it gets dropped into the source code bucket to be compiled later.
20-
BasedOn = sourcecode;
21-
Name = "Data model files";
22-
Extensions = (xcdatamodel);
23-
AppliesToBuildRules = yes;
24-
25-
// from wrapper
26-
IsWrapperFolder = YES;
27-
IsFolder = NO;
28-
IncludeInIndex = YES;
29-
CanSetIncludeInIndex = YES;
30-
31-
// Don't set encoding
32-
IsTextFile = NO;
33-
34-
UTI = "com.apple.xcode.model.data";
35-
},
36-
37-
{
38-
Identifier = wrapper.xcdatamodeld;
39-
Type = FileType;
40-
// Has to base on 'sourcecode' so that when we are adding data model file to a target,
41-
// it gets dropped into the source code bucket to be compiled later.
42-
BasedOn = sourcecode;
43-
Name = "Data model version files";
44-
Extensions = (xcdatamodeld);
45-
AppliesToBuildRules = yes;
46-
47-
// from wrapper
48-
IsWrapperFolder = YES;
49-
IsFolder = YES;
50-
IncludeInIndex = YES;
51-
CanSetIncludeInIndex = YES;
52-
53-
// Don't set encoding
54-
IsTextFile = NO;
55-
56-
UTI = "com.apple.xcode.model.data-version";
57-
},
58-
59-
{
60-
Identifier = wrapper.xcmappingmodel;
61-
Type = FileType;
62-
// Has to base on 'sourcecode' so that when we are adding data model file to a target,
63-
// it gets dropped into the source code bucket to be compiled later.
64-
BasedOn = sourcecode;
65-
Name = "Mapping model files";
66-
Extensions = (xcmappingmodel);
67-
AppliesToBuildRules = yes;
68-
69-
// from wrapper
70-
IsWrapperFolder = YES;
71-
IsFolder = NO;
72-
IncludeInIndex = YES;
73-
CanSetIncludeInIndex = YES;
74-
75-
// Don't set encoding
76-
IsTextFile = NO;
77-
78-
UTI = "com.apple.xcode.model.data-mapping";
79-
},
80-
81-
{
82-
Identifier = wrapper.xcclassmodel;
83-
Type = FileType;
84-
BasedOn = wrapper;
85-
Name = "Class model files";
86-
Extensions = (xcclassmodel);
87-
IsTransparent = NO;
88-
AppliesToBuildRules = yes;
89-
UTI = "com.apple.xcode.model.class";
90-
},
9114
{
9215
_Domain = darwin;
9316
Type = Compiler;
@@ -201,6 +124,7 @@
201124
);
202125
},
203126
{
127+
_Domain = darwin;
204128
Type = Compiler;
205129
Identifier = "com.apple.compilers.model.coredatamapping";
206130
Name = "Core Data Mapping Model Compiler (MAPC)";

Sources/SWBApplePlatform/Specs/CoreML.xcspec

Lines changed: 0 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -11,35 +11,6 @@
1111
//===----------------------------------------------------------------------===//
1212

1313
(
14-
{
15-
Type = FileType;
16-
Identifier = "file.mlmodel";
17-
BasedOn = sourcecode;
18-
Name = "CoreML Machine Learning Model";
19-
Extensions = (
20-
mlmodel,
21-
mlkitmodel,
22-
);
23-
AppliesToBuildRules = YES;
24-
IncludeInIndex = YES;
25-
CanSetIncludeInIndex = YES;
26-
UTI = "com.apple.coreml.model";
27-
},
28-
{
29-
Type = FileType;
30-
Identifier = "folder.mlpackage";
31-
BasedOn = wrapper;
32-
Name = "CoreML Machine Learning Model Package";
33-
Extensions = (
34-
mlpackage,
35-
);
36-
IsWrapperFolder = YES;
37-
IsFolder = YES;
38-
AppliesToBuildRules = YES;
39-
IncludeInIndex = YES;
40-
CanSetIncludeInIndex = YES;
41-
UTI = "com.apple.coreml.mlpackage";
42-
},
4314
{
4415
_Domain = darwin;
4516
Type = Compiler;

Sources/SWBApplePlatform/Specs/EXUtil.xcspec

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
},
3030

3131
{
32+
_Domain = darwin;
3233
Type = Compiler;
3334
Identifier = "com.apple.compilers.appextension-plist-generator";
3435
Name = "AppExtension plist generator";

Sources/SWBApplePlatform/Specs/InstrumentsPackage.xcspec

Lines changed: 2 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -11,27 +11,8 @@
1111
//===----------------------------------------------------------------------===//
1212

1313
(
14-
15-
{
16-
Type = FileType;
17-
Identifier = "com.apple.instruments.package-definition";
18-
BasedOn = text.xml;
19-
Name = "Instruments Package Definition";
20-
Extensions = (instrpkg);
21-
AppliesToBuildRules = Yes;
22-
UTI = "com.apple.instruments.package-definition";
23-
},
24-
25-
{
26-
Type = FileType;
27-
Identifier = "com.apple.instruments.instrdst";
28-
BasedOn = wrapper;
29-
Name = "Instruments Distribution Package";
30-
Extensions = (instrdst);
31-
UTI = "com.apple.instruments.instrdst";
32-
},
33-
3414
{
15+
_Domain = darwin;
3516
Type = ProductType;
3617
Identifier = "com.apple.product-type.instruments-package";
3718
Name = "Instruments Package";
@@ -56,8 +37,8 @@
5637

5738
HasInfoPlist = NO;
5839
},
59-
6040
{
41+
_Domain = darwin;
6142
Type = PackageType;
6243
Identifier = com.apple.package-type.instruments-package;
6344
Name = "Instruments Package";
@@ -73,7 +54,6 @@
7354
IsLaunchable = NO;
7455
};
7556
},
76-
7757
{
7858
_Domain = darwin;
7959
Type = Compiler;
@@ -158,5 +138,4 @@
158138
},
159139
);
160140
},
161-
162141
)

0 commit comments

Comments
 (0)