From f79417c7edde35bd3e96b754e8ffe7a0353168c7 Mon Sep 17 00:00:00 2001 From: Logan Wright Date: Fri, 4 Aug 2017 15:51:52 +0200 Subject: [PATCH 1/5] update manifests --- Package.swift | 1 - Package@swift-4.swift | 11 +++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) create mode 100644 Package@swift-4.swift diff --git a/Package.swift b/Package.swift index 989dd52..1be7f83 100644 --- a/Package.swift +++ b/Package.swift @@ -1,5 +1,4 @@ // swift-tools-version:3.1 - import PackageDescription let package = Package( diff --git a/Package@swift-4.swift b/Package@swift-4.swift new file mode 100644 index 0000000..0da1e3e --- /dev/null +++ b/Package@swift-4.swift @@ -0,0 +1,11 @@ +// swift-tools-version:4.0 +import PackageDescription + +let package = Package( + name: "CTLS", + pkgConfig: "ctls", + providers: [ + .brew(["ctls"]), + .apt(["ctls"]) + ] +) From 35fbf66bea71bc55514a7a297d766f63adb50307 Mon Sep 17 00:00:00 2001 From: Logan Wright Date: Mon, 7 Aug 2017 12:17:32 +0200 Subject: [PATCH 2/5] try product explicit --- Package@swift-4.swift | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Package@swift-4.swift b/Package@swift-4.swift index 0da1e3e..5a38a5c 100644 --- a/Package@swift-4.swift +++ b/Package@swift-4.swift @@ -6,6 +6,9 @@ let package = Package( pkgConfig: "ctls", providers: [ .brew(["ctls"]), - .apt(["ctls"]) + .apt(["ctls"]), + ], + products: [ + .library(name: "CTLS", targets: []), ] ) From 28b32c671a763436afb0712fff906e5c4b21f631 Mon Sep 17 00:00:00 2001 From: Logan Wright Date: Mon, 7 Aug 2017 12:21:21 +0200 Subject: [PATCH 3/5] update pack and modulemap --- Package@swift-4.swift | 3 +++ module.modulemap | 1 + 2 files changed, 4 insertions(+) diff --git a/Package@swift-4.swift b/Package@swift-4.swift index 5a38a5c..ac701a2 100644 --- a/Package@swift-4.swift +++ b/Package@swift-4.swift @@ -10,5 +10,8 @@ let package = Package( ], products: [ .library(name: "CTLS", targets: []), + ], + targets: [ + .target(name: "CTLS", dependencies: []), ] ) diff --git a/module.modulemap b/module.modulemap index 13a8c25..dcfcc1b 100644 --- a/module.modulemap +++ b/module.modulemap @@ -2,4 +2,5 @@ module CTLS [system] { header "shim.h" link "ssl" link "crypto" + export * } From 6f7b5004d597824bb73e9cf44224c1524ac2b8f1 Mon Sep 17 00:00:00 2001 From: Logan Wright Date: Mon, 7 Aug 2017 14:00:35 +0200 Subject: [PATCH 4/5] rm package info helpers --- Package@swift-4.swift | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/Package@swift-4.swift b/Package@swift-4.swift index ac701a2..fbc6927 100644 --- a/Package@swift-4.swift +++ b/Package@swift-4.swift @@ -3,15 +3,5 @@ import PackageDescription let package = Package( name: "CTLS", - pkgConfig: "ctls", - providers: [ - .brew(["ctls"]), - .apt(["ctls"]), - ], - products: [ - .library(name: "CTLS", targets: []), - ], - targets: [ - .target(name: "CTLS", dependencies: []), - ] + pkgConfig: "ctls" ) From 2083e2b7f23bb345cf81109c2d89349f214b0c21 Mon Sep 17 00:00:00 2001 From: Logan Wright Date: Mon, 7 Aug 2017 14:02:50 +0200 Subject: [PATCH 5/5] revert export --- module.modulemap | 1 - 1 file changed, 1 deletion(-) diff --git a/module.modulemap b/module.modulemap index dcfcc1b..13a8c25 100644 --- a/module.modulemap +++ b/module.modulemap @@ -2,5 +2,4 @@ module CTLS [system] { header "shim.h" link "ssl" link "crypto" - export * }