Skip to content
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

Jump to bottom

Avoid loading xcframeworks as Bundles #3213

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
+18 −0
Open

Avoid loading xcframeworks as Bundles #3213

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
85fa0c9
Avoid loading xcframeworks as Bundles
elliottwilliams Jun 29, 2021
d581777
Rewrite using _CFBundleFlushBundleCaches
elliottwilliams Jun 30, 2021
326abc3
Flush the bundle after mergeIntoXCFramework
elliottwilliams Jul 12, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
18 changes: 18 additions & 0 deletions Source/CarthageKit/Xcode.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -604,6 +604,20 @@ private func mergeBuildProducts(
}
}

/// Private CoreFoundation call which flushes cached metadata for bundle objects.
///
/// https://michelf.ca/blog/2010/killer-private-eraser/
/// https://opensource.apple.com/source/CF/CF-550.13/CFBundlePriv.h
private let _CFBundleFlushBundleCaches: ((CFBundle) -> Void)? = {
let sym = dlsym(
UnsafeMutableRawPointer(bitPattern: -3), // RTLD_SELF
"_CFBundleFlushBundleCaches"
)
let fn = unsafeBitCast(sym, to: (@convention(c) (CFBundle) -> Void)?.self)
assert(fn != nil, "_CFBundleFlushBundleCaches not loaded, it is not available on this OS?")
return fn
}()

/// Extracts the built product and debug information from a build described by `settings` and adds it to an xcframework
/// in `directoryURL`. Sends the xcframework's URL when complete.
private func mergeIntoXCFramework(in directoryURL: URL, settings: BuildSettings) -> SignalProducer<URL, CarthageError> {
Expand Down Expand Up @@ -652,6 +666,10 @@ private func mergeIntoXCFramework(in directoryURL: URL, settings: BuildSettings)
}
try fileManager.createDirectory(at: url.deletingLastPathComponent(), withIntermediateDirectories: true)
try fileManager.copyItem(at: replacementURL, to: url)

// Flush the Info.plist cache for this bundle.
let cfbundle = CFBundleCreate(nil, url as CFURL)!
_CFBundleFlushBundleCaches?(cfbundle)
}.flatMap { _ in
Result(at: temporaryDirectory) { try fileManager.removeItem(at: $0) }
}
Expand Down