Skip to content

Commit 7f66acc

Browse files
jcmoscjcmosc
committed
Move Compute.xcodeproj to Xcode subdirectory
1 parent 0bc1c83 commit 7f66acc

8 files changed

Lines changed: 67 additions & 52 deletions

File tree

‎Scripts/Xcode/process_headers_inputs.xcfilelist‎

Lines changed: 0 additions & 25 deletions
This file was deleted.

Compute.xcodeproj/project.pbxproj renamed to Xcode/Compute.xcodeproj/project.pbxproj

Lines changed: 42 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -18,34 +18,39 @@
1818
/* End PBXFileReference section */
1919

2020
/* Begin PBXFileSystemSynchronizedRootGroup section */
21+
1AB344D32FD1EDDE009243EA /* Configs */ = {
22+
isa = PBXFileSystemSynchronizedRootGroup;
23+
path = Configs;
24+
sourceTree = "<group>";
25+
};
2126
1AEE2D3B2F16D0BF009CBD65 /* Platform */ = {
2227
isa = PBXFileSystemSynchronizedRootGroup;
2328
name = Platform;
24-
path = Sources/Platform;
29+
path = ../Sources/Platform;
2530
sourceTree = "<group>";
2631
};
2732
1AEE2DA62F16D158009CBD65 /* Utilities */ = {
2833
isa = PBXFileSystemSynchronizedRootGroup;
2934
name = Utilities;
30-
path = Sources/Utilities;
35+
path = ../Sources/Utilities;
3136
sourceTree = "<group>";
3237
};
3338
1AEE2E362F16D1DB009CBD65 /* ComputeCxx */ = {
3439
isa = PBXFileSystemSynchronizedRootGroup;
3540
name = ComputeCxx;
36-
path = Sources/ComputeCxx;
41+
path = ../Sources/ComputeCxx;
3742
sourceTree = "<group>";
3843
};
3944
1AEE2EA82F16D2CC009CBD65 /* ComputeCxxSwiftSupport */ = {
4045
isa = PBXFileSystemSynchronizedRootGroup;
4146
name = ComputeCxxSwiftSupport;
42-
path = Sources/ComputeCxxSwiftSupport;
47+
path = ../Sources/ComputeCxxSwiftSupport;
4348
sourceTree = "<group>";
4449
};
4550
1AEE2ED32F16D309009CBD65 /* Compute */ = {
4651
isa = PBXFileSystemSynchronizedRootGroup;
4752
name = Compute;
48-
path = Sources/Compute;
53+
path = ../Sources/Compute;
4954
sourceTree = "<group>";
5055
};
5156
/* End PBXFileSystemSynchronizedRootGroup section */
@@ -66,6 +71,7 @@
6671
1AD6DB7D2F16A95B00D4C5D6 = {
6772
isa = PBXGroup;
6873
children = (
74+
1AB344D32FD1EDDE009243EA /* Configs */,
6975
1AEE2D3B2F16D0BF009CBD65 /* Platform */,
7076
1AEE2DA62F16D158009CBD65 /* Utilities */,
7177
1AEE2E362F16D1DB009CBD65 /* ComputeCxx */,
@@ -121,6 +127,7 @@
121127
dependencies = (
122128
);
123129
fileSystemSynchronizedGroups = (
130+
1AB344D32FD1EDDE009243EA /* Configs */,
124131
1AEE2D3B2F16D0BF009CBD65 /* Platform */,
125132
1AEE2DA62F16D158009CBD65 /* Utilities */,
126133
1AEE2E362F16D1DB009CBD65 /* ComputeCxx */,
@@ -185,20 +192,20 @@
185192
files = (
186193
);
187194
inputFileListPaths = (
188-
"$(SRCROOT)/Scripts/Xcode/process_headers_inputs.xcfilelist",
195+
"$(SRCROOT)/Scripts/process_headers_inputs.xcfilelist",
189196
);
190197
inputPaths = (
191-
"$(SRCROOT)/Scripts/Xcode/process_headers.sh",
198+
"$(SRCROOT)/Scripts/process_headers.sh",
192199
);
193200
name = "Process Headers";
194201
outputFileListPaths = (
195-
"$(SRCROOT)/Scripts/Xcode/process_headers_outputs.xcfilelist",
202+
"$(SRCROOT)/Scripts/process_headers_outputs.xcfilelist",
196203
);
197204
outputPaths = (
198205
);
199206
runOnlyForDeploymentPostprocessing = 0;
200207
shellPath = /bin/sh;
201-
shellScript = "# Type a script or drag a script file from your workspace to insert its path.\nScripts/Xcode/process_headers.sh\n";
208+
shellScript = "# Type a script or drag a script file from your workspace to insert its path.\nScripts/process_headers.sh\n";
202209
};
203210
/* End PBXShellScriptBuildPhase section */
204211

@@ -215,18 +222,24 @@
215222
/* Begin XCBuildConfiguration section */
216223
1AD6DB822F16A95B00D4C5D6 /* Debug */ = {
217224
isa = XCBuildConfiguration;
225+
baseConfigurationReferenceAnchor = 1AB344D32FD1EDDE009243EA /* Configs */;
226+
baseConfigurationReferenceRelativePath = Shared.xcconfig;
218227
buildSettings = {
219228
};
220229
name = Debug;
221230
};
222231
1AD6DB832F16A95B00D4C5D6 /* Release */ = {
223232
isa = XCBuildConfiguration;
233+
baseConfigurationReferenceAnchor = 1AB344D32FD1EDDE009243EA /* Configs */;
234+
baseConfigurationReferenceRelativePath = Shared.xcconfig;
224235
buildSettings = {
225236
};
226237
name = Release;
227238
};
228239
1AD6DB8E2F16AA0D00D4C5D6 /* Debug */ = {
229240
isa = XCBuildConfiguration;
241+
baseConfigurationReferenceAnchor = 1AB344D32FD1EDDE009243EA /* Configs */;
242+
baseConfigurationReferenceRelativePath = Compute.xcconfig;
230243
buildSettings = {
231244
ALLOW_TARGET_PLATFORM_SPECIALIZATION = YES;
232245
ALWAYS_SEARCH_USER_PATHS = NO;
@@ -287,9 +300,9 @@
287300
GCC_WARN_UNUSED_VARIABLE = YES;
288301
GENERATE_INFOPLIST_FILE = YES;
289302
HEADER_SEARCH_PATHS = (
290-
Sources/Platform/include,
291-
Sources/Utilities/include,
292-
Sources/ComputeCxx/include,
303+
../Sources/Platform/include,
304+
../Sources/Utilities/include,
305+
../Sources/ComputeCxx/include,
293306
);
294307
INFOPLIST_KEY_NSHumanReadableCopyright = "";
295308
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
@@ -320,21 +333,21 @@
320333
SWIFT_ACTIVE_COMPILATION_CONDITIONS = "DEBUG $(inherited)";
321334
SWIFT_APPROACHABLE_CONCURRENCY = YES;
322335
SWIFT_EMIT_LOC_STRINGS = YES;
323-
SWIFT_INCLUDE_PATHS = Sources/ComputeCxx/include;
336+
SWIFT_INCLUDE_PATHS = ../Sources/ComputeCxx/include;
324337
SWIFT_INSTALL_MODULE = YES;
325338
SWIFT_INSTALL_OBJC_HEADER = NO;
326339
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
327340
SWIFT_UPCOMING_FEATURE_MEMBER_IMPORT_VISIBILITY = YES;
328341
SWIFT_VERSION = 6.0;
329342
SYSTEM_HEADER_SEARCH_PATHS = (
330-
"Submodules/swift-runtime-headers/include",
331-
"Submodules/swift-runtime-headers/stdlib/include",
332-
"Submodules/swift-runtime-headers/stdlib/public/SwiftShims",
343+
"../Submodules/swift-runtime-headers/include",
344+
"../Submodules/swift-runtime-headers/stdlib/include",
345+
"../Submodules/swift-runtime-headers/stdlib/public/SwiftShims",
333346
);
334347
TARGETED_DEVICE_FAMILY = "1,2,7";
335348
USER_HEADER_SEARCH_PATHS = (
336-
Sources/ComputeCxx,
337-
Sources/ComputeCxx/internalInclude,
349+
../Sources/ComputeCxx,
350+
../Sources/ComputeCxx/internalInclude,
338351
);
339352
USE_HEADERMAP = NO;
340353
VERSIONING_SYSTEM = "apple-generic";
@@ -345,6 +358,8 @@
345358
};
346359
1AD6DB8F2F16AA0D00D4C5D6 /* Release */ = {
347360
isa = XCBuildConfiguration;
361+
baseConfigurationReferenceAnchor = 1AB344D32FD1EDDE009243EA /* Configs */;
362+
baseConfigurationReferenceRelativePath = Compute.xcconfig;
348363
buildSettings = {
349364
ALLOW_TARGET_PLATFORM_SPECIALIZATION = YES;
350365
ALWAYS_SEARCH_USER_PATHS = NO;
@@ -399,9 +414,9 @@
399414
GCC_WARN_UNUSED_VARIABLE = YES;
400415
GENERATE_INFOPLIST_FILE = YES;
401416
HEADER_SEARCH_PATHS = (
402-
Sources/Platform/include,
403-
Sources/Utilities/include,
404-
Sources/ComputeCxx/include,
417+
../Sources/Platform/include,
418+
../Sources/Utilities/include,
419+
../Sources/ComputeCxx/include,
405420
);
406421
INFOPLIST_KEY_NSHumanReadableCopyright = "";
407422
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
@@ -431,20 +446,20 @@
431446
SWIFT_APPROACHABLE_CONCURRENCY = YES;
432447
SWIFT_COMPILATION_MODE = wholemodule;
433448
SWIFT_EMIT_LOC_STRINGS = YES;
434-
SWIFT_INCLUDE_PATHS = Sources/ComputeCxx/include;
449+
SWIFT_INCLUDE_PATHS = ../Sources/ComputeCxx/include;
435450
SWIFT_INSTALL_MODULE = YES;
436451
SWIFT_INSTALL_OBJC_HEADER = NO;
437452
SWIFT_UPCOMING_FEATURE_MEMBER_IMPORT_VISIBILITY = YES;
438453
SWIFT_VERSION = 6.0;
439454
SYSTEM_HEADER_SEARCH_PATHS = (
440-
"Submodules/swift-runtime-headers/include",
441-
"Submodules/swift-runtime-headers/stdlib/include",
442-
"Submodules/swift-runtime-headers/stdlib/public/SwiftShims",
455+
"../Submodules/swift-runtime-headers/include",
456+
"../Submodules/swift-runtime-headers/stdlib/include",
457+
"../Submodules/swift-runtime-headers/stdlib/public/SwiftShims",
443458
);
444459
TARGETED_DEVICE_FAMILY = "1,2,7";
445460
USER_HEADER_SEARCH_PATHS = (
446-
Sources/ComputeCxx,
447-
Sources/ComputeCxx/internalInclude,
461+
../Sources/ComputeCxx,
462+
../Sources/ComputeCxx/internalInclude,
448463
);
449464
USE_HEADERMAP = NO;
450465
VERSIONING_SYSTEM = "apple-generic";

Compute.xcodeproj/project.xcworkspace/contents.xcworkspacedata renamed to Xcode/Compute.xcodeproj/project.xcworkspace/contents.xcworkspacedata

File renamed without changes.

‎Xcode/Configs/Compute.xcconfig‎

Whitespace-only changes.

‎Xcode/Configs/Shared.xcconfig‎

Whitespace-only changes.

Scripts/Xcode/process_headers.sh renamed to Xcode/Scripts/process_headers.sh

File renamed without changes.

‎Xcode/Scripts/process_headers_inputs.xcfilelist‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
$(SRCROOT)/../Sources/ComputeCxx/include/ComputeCxx/AGAttribute.h
2+
$(SRCROOT)/../Sources/ComputeCxx/include/ComputeCxx/AGAttributeInfo.h
3+
$(SRCROOT)/../Sources/ComputeCxx/include/ComputeCxx/AGAttributeType.h
4+
$(SRCROOT)/../Sources/ComputeCxx/include/ComputeCxx/AGBase.h
5+
$(SRCROOT)/../Sources/ComputeCxx/include/ComputeCxx/AGCachedValueOptions.h
6+
$(SRCROOT)/../Sources/ComputeCxx/include/ComputeCxx/AGChangedValue.h
7+
$(SRCROOT)/../Sources/ComputeCxx/include/ComputeCxx/AGClosure.h
8+
$(SRCROOT)/../Sources/ComputeCxx/include/ComputeCxx/AGComparison.h
9+
$(SRCROOT)/../Sources/ComputeCxx/include/ComputeCxx/AGDescription.h
10+
$(SRCROOT)/../Sources/ComputeCxx/include/ComputeCxx/AGGraph.h
11+
$(SRCROOT)/../Sources/ComputeCxx/include/ComputeCxx/AGGraphCounterQueryType.h
12+
$(SRCROOT)/../Sources/ComputeCxx/include/ComputeCxx/AGGraphTracing.h
13+
$(SRCROOT)/../Sources/ComputeCxx/include/ComputeCxx/AGInputOptions.h
14+
$(SRCROOT)/../Sources/ComputeCxx/include/ComputeCxx/AGSearchOptions.h
15+
$(SRCROOT)/../Sources/ComputeCxx/include/ComputeCxx/AGSubgraph.h
16+
$(SRCROOT)/../Sources/ComputeCxx/include/ComputeCxx/AGTargetConditionals.h
17+
$(SRCROOT)/../Sources/ComputeCxx/include/ComputeCxx/AGTraceType.h
18+
$(SRCROOT)/../Sources/ComputeCxx/include/ComputeCxx/AGTreeElement.h
19+
$(SRCROOT)/../Sources/ComputeCxx/include/ComputeCxx/AGTreeValue.h
20+
$(SRCROOT)/../Sources/ComputeCxx/include/ComputeCxx/AGTuple.h
21+
$(SRCROOT)/../Sources/ComputeCxx/include/ComputeCxx/AGType.h
22+
$(SRCROOT)/../Sources/ComputeCxx/include/ComputeCxx/AGUniqueID.h
23+
$(SRCROOT)/../Sources/ComputeCxx/include/ComputeCxx/AGValue.h
24+
$(SRCROOT)/../Sources/ComputeCxx/include/ComputeCxx/AGWeakAttribute.h
25+
$(SRCROOT)/../Sources/ComputeCxx/include/ComputeCxx/ComputeCxx.h

Scripts/Xcode/process_headers_outputs.xcfilelist renamed to Xcode/Scripts/process_headers_outputs.xcfilelist

File renamed without changes.

0 commit comments

Comments
 (0)