Skip to content

Add Swift module support to ZipBuilder #5040

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Mar 9, 2020
Merged

Add Swift module support to ZipBuilder #5040

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
d382e49
Add Swift module support to ZipBuilder
paulb777 Mar 7, 2020
2cf1e54
directoryExists
paulb777 Mar 7, 2020
4677f1f
missing try/catch
paulb777 Mar 7, 2020
297a5dd
Fix String->URL conversion
paulb777 Mar 7, 2020
550c893
path not absoluteString
paulb777 Mar 7, 2020
5c15c40
review
paulb777 Mar 9, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
path not absoluteString
  • Loading branch information
@paulb777
paulb777 committed Mar 7, 2020
commit 550c8939e181c161993fb2f70a650ccbf4d5ed96
10 changes: 5 additions & 5 deletions ZipBuilder/Sources/ZipBuilder/FrameworkBuilder.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -272,7 +272,7 @@ struct FrameworkBuilder {
var actualFramework: String
do {
let files = try FileManager.default.contentsOfDirectory(at: frameworkPath,
includingPropertiesForKeys: nil).compactMap { $0.absoluteString }
includingPropertiesForKeys: nil).compactMap { $0.path }
let frameworkDir = files.filter { $0.contains(".framework") }
actualFramework = URL(fileURLWithPath: frameworkDir[0]).lastPathComponent
} catch {
Expand Down Expand Up @@ -440,7 +440,7 @@ struct FrameworkBuilder {
var umbrellaHeaderURL: URL
do {
let files = try fileManager.contentsOfDirectory(at: headersDir,
includingPropertiesForKeys: nil).compactMap { $0.absoluteString }
includingPropertiesForKeys: nil).compactMap { $0.path }
let umbrellas = files.filter { $0.hasSuffix("umbrella.h") }
if umbrellas.count != 1 {
fatalError("Did not find exactly one umbrella header in \(headersDir).")
Expand Down Expand Up @@ -603,8 +603,8 @@ struct FrameworkBuilder {
let moduleDir = frameworkDir.appendingPathComponent("Modules").resolvingSymlinksInPath()
do {
let files = try fileManager.contentsOfDirectory(at: moduleDir,
includingPropertiesForKeys: nil).compactMap { $0.absoluteString }
let swiftModules = files.filter { $0.hasSuffix(".swiftmodule/") }
includingPropertiesForKeys: nil).compactMap { $0.path }
let swiftModules = files.filter { $0.hasSuffix(".swiftmodule") }
if swiftModules.isEmpty {
return false
}
Expand All @@ -624,7 +624,7 @@ struct FrameworkBuilder {
// from the *.swiftmodule subdirectory.
do {
let files = try fileManager.contentsOfDirectory(at: swiftModule,
includingPropertiesForKeys: nil).compactMap { $0.absoluteString }
includingPropertiesForKeys: nil).compactMap { $0.path }
let destSwiftModuleDir = destModuleDir.appendingPathComponent(swiftModule.lastPathComponent)
for file in files {
let fileURL = URL(fileURLWithPath: file)
Expand Down