From 8421b92d1e66dde8ea8e04620dca00f28f59a46a Mon Sep 17 00:00:00 2001 From: Maxim Kolesnik Date: Mon, 18 Nov 2019 02:20:03 +0300 Subject: [PATCH 1/8] move CLinuxHelpers to linux --- Sources/KituraNet/HTTP/HTTPServer.swift | 1 + 1 file changed, 1 insertion(+) diff --git a/Sources/KituraNet/HTTP/HTTPServer.swift b/Sources/KituraNet/HTTP/HTTPServer.swift index 4156386c..ba6bfb3f 100644 --- a/Sources/KituraNet/HTTP/HTTPServer.swift +++ b/Sources/KituraNet/HTTP/HTTPServer.swift @@ -28,6 +28,7 @@ import NIOConcurrencyHelpers #if os(Linux) import Glibc +import CLinuxHelpers #else import Darwin #endif From 6a6aa8ce6d342e4ae84d13f8bf5629de9789dae0 Mon Sep 17 00:00:00 2001 From: Maxim Kolesnik Date: Mon, 18 Nov 2019 02:21:25 +0300 Subject: [PATCH 2/8] move CLinuxHelpers target to linux --- Package.swift | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/Package.swift b/Package.swift index d33add4a..f08b2d34 100644 --- a/Package.swift +++ b/Package.swift @@ -18,6 +18,29 @@ import PackageDescription +#if os(Linux) +var targets: [PackageDescription.Target] = [ + .target( + name: "CLinuxHelpers", + dependencies: []), + .target( + name: "KituraNet", + dependencies: ["NIO", "NIOFoundationCompat", "NIOHTTP1", "NIOSSL", "SSLService", "LoggerAPI", "NIOWebSocket", "CLinuxHelpers", "NIOConcurrencyHelpers", "NIOExtras"]), + .testTarget( + name: "KituraNetTests", + dependencies: ["KituraNet"]) +] +#else +var targets: [PackageDescription.Target] = [ + .target( + name: "KituraNet", + dependencies: ["NIO", "NIOFoundationCompat", "NIOHTTP1", "NIOSSL", "SSLService", "LoggerAPI", "NIOWebSocket", "NIOConcurrencyHelpers", "NIOExtras"]), + .testTarget( + name: "KituraNetTests", + dependencies: ["KituraNet"]) +] +#endif + let package = Package( name: "Kitura-NIO", products: [ From 984780c19e7875183468c218f9a3091ecdd8592f Mon Sep 17 00:00:00 2001 From: Maxim Kolesnik Date: Mon, 18 Nov 2019 02:24:16 +0300 Subject: [PATCH 3/8] fix moving CLinuxHelpers target to linux --- Package.swift | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/Package.swift b/Package.swift index f08b2d34..e49b9527 100644 --- a/Package.swift +++ b/Package.swift @@ -56,15 +56,6 @@ let package = Package( .package(url: "https://github.com/IBM-Swift/BlueSSLService.git", from: "1.0.0"), .package(url: "https://github.com/IBM-Swift/LoggerAPI.git", from: "1.7.3") ], - targets: [ - .target( - name: "CLinuxHelpers", - dependencies: []), - .target( - name: "KituraNet", - dependencies: ["NIO", "NIOFoundationCompat", "NIOHTTP1", "NIOSSL", "SSLService", "LoggerAPI", "NIOWebSocket", "CLinuxHelpers", "NIOConcurrencyHelpers", "NIOExtras"]), - .testTarget( - name: "KituraNetTests", - dependencies: ["KituraNet"]) + targets: targets) ] ) From 6368fb7d69f43b8e7d9ee61d997a5c6c42549288 Mon Sep 17 00:00:00 2001 From: Maxim Kolesnik Date: Mon, 18 Nov 2019 02:34:09 +0300 Subject: [PATCH 4/8] move CLinuxHelpers to Linux --- Tests/KituraNetTests/RegressionTests.swift | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Tests/KituraNetTests/RegressionTests.swift b/Tests/KituraNetTests/RegressionTests.swift index c158f573..3226650e 100644 --- a/Tests/KituraNetTests/RegressionTests.swift +++ b/Tests/KituraNetTests/RegressionTests.swift @@ -22,7 +22,9 @@ import NIO import NIOHTTP1 import NIOSSL import LoggerAPI +#if os(Linux) import CLinuxHelpers +#endif class RegressionTests: KituraNetTest { From 150b310d52e88cb481b057fd311d189554569aee Mon Sep 17 00:00:00 2001 From: Maxim Kolesnik Date: Mon, 18 Nov 2019 12:37:00 +0300 Subject: [PATCH 5/8] Update Package.swift --- Package.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Package.swift b/Package.swift index e49b9527..cbae3978 100644 --- a/Package.swift +++ b/Package.swift @@ -57,5 +57,5 @@ let package = Package( .package(url: "https://github.com/IBM-Swift/LoggerAPI.git", from: "1.7.3") ], targets: targets) - ] + ) From 209bbdf12155f76d0e096e8ccee10ea0ba3dab62 Mon Sep 17 00:00:00 2001 From: Maxim Kolesnik Date: Mon, 18 Nov 2019 12:59:55 +0300 Subject: [PATCH 6/8] Update Package.swift --- Package.swift | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Package.swift b/Package.swift index cbae3978..6c7bcd16 100644 --- a/Package.swift +++ b/Package.swift @@ -56,6 +56,5 @@ let package = Package( .package(url: "https://github.com/IBM-Swift/BlueSSLService.git", from: "1.0.0"), .package(url: "https://github.com/IBM-Swift/LoggerAPI.git", from: "1.7.3") ], - targets: targets) - + targets: targets ) From 853b4b5341fcfd3d80f7116bba094573cd6d6207 Mon Sep 17 00:00:00 2001 From: Maxim Kolesnik Date: Mon, 18 Nov 2019 13:21:24 +0300 Subject: [PATCH 7/8] move CLinuxHelpers to Linux --- Sources/KituraNet/HTTP/HTTPServer.swift | 1 - 1 file changed, 1 deletion(-) diff --git a/Sources/KituraNet/HTTP/HTTPServer.swift b/Sources/KituraNet/HTTP/HTTPServer.swift index ba6bfb3f..f02554cf 100644 --- a/Sources/KituraNet/HTTP/HTTPServer.swift +++ b/Sources/KituraNet/HTTP/HTTPServer.swift @@ -21,7 +21,6 @@ import NIOSSL import SSLService import LoggerAPI import NIOWebSocket -import CLinuxHelpers import Foundation import NIOExtras import NIOConcurrencyHelpers From 5ef1aa3287b3fe5fe2789392b4a264e604756c67 Mon Sep 17 00:00:00 2001 From: Maxim Kolesnik Date: Mon, 18 Nov 2019 17:57:24 +0300 Subject: [PATCH 8/8] Rollback changes in Package.swift --- Package.swift | 35 +++++++++++------------------------ 1 file changed, 11 insertions(+), 24 deletions(-) diff --git a/Package.swift b/Package.swift index 6c7bcd16..d33add4a 100644 --- a/Package.swift +++ b/Package.swift @@ -18,29 +18,6 @@ import PackageDescription -#if os(Linux) -var targets: [PackageDescription.Target] = [ - .target( - name: "CLinuxHelpers", - dependencies: []), - .target( - name: "KituraNet", - dependencies: ["NIO", "NIOFoundationCompat", "NIOHTTP1", "NIOSSL", "SSLService", "LoggerAPI", "NIOWebSocket", "CLinuxHelpers", "NIOConcurrencyHelpers", "NIOExtras"]), - .testTarget( - name: "KituraNetTests", - dependencies: ["KituraNet"]) -] -#else -var targets: [PackageDescription.Target] = [ - .target( - name: "KituraNet", - dependencies: ["NIO", "NIOFoundationCompat", "NIOHTTP1", "NIOSSL", "SSLService", "LoggerAPI", "NIOWebSocket", "NIOConcurrencyHelpers", "NIOExtras"]), - .testTarget( - name: "KituraNetTests", - dependencies: ["KituraNet"]) -] -#endif - let package = Package( name: "Kitura-NIO", products: [ @@ -56,5 +33,15 @@ let package = Package( .package(url: "https://github.com/IBM-Swift/BlueSSLService.git", from: "1.0.0"), .package(url: "https://github.com/IBM-Swift/LoggerAPI.git", from: "1.7.3") ], - targets: targets + targets: [ + .target( + name: "CLinuxHelpers", + dependencies: []), + .target( + name: "KituraNet", + dependencies: ["NIO", "NIOFoundationCompat", "NIOHTTP1", "NIOSSL", "SSLService", "LoggerAPI", "NIOWebSocket", "CLinuxHelpers", "NIOConcurrencyHelpers", "NIOExtras"]), + .testTarget( + name: "KituraNetTests", + dependencies: ["KituraNet"]) + ] )