Skip to content

fix(deps): guard sibling-path detection against SwiftPM's own checkout layout #29

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

Open
gsdali wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(deps): guard sibling-path detection against SwiftPM's own checkout layout #29

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 5 additions & 1 deletion Package.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,13 @@ import Foundation
// OCCT ecosystem SHARES the single OCCTSwift/Libraries/OCCT.xcframework instead of each repo
// extracting its own 1.3 GB copy. CI / fresh clones (no sibling) use the URL pin. `#filePath`-relative
// so it's independent of build CWD.
// Guarded against SwiftPM's own checkout layout: a transitively-resolved checkout under a
// consumer's .build/ must never be treated as a local dev sibling (ecosystem issue
// OCCTSwiftScripts#69 / #70).
func occtDep(_ name: String, from version: String) -> Package.Dependency {
let manifestDir = URL(fileURLWithPath: #filePath).deletingLastPathComponent().path
if FileManager.default.fileExists(atPath: manifestDir + "/../\(name)/Package.swift") {
if !manifestDir.contains("/.build/"),
FileManager.default.fileExists(atPath: manifestDir + "/../\(name)/Package.swift") {
return .package(path: "../\(name)")
}
return .package(url: "https://github.com/SecondMouseAU/\(name).git", from: Version(version)!)
Expand Down