mirror of
https://github.com/yonaskolb/XcodeGen.git
synced 2024-09-11 12:56:03 +03:00
Fix crash bundle (#1448)
* create availableModule to avoid crash on Bundle loading * remove unnecessary line
This commit is contained in:
parent
fd48b7eb07
commit
5bcbf3959d
@ -249,7 +249,7 @@ extension SettingsPresetFile {
|
||||
symlink.parent() + relativePath,
|
||||
] + possibleSettingsPaths
|
||||
}
|
||||
if let moduleResourcePath = Bundle.module.path(forResource: "SettingPresets", ofType: nil) {
|
||||
if let moduleResourcePath = Bundle.availableModule?.path(forResource: "SettingPresets", ofType: nil) {
|
||||
possibleSettingsPaths.append(Path(moduleResourcePath) + "\(path).yml")
|
||||
}
|
||||
|
||||
@ -272,3 +272,48 @@ extension SettingsPresetFile {
|
||||
return buildSettings
|
||||
}
|
||||
}
|
||||
|
||||
private class BundleFinder {}
|
||||
|
||||
/// The default SPM generated `Bundle.module` crashes on runtime if there is no .bundle file.
|
||||
/// Below implementation modified from generated `Bundle.module` code which call `fatalError` if .bundle file not found.
|
||||
private extension Bundle {
|
||||
/// Returns the resource bundle associated with the current Swift module.
|
||||
static let availableModule: Bundle? = {
|
||||
let bundleName = "XcodeGen_XcodeGenKit"
|
||||
|
||||
let overrides: [URL]
|
||||
#if DEBUG
|
||||
// The 'PACKAGE_RESOURCE_BUNDLE_PATH' name is preferred since the expected value is a path. The
|
||||
// check for 'PACKAGE_RESOURCE_BUNDLE_URL' will be removed when all clients have switched over.
|
||||
// This removal is tracked by rdar://107766372.
|
||||
if let override = ProcessInfo.processInfo.environment["PACKAGE_RESOURCE_BUNDLE_PATH"]
|
||||
?? ProcessInfo.processInfo.environment["PACKAGE_RESOURCE_BUNDLE_URL"] {
|
||||
overrides = [URL(fileURLWithPath: override)]
|
||||
} else {
|
||||
overrides = []
|
||||
}
|
||||
#else
|
||||
overrides = []
|
||||
#endif
|
||||
|
||||
let candidates = overrides + [
|
||||
// Bundle should be present here when the package is linked into an App.
|
||||
Bundle.main.resourceURL,
|
||||
|
||||
// Bundle should be present here when the package is linked into a framework.
|
||||
Bundle(for: BundleFinder.self).resourceURL,
|
||||
|
||||
// For command-line tools.
|
||||
Bundle.main.bundleURL,
|
||||
]
|
||||
|
||||
for candidate in candidates {
|
||||
let bundlePath = candidate?.appendingPathComponent(bundleName + ".bundle")
|
||||
if let bundle = bundlePath.flatMap(Bundle.init(url:)) {
|
||||
return bundle
|
||||
}
|
||||
}
|
||||
return nil
|
||||
}()
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user