From 3efe6131ca3f5740378b0a7fe5a19dfa04193530 Mon Sep 17 00:00:00 2001 From: saiHemak Date: Mon, 20 Nov 2017 16:47:09 +0530 Subject: [PATCH] Added libcurl abstractions to libcurl directory --- Foundation.xcodeproj/project.pbxproj | 21 +++++++++++++------ .../{http => libcurl}/EasyHandle.swift | 0 .../{http => libcurl}/MultiHandle.swift | 0 .../{http => libcurl}/libcurlHelpers.swift | 0 build.py | 6 +++--- 5 files changed, 18 insertions(+), 9 deletions(-) rename Foundation/URLSession/{http => libcurl}/EasyHandle.swift (100%) rename Foundation/URLSession/{http => libcurl}/MultiHandle.swift (100%) rename Foundation/URLSession/{http => libcurl}/libcurlHelpers.swift (100%) diff --git a/Foundation.xcodeproj/project.pbxproj b/Foundation.xcodeproj/project.pbxproj index 8a006af53a..4779c2ef3e 100644 --- a/Foundation.xcodeproj/project.pbxproj +++ b/Foundation.xcodeproj/project.pbxproj @@ -798,12 +798,12 @@ B933A79D1F3055F600FE6846 /* NSString-UTF32-LE-data.txt */ = {isa = PBXFileReference; lastKnownFileType = text; path = "NSString-UTF32-LE-data.txt"; sourceTree = ""; }; B951B5EB1F4E2A2000D8B332 /* TestNSLock.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TestNSLock.swift; sourceTree = ""; }; B9974B8F1EDF4A22007F15B8 /* TransferState.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = TransferState.swift; path = http/TransferState.swift; sourceTree = ""; }; - B9974B901EDF4A22007F15B8 /* MultiHandle.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = MultiHandle.swift; path = http/MultiHandle.swift; sourceTree = ""; }; - B9974B911EDF4A22007F15B8 /* libcurlHelpers.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = libcurlHelpers.swift; path = http/libcurlHelpers.swift; sourceTree = ""; }; + B9974B901EDF4A22007F15B8 /* MultiHandle.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MultiHandle.swift; sourceTree = ""; }; + B9974B911EDF4A22007F15B8 /* libcurlHelpers.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = libcurlHelpers.swift; sourceTree = ""; }; B9974B921EDF4A22007F15B8 /* HTTPURLProtocol.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = HTTPURLProtocol.swift; path = http/HTTPURLProtocol.swift; sourceTree = ""; }; B9974B931EDF4A22007F15B8 /* HTTPMessage.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = HTTPMessage.swift; path = http/HTTPMessage.swift; sourceTree = ""; }; B9974B941EDF4A22007F15B8 /* HTTPBodySource.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = HTTPBodySource.swift; path = http/HTTPBodySource.swift; sourceTree = ""; }; - B9974B951EDF4A22007F15B8 /* EasyHandle.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = EasyHandle.swift; path = http/EasyHandle.swift; sourceTree = ""; }; + B9974B951EDF4A22007F15B8 /* EasyHandle.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = EasyHandle.swift; sourceTree = ""; }; BD8042151E09857800487EB8 /* TestLengthFormatter.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TestLengthFormatter.swift; sourceTree = ""; }; BDBB658F1E256BFA001A7286 /* TestEnergyFormatter.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TestEnergyFormatter.swift; sourceTree = ""; }; BDFDF0A61DFF5B3E00C04CC5 /* TestPersonNameComponents.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TestPersonNameComponents.swift; sourceTree = ""; }; @@ -993,6 +993,7 @@ 5B1FD9C71D6D162D0080E83C /* Session */ = { isa = PBXGroup; children = ( + 614732781FC2DEB7005B5E61 /* libcurl */, E4F889331E9CF04D008A70EB /* http */, 5B1FD9C81D6D16580080E83C /* Configuration.swift */, 5B1FD9CE1D6D16580080E83C /* URLSession.swift */, @@ -1352,6 +1353,16 @@ path = Foundation; sourceTree = ""; }; + 614732781FC2DEB7005B5E61 /* libcurl */ = { + isa = PBXGroup; + children = ( + B9974B901EDF4A22007F15B8 /* MultiHandle.swift */, + B9974B911EDF4A22007F15B8 /* libcurlHelpers.swift */, + B9974B951EDF4A22007F15B8 /* EasyHandle.swift */, + ); + path = libcurl; + sourceTree = ""; + }; 9F4ADBCF1ECD4F56001F0B3D /* xdgTestHelper */ = { isa = PBXGroup; children = ( @@ -1367,11 +1378,8 @@ children = ( B9974B921EDF4A22007F15B8 /* HTTPURLProtocol.swift */, B9974B8F1EDF4A22007F15B8 /* TransferState.swift */, - B9974B901EDF4A22007F15B8 /* MultiHandle.swift */, - B9974B911EDF4A22007F15B8 /* libcurlHelpers.swift */, B9974B931EDF4A22007F15B8 /* HTTPMessage.swift */, B9974B941EDF4A22007F15B8 /* HTTPBodySource.swift */, - B9974B951EDF4A22007F15B8 /* EasyHandle.swift */, ); name = http; sourceTree = ""; @@ -3002,3 +3010,4 @@ }; rootObject = 5B5D88541BBC938800234F36 /* Project object */; } + diff --git a/Foundation/URLSession/http/EasyHandle.swift b/Foundation/URLSession/libcurl/EasyHandle.swift similarity index 100% rename from Foundation/URLSession/http/EasyHandle.swift rename to Foundation/URLSession/libcurl/EasyHandle.swift diff --git a/Foundation/URLSession/http/MultiHandle.swift b/Foundation/URLSession/libcurl/MultiHandle.swift similarity index 100% rename from Foundation/URLSession/http/MultiHandle.swift rename to Foundation/URLSession/libcurl/MultiHandle.swift diff --git a/Foundation/URLSession/http/libcurlHelpers.swift b/Foundation/URLSession/libcurl/libcurlHelpers.swift similarity index 100% rename from Foundation/URLSession/http/libcurlHelpers.swift rename to Foundation/URLSession/libcurl/libcurlHelpers.swift diff --git a/build.py b/build.py index fd66fee63d..9cd1a62913 100755 --- a/build.py +++ b/build.py @@ -424,17 +424,17 @@ 'Foundation/NSURLRequest.swift', 'Foundation/URLResponse.swift', 'Foundation/URLSession/Configuration.swift', - 'Foundation/URLSession/http/EasyHandle.swift', + 'Foundation/URLSession/libcurl/EasyHandle.swift', 'Foundation/URLSession/http/HTTPBodySource.swift', 'Foundation/URLSession/http/HTTPMessage.swift', - 'Foundation/URLSession/http/MultiHandle.swift', + 'Foundation/URLSession/libcurl/MultiHandle.swift', 'Foundation/URLSession/URLSession.swift', 'Foundation/URLSession/URLSessionConfiguration.swift', 'Foundation/URLSession/URLSessionDelegate.swift', 'Foundation/URLSession/URLSessionTask.swift', 'Foundation/URLSession/TaskRegistry.swift', 'Foundation/URLSession/http/TransferState.swift', - 'Foundation/URLSession/http/libcurlHelpers.swift', + 'Foundation/URLSession/libcurl/libcurlHelpers.swift', 'Foundation/URLSession/http/HTTPURLProtocol.swift', 'Foundation/UserDefaults.swift', 'Foundation/NSUUID.swift',