Skip to content

Commit 2a5bc4d

Browse files
compnerdcompnerd
authored
Merge pull request #2645 from compnerd/the-great-restructuring
partially restructure the source tree
2 parents 5e0b63d + 3ea08fe commit 2a5bc4d

File tree

365 files changed

+1177
-1119
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

365 files changed

+1177
-1119
lines changed

‎CMakeLists.txt

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,14 @@ enable_testing()
1717
# Cache the variable to allow the user to alter the configuration.
1818
set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>DLL" CACHE
1919
STRING "MSVC Runtime Library")
20+
2021
if(CMAKE_VERSION VERSION_LESS 3.16.0)
2122
if(NOT (CMAKE_SYSTEM_NAME STREQUAL Windows OR CMAKE_SYSTEM_NAME STREQUAL Darwin))
2223
set(CMAKE_SHARED_LIBRARY_RUNTIME_Swift_FLAG "-Xlinker -rpath -Xlinker ")
2324
set(CMAKE_SHARED_LIBRARY_RUNTIME_Swift_FLAG_SEP ":")
2425
endif()
26+
# Workaround for CMake 3.15 which doesn't link libraries properly on Windows
27+
set(CMAKE_LINK_LIBRARY_FLAG "-l")
2528
endif()
2629

2730
option(BUILD_SHARED_LIBS "build shared libraries" ON)
@@ -44,12 +47,10 @@ target_include_directories(CoreFoundation PRIVATE
4447
${CMAKE_CURRENT_SOURCE_DIR}
4548
${CMAKE_CURRENT_BINARY_DIR}/CoreFoundation.framework/Headers)
4649

47-
add_subdirectory(uuid)
48-
add_subdirectory(Foundation)
49-
add_subdirectory(Tools)
50+
add_subdirectory(Sources)
5051
if(ENABLE_TESTING)
5152
find_package(XCTest CONFIG REQUIRED)
52-
add_subdirectory(TestFoundation)
53+
add_subdirectory(Tests)
5354
endif()
5455

5556
if(NOT BUILD_SHARED_LIBS)

‎Foundation.xcodeproj/project.pbxproj

Lines changed: 624 additions & 468 deletions
Large diffs are not rendered by default.

‎Foundation.xcodeproj/xcshareddata/xcschemes/CFXMLInterface.xcscheme

Lines changed: 67 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,67 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<Scheme
3+
LastUpgradeVersion = "1130"
4+
version = "1.3">
5+
<BuildAction
6+
parallelizeBuildables = "YES"
7+
buildImplicitDependencies = "YES">
8+
<BuildActionEntries>
9+
<BuildActionEntry
10+
buildForTesting = "YES"
11+
buildForRunning = "YES"
12+
buildForProfiling = "YES"
13+
buildForArchiving = "YES"
14+
buildForAnalyzing = "YES">
15+
<BuildableReference
16+
BuildableIdentifier = "primary"
17+
BlueprintIdentifier = "15500FA722EA24D10088F082"
18+
BuildableName = "libCFXMLInterface.a"
19+
BlueprintName = "CFXMLInterface"
20+
ReferencedContainer = "container:Foundation.xcodeproj">
21+
</BuildableReference>
22+
</BuildActionEntry>
23+
</BuildActionEntries>
24+
</BuildAction>
25+
<TestAction
26+
buildConfiguration = "Debug"
27+
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
28+
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
29+
shouldUseLaunchSchemeArgsEnv = "YES">
30+
<Testables>
31+
</Testables>
32+
</TestAction>
33+
<LaunchAction
34+
buildConfiguration = "Debug"
35+
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
36+
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
37+
launchStyle = "0"
38+
useCustomWorkingDirectory = "NO"
39+
ignoresPersistentStateOnLaunch = "NO"
40+
debugDocumentVersioning = "YES"
41+
debugServiceExtension = "internal"
42+
allowLocationSimulation = "YES">
43+
</LaunchAction>
44+
<ProfileAction
45+
buildConfiguration = "Release"
46+
shouldUseLaunchSchemeArgsEnv = "YES"
47+
savedToolIdentifier = ""
48+
useCustomWorkingDirectory = "NO"
49+
debugDocumentVersioning = "YES">
50+
<MacroExpansion>
51+
<BuildableReference
52+
BuildableIdentifier = "primary"
53+
BlueprintIdentifier = "15500FA722EA24D10088F082"
54+
BuildableName = "libCFXMLInterface.a"
55+
BlueprintName = "CFXMLInterface"
56+
ReferencedContainer = "container:Foundation.xcodeproj">
57+
</BuildableReference>
58+
</MacroExpansion>
59+
</ProfileAction>
60+
<AnalyzeAction
61+
buildConfiguration = "Debug">
62+
</AnalyzeAction>
63+
<ArchiveAction
64+
buildConfiguration = "Release"
65+
revealArchiveInOrganizer = "YES">
66+
</ArchiveAction>
67+
</Scheme>

‎Tools/GenerateTestFixtures/GenerateTestFixtures.xcodeproj/xcshareddata/xcschemes/GenerateTestFixtures.xcscheme renamed to ‎Foundation.xcodeproj/xcshareddata/xcschemes/GenerateTestFixtures.xcscheme

Lines changed: 7 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1020"
3+
LastUpgradeVersion = "1130"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -14,10 +14,10 @@
1414
buildForAnalyzing = "YES">
1515
<BuildableReference
1616
BuildableIdentifier = "primary"
17-
BlueprintIdentifier = "155D3BB022401A2900B0D38E"
17+
BlueprintIdentifier = "F023077723F0BBF10023DBEC"
1818
BuildableName = "GenerateTestFixtures"
1919
BlueprintName = "GenerateTestFixtures"
20-
ReferencedContainer = "container:GenerateTestFixtures.xcodeproj">
20+
ReferencedContainer = "container:Foundation.xcodeproj">
2121
</BuildableReference>
2222
</BuildActionEntry>
2323
</BuildActionEntries>
@@ -27,15 +27,6 @@
2727
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
2828
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
2929
shouldUseLaunchSchemeArgsEnv = "YES">
30-
<MacroExpansion>
31-
<BuildableReference
32-
BuildableIdentifier = "primary"
33-
BlueprintIdentifier = "155D3BB022401A2900B0D38E"
34-
BuildableName = "GenerateTestFixtures"
35-
BlueprintName = "GenerateTestFixtures"
36-
ReferencedContainer = "container:GenerateTestFixtures.xcodeproj">
37-
</BuildableReference>
38-
</MacroExpansion>
3930
<Testables>
4031
</Testables>
4132
</TestAction>
@@ -53,10 +44,10 @@
5344
runnableDebuggingMode = "0">
5445
<BuildableReference
5546
BuildableIdentifier = "primary"
56-
BlueprintIdentifier = "155D3BB022401A2900B0D38E"
47+
BlueprintIdentifier = "F023077723F0BBF10023DBEC"
5748
BuildableName = "GenerateTestFixtures"
5849
BlueprintName = "GenerateTestFixtures"
59-
ReferencedContainer = "container:GenerateTestFixtures.xcodeproj">
50+
ReferencedContainer = "container:Foundation.xcodeproj">
6051
</BuildableReference>
6152
</BuildableProductRunnable>
6253
</LaunchAction>
@@ -70,10 +61,10 @@
7061
runnableDebuggingMode = "0">
7162
<BuildableReference
7263
BuildableIdentifier = "primary"
73-
BlueprintIdentifier = "155D3BB022401A2900B0D38E"
64+
BlueprintIdentifier = "F023077723F0BBF10023DBEC"
7465
BuildableName = "GenerateTestFixtures"
7566
BlueprintName = "GenerateTestFixtures"
76-
ReferencedContainer = "container:GenerateTestFixtures.xcodeproj">
67+
ReferencedContainer = "container:Foundation.xcodeproj">
7768
</BuildableReference>
7869
</BuildableProductRunnable>
7970
</ProfileAction>

‎Foundation.xcodeproj/xcshareddata/xcschemes/SwiftFoundationXML.xcscheme

Lines changed: 67 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,67 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<Scheme
3+
LastUpgradeVersion = "1130"
4+
version = "1.3">
5+
<BuildAction
6+
parallelizeBuildables = "YES"
7+
buildImplicitDependencies = "YES">
8+
<BuildActionEntries>
9+
<BuildActionEntry
10+
buildForTesting = "YES"
11+
buildForRunning = "YES"
12+
buildForProfiling = "YES"
13+
buildForArchiving = "YES"
14+
buildForAnalyzing = "YES">
15+
<BuildableReference
16+
BuildableIdentifier = "primary"
17+
BlueprintIdentifier = "1550106E22EA266B0088F082"
18+
BuildableName = "SwiftFoundationXML.framework"
19+
BlueprintName = "SwiftFoundationXML"
20+
ReferencedContainer = "container:Foundation.xcodeproj">
21+
</BuildableReference>
22+
</BuildActionEntry>
23+
</BuildActionEntries>
24+
</BuildAction>
25+
<TestAction
26+
buildConfiguration = "Debug"
27+
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
28+
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
29+
shouldUseLaunchSchemeArgsEnv = "YES">
30+
<Testables>
31+
</Testables>
32+
</TestAction>
33+
<LaunchAction
34+
buildConfiguration = "Debug"
35+
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
36+
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
37+
launchStyle = "0"
38+
useCustomWorkingDirectory = "NO"
39+
ignoresPersistentStateOnLaunch = "NO"
40+
debugDocumentVersioning = "YES"
41+
debugServiceExtension = "internal"
42+
allowLocationSimulation = "YES">
43+
</LaunchAction>
44+
<ProfileAction
45+
buildConfiguration = "Release"
46+
shouldUseLaunchSchemeArgsEnv = "YES"
47+
savedToolIdentifier = ""
48+
useCustomWorkingDirectory = "NO"
49+
debugDocumentVersioning = "YES">
50+
<MacroExpansion>
51+
<BuildableReference
52+
BuildableIdentifier = "primary"
53+
BlueprintIdentifier = "1550106E22EA266B0088F082"
54+
BuildableName = "SwiftFoundationXML.framework"
55+
BlueprintName = "SwiftFoundationXML"
56+
ReferencedContainer = "container:Foundation.xcodeproj">
57+
</BuildableReference>
58+
</MacroExpansion>
59+
</ProfileAction>
60+
<AnalyzeAction
61+
buildConfiguration = "Debug">
62+
</AnalyzeAction>
63+
<ArchiveAction
64+
buildConfiguration = "Release"
65+
revealArchiveInOrganizer = "YES">
66+
</ArchiveAction>
67+
</Scheme>

‎Foundation.xcodeproj/xcshareddata/xcschemes/xdgTestHelper.xcscheme

Lines changed: 78 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,78 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<Scheme
3+
LastUpgradeVersion = "1130"
4+
version = "1.3">
5+
<BuildAction
6+
parallelizeBuildables = "YES"
7+
buildImplicitDependencies = "YES">
8+
<BuildActionEntries>
9+
<BuildActionEntry
10+
buildForTesting = "YES"
11+
buildForRunning = "YES"
12+
buildForProfiling = "YES"
13+
buildForArchiving = "YES"
14+
buildForAnalyzing = "YES">
15+
<BuildableReference
16+
BuildableIdentifier = "primary"
17+
BlueprintIdentifier = "9F0DD33E1ECD734200F68030"
18+
BuildableName = "xdgTestHelper.app"
19+
BlueprintName = "xdgTestHelper"
20+
ReferencedContainer = "container:Foundation.xcodeproj">
21+
</BuildableReference>
22+
</BuildActionEntry>
23+
</BuildActionEntries>
24+
</BuildAction>
25+
<TestAction
26+
buildConfiguration = "Debug"
27+
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
28+
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
29+
shouldUseLaunchSchemeArgsEnv = "YES">
30+
<Testables>
31+
</Testables>
32+
</TestAction>
33+
<LaunchAction
34+
buildConfiguration = "Debug"
35+
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
36+
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
37+
launchStyle = "0"
38+
useCustomWorkingDirectory = "NO"
39+
ignoresPersistentStateOnLaunch = "NO"
40+
debugDocumentVersioning = "YES"
41+
debugServiceExtension = "internal"
42+
allowLocationSimulation = "YES">
43+
<BuildableProductRunnable
44+
runnableDebuggingMode = "0">
45+
<BuildableReference
46+
BuildableIdentifier = "primary"
47+
BlueprintIdentifier = "9F0DD33E1ECD734200F68030"
48+
BuildableName = "xdgTestHelper.app"
49+
BlueprintName = "xdgTestHelper"
50+
ReferencedContainer = "container:Foundation.xcodeproj">
51+
</BuildableReference>
52+
</BuildableProductRunnable>
53+
</LaunchAction>
54+
<ProfileAction
55+
buildConfiguration = "Release"
56+
shouldUseLaunchSchemeArgsEnv = "YES"
57+
savedToolIdentifier = ""
58+
useCustomWorkingDirectory = "NO"
59+
debugDocumentVersioning = "YES">
60+
<BuildableProductRunnable
61+
runnableDebuggingMode = "0">
62+
<BuildableReference
63+
BuildableIdentifier = "primary"
64+
BlueprintIdentifier = "9F0DD33E1ECD734200F68030"
65+
BuildableName = "xdgTestHelper.app"
66+
BlueprintName = "xdgTestHelper"
67+
ReferencedContainer = "container:Foundation.xcodeproj">
68+
</BuildableReference>
69+
</BuildableProductRunnable>
70+
</ProfileAction>
71+
<AnalyzeAction
72+
buildConfiguration = "Debug">
73+
</AnalyzeAction>
74+
<ArchiveAction
75+
buildConfiguration = "Release"
76+
revealArchiveInOrganizer = "YES">
77+
</ArchiveAction>
78+
</Scheme>

‎closure/Block.h renamed to ‎Sources/BlocksRuntime/Block.h

File renamed without changes.

‎closure/Block_private.h renamed to ‎Sources/BlocksRuntime/Block_private.h

File renamed without changes.

‎closure/data.c renamed to ‎Sources/BlocksRuntime/data.c

File renamed without changes.

‎closure/runtime.c renamed to ‎Sources/BlocksRuntime/runtime.c

File renamed without changes.

‎Sources/CMakeLists.txt

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
add_subdirectory(UUID)
2+
add_subdirectory(Foundation)
3+
add_subdirectory(FoundationNetworking)
4+
add_subdirectory(FoundationXML)
5+
add_subdirectory(Tools)

‎Foundation/AffineTransform.swift renamed to ‎Sources/Foundation/AffineTransform.swift

File renamed without changes.

‎Foundation/Array.swift renamed to ‎Sources/Foundation/Array.swift

File renamed without changes.

‎Foundation/Boxing.swift renamed to ‎Sources/Foundation/Boxing.swift

File renamed without changes.

‎Foundation/Bridging.swift renamed to ‎Sources/Foundation/Bridging.swift

File renamed without changes.

‎Foundation/Bundle.swift renamed to ‎Sources/Foundation/Bundle.swift

File renamed without changes.

‎Foundation/ByteCountFormatter.swift renamed to ‎Sources/Foundation/ByteCountFormatter.swift

File renamed without changes.

‎Foundation/CGFloat.swift renamed to ‎Sources/Foundation/CGFloat.swift

File renamed without changes.

0 commit comments

Comments
 (0)