Skip to content

partially restructure the source tree #2645

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

Merged
merged 13 commits into from
Feb 16, 2020
Merged

partially restructure the source tree #2645

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
c394979
TestFoundation: testable import `Foundation` in `TestProgressFraction`
compnerd Feb 9, 2020
2834951
Restructure TestFoundation directory
compnerd Feb 9, 2020
4f0afbc
Restructure `uuid` to `Sources/UUID`
compnerd Feb 9, 2020
2b2691b
restructure `closure` into `Sources/BlocksRuntime`
compnerd Feb 9, 2020
6db5769
Restructure `FoundationXML` into `Sources/FoundationXML`
compnerd Feb 9, 2020
24cb3bb
Restructure `FoundationNetworking` into `Sources/FoundationNetworking`
compnerd Feb 9, 2020
a8c8508
Restructure `Foundation` into `Sources/Foundation`
compnerd Feb 9, 2020
fb6a7f6
Restructure `plutil` into `Sources/Tools/plutil`
compnerd Feb 9, 2020
079107c
Restructure `GenerateTestFixtures` into `Tests/Tools/GenerateTestFixt…
compnerd Feb 9, 2020
05670c6
xcode: update xcode projects
compnerd Feb 9, 2020
5ac0829
build: update to some more modern behaviours
compnerd Feb 10, 2020
2c2f51d
build: follow the Swift semantics for linking
compnerd Feb 10, 2020
3ea08fe
build: add workaround for CMake
compnerd Feb 15, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
9 changes: 5 additions & 4 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,14 @@ enable_testing()
# Cache the variable to allow the user to alter the configuration.
set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>DLL" CACHE
STRING "MSVC Runtime Library")

if(CMAKE_VERSION VERSION_LESS 3.16.0)
if(NOT (CMAKE_SYSTEM_NAME STREQUAL Windows OR CMAKE_SYSTEM_NAME STREQUAL Darwin))
set(CMAKE_SHARED_LIBRARY_RUNTIME_Swift_FLAG "-Xlinker -rpath -Xlinker ")
set(CMAKE_SHARED_LIBRARY_RUNTIME_Swift_FLAG_SEP ":")
endif()
# Workaround for CMake 3.15 which doesn't link libraries properly on Windows
set(CMAKE_LINK_LIBRARY_FLAG "-l")
endif()

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

add_subdirectory(uuid)
add_subdirectory(Foundation)
add_subdirectory(Tools)
add_subdirectory(Sources)
if(ENABLE_TESTING)
find_package(XCTest CONFIG REQUIRED)
add_subdirectory(TestFoundation)
add_subdirectory(Tests)
endif()

if(NOT BUILD_SHARED_LIBS)
Expand Down
1,092 changes: 624 additions & 468 deletions Foundation.xcodeproj/project.pbxproj
View file
Open in desktop

Large diffs are not rendered by default.

67 changes: 67 additions & 0 deletions Foundation.xcodeproj/xcshareddata/xcschemes/CFXMLInterface.xcscheme
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,67 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1130"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
buildImplicitDependencies = "YES">
<BuildActionEntries>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "YES"
buildForArchiving = "YES"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "15500FA722EA24D10088F082"
BuildableName = "libCFXMLInterface.a"
BlueprintName = "CFXMLInterface"
ReferencedContainer = "container:Foundation.xcodeproj">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>
</BuildAction>
<TestAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES">
<Testables>
</Testables>
</TestAction>
<LaunchAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
launchStyle = "0"
useCustomWorkingDirectory = "NO"
ignoresPersistentStateOnLaunch = "NO"
debugDocumentVersioning = "YES"
debugServiceExtension = "internal"
allowLocationSimulation = "YES">
</LaunchAction>
<ProfileAction
buildConfiguration = "Release"
shouldUseLaunchSchemeArgsEnv = "YES"
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
debugDocumentVersioning = "YES">
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "15500FA722EA24D10088F082"
BuildableName = "libCFXMLInterface.a"
BlueprintName = "CFXMLInterface"
ReferencedContainer = "container:Foundation.xcodeproj">
</BuildableReference>
</MacroExpansion>
</ProfileAction>
<AnalyzeAction
buildConfiguration = "Debug">
</AnalyzeAction>
<ArchiveAction
buildConfiguration = "Release"
revealArchiveInOrganizer = "YES">
</ArchiveAction>
</Scheme>
23 changes: 7 additions & 16 deletions ...a/xcschemes/GenerateTestFixtures.xcscheme → ...a/xcschemes/GenerateTestFixtures.xcscheme
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1020"
LastUpgradeVersion = "1130"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand All @@ -14,10 +14,10 @@
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "155D3BB022401A2900B0D38E"
BlueprintIdentifier = "F023077723F0BBF10023DBEC"
BuildableName = "GenerateTestFixtures"
BlueprintName = "GenerateTestFixtures"
ReferencedContainer = "container:GenerateTestFixtures.xcodeproj">
ReferencedContainer = "container:Foundation.xcodeproj">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>
Expand All @@ -27,15 +27,6 @@
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES">
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "155D3BB022401A2900B0D38E"
BuildableName = "GenerateTestFixtures"
BlueprintName = "GenerateTestFixtures"
ReferencedContainer = "container:GenerateTestFixtures.xcodeproj">
</BuildableReference>
</MacroExpansion>
<Testables>
</Testables>
</TestAction>
Expand All @@ -53,10 +44,10 @@
runnableDebuggingMode = "0">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "155D3BB022401A2900B0D38E"
BlueprintIdentifier = "F023077723F0BBF10023DBEC"
BuildableName = "GenerateTestFixtures"
BlueprintName = "GenerateTestFixtures"
ReferencedContainer = "container:GenerateTestFixtures.xcodeproj">
ReferencedContainer = "container:Foundation.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
</LaunchAction>
Expand All @@ -70,10 +61,10 @@
runnableDebuggingMode = "0">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "155D3BB022401A2900B0D38E"
BlueprintIdentifier = "F023077723F0BBF10023DBEC"
BuildableName = "GenerateTestFixtures"
BlueprintName = "GenerateTestFixtures"
ReferencedContainer = "container:GenerateTestFixtures.xcodeproj">
ReferencedContainer = "container:Foundation.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
</ProfileAction>
Expand Down
67 changes: 67 additions & 0 deletions Foundation.xcodeproj/xcshareddata/xcschemes/SwiftFoundationXML.xcscheme
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,67 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1130"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
buildImplicitDependencies = "YES">
<BuildActionEntries>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "YES"
buildForArchiving = "YES"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "1550106E22EA266B0088F082"
BuildableName = "SwiftFoundationXML.framework"
BlueprintName = "SwiftFoundationXML"
ReferencedContainer = "container:Foundation.xcodeproj">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>
</BuildAction>
<TestAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES">
<Testables>
</Testables>
</TestAction>
<LaunchAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
launchStyle = "0"
useCustomWorkingDirectory = "NO"
ignoresPersistentStateOnLaunch = "NO"
debugDocumentVersioning = "YES"
debugServiceExtension = "internal"
allowLocationSimulation = "YES">
</LaunchAction>
<ProfileAction
buildConfiguration = "Release"
shouldUseLaunchSchemeArgsEnv = "YES"
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
debugDocumentVersioning = "YES">
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "1550106E22EA266B0088F082"
BuildableName = "SwiftFoundationXML.framework"
BlueprintName = "SwiftFoundationXML"
ReferencedContainer = "container:Foundation.xcodeproj">
</BuildableReference>
</MacroExpansion>
</ProfileAction>
<AnalyzeAction
buildConfiguration = "Debug">
</AnalyzeAction>
<ArchiveAction
buildConfiguration = "Release"
revealArchiveInOrganizer = "YES">
</ArchiveAction>
</Scheme>
78 changes: 78 additions & 0 deletions Foundation.xcodeproj/xcshareddata/xcschemes/xdgTestHelper.xcscheme
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,78 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1130"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
buildImplicitDependencies = "YES">
<BuildActionEntries>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "YES"
buildForArchiving = "YES"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "9F0DD33E1ECD734200F68030"
BuildableName = "xdgTestHelper.app"
BlueprintName = "xdgTestHelper"
ReferencedContainer = "container:Foundation.xcodeproj">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>
</BuildAction>
<TestAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES">
<Testables>
</Testables>
</TestAction>
<LaunchAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
launchStyle = "0"
useCustomWorkingDirectory = "NO"
ignoresPersistentStateOnLaunch = "NO"
debugDocumentVersioning = "YES"
debugServiceExtension = "internal"
allowLocationSimulation = "YES">
<BuildableProductRunnable
runnableDebuggingMode = "0">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "9F0DD33E1ECD734200F68030"
BuildableName = "xdgTestHelper.app"
BlueprintName = "xdgTestHelper"
ReferencedContainer = "container:Foundation.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
</LaunchAction>
<ProfileAction
buildConfiguration = "Release"
shouldUseLaunchSchemeArgsEnv = "YES"
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
debugDocumentVersioning = "YES">
<BuildableProductRunnable
runnableDebuggingMode = "0">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "9F0DD33E1ECD734200F68030"
BuildableName = "xdgTestHelper.app"
BlueprintName = "xdgTestHelper"
ReferencedContainer = "container:Foundation.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
</ProfileAction>
<AnalyzeAction
buildConfiguration = "Debug">
</AnalyzeAction>
<ArchiveAction
buildConfiguration = "Release"
revealArchiveInOrganizer = "YES">
</ArchiveAction>
</Scheme>
0 closure/Block.h → Sources/BlocksRuntime/Block.h
View file
Open in desktop
File renamed without changes.
0 closure/Block_private.h → Sources/BlocksRuntime/Block_private.h
View file
Open in desktop
File renamed without changes.
0 closure/data.c → Sources/BlocksRuntime/data.c
View file
Open in desktop
File renamed without changes.
0 closure/runtime.c → Sources/BlocksRuntime/runtime.c
View file
Open in desktop
File renamed without changes.
5 changes: 5 additions & 0 deletions Sources/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
add_subdirectory(UUID)
add_subdirectory(Foundation)
add_subdirectory(FoundationNetworking)
add_subdirectory(FoundationXML)
add_subdirectory(Tools)
0 Foundation/AffineTransform.swift → Sources/Foundation/AffineTransform.swift
View file
Open in desktop
File renamed without changes.
0 Foundation/Array.swift → Sources/Foundation/Array.swift
View file
Open in desktop
File renamed without changes.
0 Foundation/Boxing.swift → Sources/Foundation/Boxing.swift
View file
Open in desktop
File renamed without changes.
0 Foundation/Bridging.swift → Sources/Foundation/Bridging.swift
View file
Open in desktop
File renamed without changes.
0 Foundation/Bundle.swift → Sources/Foundation/Bundle.swift
View file
Open in desktop
File renamed without changes.
0 Foundation/ByteCountFormatter.swift → Sources/Foundation/ByteCountFormatter.swift
View file
Open in desktop
File renamed without changes.
0 Foundation/CGFloat.swift → Sources/Foundation/CGFloat.swift
View file
Open in desktop
File renamed without changes.
Loading