Foundation: restructure FoundationNetworking

Author: compnerd

CMakeLists.txt

@@ -46,6 +46,7 @@ target_include_directories(CoreFoundation PRIVATE
 
 add_subdirectory(uuid)
 add_subdirectory(Foundation)
+add_subdirectory(Sources)
 add_subdirectory(Tools)
 if(ENABLE_TESTING)
   find_package(XCTest CONFIG REQUIRED)

Foundation.xcodeproj/project.pbxproj

@@ -175,54 +175,6 @@ set_target_properties(Foundation PROPERTIES
   INTERFACE_INCLUDE_DIRECTORIES ${CMAKE_BINARY_DIR}/swift)
 
 
-add_library(FoundationNetworking
-  Boxing.swift
-  NSURLRequest.swift
-  HTTPCookie.swift
-  HTTPCookieStorage.swift
-  URLAuthenticationChallenge.swift
-  URLCache.swift
-  URLCredential.swift
-  URLCredentialStorage.swift
-  URLProtectionSpace.swift
-  URLProtocol.swift
-  URLRequest.swift
-  URLResponse.swift
-  URLSession/BodySource.swift
-  URLSession/Configuration.swift
-  URLSession/http/HTTPMessage.swift
-  URLSession/http/HTTPURLProtocol.swift
-  URLSession/libcurl/EasyHandle.swift
-  URLSession/libcurl/libcurlHelpers.swift
-  URLSession/libcurl/MultiHandle.swift
-  URLSession/Message.swift
-  URLSession/NativeProtocol.swift
-  URLSession/NetworkingSpecific.swift
-  URLSession/ftp/FTPURLProtocol.swift
-  URLSession/TaskRegistry.swift
-  URLSession/TransferState.swift
-  URLSession/URLSession.swift
-  URLSession/URLSessionConfiguration.swift
-  URLSession/URLSessionDelegate.swift
-  URLSession/URLSessionTask.swift)
-target_compile_definitions(FoundationNetworking PRIVATE
-  DEPLOYMENT_RUNTIME_SWIFT
-  NS_BUILDING_FOUNDATION_NETWORKING)
-target_compile_options(FoundationNetworking PUBLIC
-  "SHELL:-Xcc -F${CMAKE_BINARY_DIR}")
-if(ENABLE_TESTING)
-  target_compile_options(FoundationNetworking PRIVATE
-    -enable-testing)
-endif()
-target_link_libraries(FoundationNetworking PRIVATE
-  Foundation
-  CFURLSessionInterface)
-set_target_properties(FoundationNetworking PROPERTIES
-  INSTALL_RPATH "$ORIGIN"
-  Swift_MODULE_DIRECTORY ${CMAKE_BINARY_DIR}/swift
-  INTERFACE_INCLUDE_DIRECTORIES ${CMAKE_BINARY_DIR}/swift)
-
-
 add_library(FoundationXML
   XMLDocument.swift
   XMLDTD.swift
@@ -248,17 +200,15 @@ set_target_properties(FoundationXML PROPERTIES
 
 
 set_property(GLOBAL APPEND PROPERTY Foundation_EXPORTS
-  Foundation FoundationNetworking FoundationXML)
+  Foundation FoundationXML)
 get_swift_host_arch(swift_arch)
-install(TARGETS Foundation FoundationNetworking FoundationXML
+install(TARGETS Foundation FoundationXML
   ARCHIVE DESTINATION lib/swift$<$<NOT:$<BOOL:${BUILD_SHARED_LIBS}>>:_static>/$<LOWER_CASE:${CMAKE_SYSTEM_NAME}>
   LIBRARY DESTINATION lib/swift$<$<NOT:$<BOOL:${BUILD_SHARED_LIBS}>>:_static>/$<LOWER_CASE:${CMAKE_SYSTEM_NAME}>
   RUNTIME DESTINATION bin)
 install(FILES
   ${CMAKE_BINARY_DIR}/swift/Foundation.swiftdoc
   ${CMAKE_BINARY_DIR}/swift/Foundation.swiftmodule
-  ${CMAKE_BINARY_DIR}/swift/FoundationNetworking.swiftdoc
-  ${CMAKE_BINARY_DIR}/swift/FoundationNetworking.swiftmodule
   ${CMAKE_BINARY_DIR}/swift/FoundationXML.swiftdoc
   ${CMAKE_BINARY_DIR}/swift/FoundationXML.swiftmodule
   DESTINATION lib/swift$<$<NOT:$<BOOL:${BUILD_SHARED_LIBS}>>:_static>/$<LOWER_CASE:${CMAKE_SYSTEM_NAME}>/${swift_arch})

Foundation/CMakeLists.txt

@@ -0,0 +1 @@
+add_subdirectory(FoundationNetworking)

Sources/CMakeLists.txt

@@ -0,0 +1,55 @@
+add_library(FoundationNetworking
+  ../Foundation/Boxing.swift
+  NSURLRequest.swift
+  HTTPCookie.swift
+  HTTPCookieStorage.swift
+  URLAuthenticationChallenge.swift
+  URLCache.swift
+  URLCredential.swift
+  URLCredentialStorage.swift
+  URLProtectionSpace.swift
+  URLProtocol.swift
+  URLRequest.swift
+  URLResponse.swift
+  URLSession/BodySource.swift
+  URLSession/Configuration.swift
+  URLSession/HTTP/HTTPMessage.swift
+  URLSession/HTTP/HTTPURLProtocol.swift
+  URLSession/libcurl/EasyHandle.swift
+  URLSession/libcurl/libcurlHelpers.swift
+  URLSession/libcurl/MultiHandle.swift
+  URLSession/Message.swift
+  URLSession/NativeProtocol.swift
+  URLSession/NetworkingSpecific.swift
+  URLSession/FTP/FTPURLProtocol.swift
+  URLSession/TaskRegistry.swift
+  URLSession/TransferState.swift
+  URLSession/URLSession.swift
+  URLSession/URLSessionConfiguration.swift
+  URLSession/URLSessionDelegate.swift
+  URLSession/URLSessionTask.swift)
+target_compile_definitions(FoundationNetworking PRIVATE
+  DEPLOYMENT_RUNTIME_SWIFT
+  NS_BUILDING_FOUNDATION_NETWORKING)
+target_compile_options(FoundationNetworking PUBLIC
+  "SHELL:-Xcc -F${CMAKE_BINARY_DIR}"
+  $<$<BOOL:${ENABLE_TESTING}>:-enable-testing>)
+target_link_libraries(FoundationNetworking PRIVATE
+  Foundation
+  CFURLSessionInterface)
+set_target_properties(FoundationNetworking PROPERTIES
+  INSTALL_RPATH "$ORIGIN"
+  Swift_MODULE_DIRECTORY ${CMAKE_BINARY_DIR}/swift
+  INTERFACE_INCLUDE_DIRECTORIES ${CMAKE_BINARY_DIR}/swift)
+
+
+set_property(GLOBAL APPEND PROPERTY Foundation_EXPORTS FoundationNetworking)
+install(TARGETS FoundationNetworking
+  ARCHIVE DESTINATION lib/swift$<$<NOT:$<BOOL:${BUILD_SHARED_LIBS}>>:_static>/$<LOWER_CASE:${CMAKE_SYSTEM_NAME}>
+  LIBRARY DESTINATION lib/swift$<$<NOT:$<BOOL:${BUILD_SHARED_LIBS}>>:_static>/$<LOWER_CASE:${CMAKE_SYSTEM_NAME}>
+  RUNTIME DESTINATION bin)
+get_swift_host_arch(swift_arch)
+install(FILES
+  $<TARGET_PROPERTY:FoundationNetworking,Swift_MODULE_DIRECTORY>/FoundationNetworking.swiftdoc
+  $<TARGET_PROPERTY:FoundationNetworking,Swift_MODULE_DIRECTORY>/FoundationNetworking.swiftmodule
+  DESTINATION lib/swift$<$<NOT:$<BOOL:${BUILD_SHARED_LIBS}>>:_static>/$<LOWER_CASE:${CMAKE_SYSTEM_NAME}>/${swift_arch})