Skip to content

Commit 34cd43b

Browse files
authored
Delete unfinished C ABI (#309)
Move versioning to Swift.
1 parent 3f1348e commit 34cd43b

File tree

14 files changed

+15
-450
lines changed

14 files changed

+15
-450
lines changed

Executables/partoutd/main.c

Lines changed: 0 additions & 56 deletions
This file was deleted.

Package.swift

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -98,9 +98,6 @@ let package = Package(
9898
return list
9999
}()
100100
),
101-
.target(
102-
name: "PartoutABI_C"
103-
),
104101
.testTarget(
105102
name: "PartoutTests",
106103
dependencies: ["Partout"],
@@ -135,7 +132,6 @@ package.targets.append(contentsOf: [
135132
name: "PartoutCore",
136133
dependencies: [
137134
"MiniFoundation",
138-
"PartoutABI_C",
139135
"PartoutCore_C"
140136
],
141137
swiftSettings: useFoundationCompatibility.swiftSettings
@@ -198,17 +194,6 @@ package.targets.append(contentsOf: [
198194
)
199195
])
200196

201-
// Standalone executables
202-
if useFoundationCompatibility.supportsPartoutd {
203-
package.targets.append(
204-
.executableTarget(
205-
name: "partoutd",
206-
dependencies: ["Partout"],
207-
path: "Executables/partoutd"
208-
)
209-
)
210-
}
211-
212197
// MARK: OpenVPN
213198

214199
// OpenVPN requires Crypto/TLS wrappers
@@ -542,8 +527,4 @@ enum FoundationCompatibility {
542527
case .on: [.define("MINIF_COMPAT")]
543528
}
544529
}
545-
546-
var supportsPartoutd: Bool {
547-
true
548-
}
549530
}

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ Partout is the backbone of [Passepartout][passepartout]. The footprint is kept i
1818

1919
**As per the GPL, the public license is not suitable for the App Store and other closed-source distributions. If you want to use Partout for proprietary or commercial purposes, please [obtain a proper license][license-website].**
2020

21-
### Swift
21+
### SwiftPM
2222

2323
Import the library as a SwiftPM dependency:
2424

@@ -34,9 +34,9 @@ targets: [
3434
]
3535
```
3636

37-
### Other languages (ABI)
37+
### CMake
3838

39-
The C ABI is a work in progress.
39+
Partout can be imported as a CMake project. The exported target is `partout`.
4040

4141
#### Requirements
4242

Sources/CMakeLists.txt

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ target_compile_options(partout_c PRIVATE
1313
# Header search paths from all C targets
1414
set(PARTOUT_C_INCLUDE_DIRS
1515
${CMAKE_CURRENT_SOURCE_DIR}/MiniFoundation_C/include
16-
${CMAKE_CURRENT_SOURCE_DIR}/PartoutABI_C/include
1716
${CMAKE_CURRENT_SOURCE_DIR}/PartoutCore_C/include
1817
${CMAKE_CURRENT_SOURCE_DIR}/PartoutOpenVPN_C/include
1918
${CMAKE_CURRENT_SOURCE_DIR}/PartoutWireGuard_C/include
@@ -129,15 +128,6 @@ set_target_properties(partout_c PROPERTIES
129128
RUNTIME_OUTPUT_DIRECTORY ${OUTPUT_DIR}
130129
)
131130

132-
# Copy ABI header
133-
set(ABI_INCLUDE ${CMAKE_CURRENT_SOURCE_DIR}/PartoutABI_C/include)
134-
add_custom_command(
135-
TARGET partout
136-
POST_BUILD
137-
COMMAND ${CMAKE_COMMAND} -E copy ${ABI_INCLUDE}/partout.h ${OUTPUT_DIR}
138-
COMMAND ${CMAKE_COMMAND} -E copy ${ABI_INCLUDE}/module.modulemap ${OUTPUT_DIR}
139-
)
140-
141131
if(WIN32)
142132
set_target_properties(partout_c PROPERTIES PREFIX "lib")
143133
set_target_properties(partout PROPERTIES PREFIX "lib")

Sources/Partout/ABI.swift

Lines changed: 0 additions & 196 deletions
This file was deleted.

Sources/Partout/ABIContext.swift

Lines changed: 0 additions & 43 deletions
This file was deleted.

Sources/Partout/Docs.docc/index.md

Lines changed: 0 additions & 3 deletions
This file was deleted.

0 commit comments

Comments
 (0)