Skip to content

[xcodegen] realpath Swift target sources #82254

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
hamishknight merged 2 commits into from
Jun 16, 2025
Merged

[xcodegen] realpath Swift target sources #82254

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
01dbed9
[xcodegen] NFC: Rename `resolvingSymlinks` -> `realPath`
hamishknight Jun 15, 2025
27ec6e3
[xcodegen] `realpath` Swift target sources
hamishknight Jun 15, 2025
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
8 changes: 6 additions & 2 deletions utils/swift-xcodegen/Sources/SwiftXcodeGen/BuildArgs/SwiftTargets.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,10 +124,14 @@ struct SwiftTargets {
// A relative path is for a file in the build directory, it's external.
let abs = buildDir.path.appending(r)
guard abs.exists else { continue }
sources.externalSources.append(abs)
sources.externalSources.append(abs.realPath)

case .absolute(let a):
guard a.exists, let rel = a.removingPrefix(buildDir.repoPath) else {
guard a.exists else { continue }
// Symlinks shouldn't really be a concern here, but we need to realpath
// in order to canonicalize the casing.
let a = a.realPath
guard let rel = a.removingPrefix(buildDir.repoPath) else {
sources.externalSources.append(a)
continue
}
Expand Down
2 changes: 1 addition & 1 deletion utils/swift-xcodegen/Sources/SwiftXcodeGen/Path/AbsolutePath.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ public extension AbsolutePath {
(try? FileManager.default.destinationOfSymbolicLink(atPath: rawPath)) != nil
}

var resolvingSymlinks: Self {
var realPath: Self {
guard let resolved = realpath(rawPath, nil) else { return self }
defer {
free(resolved)
Expand Down
4 changes: 2 additions & 2 deletions utils/swift-xcodegen/Sources/swift-xcodegen/SwiftXcodegen.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ struct SwiftXcodegen: AsyncParsableCommand, Sendable {

// Check to see if we have a separate runnable build dir.
let runnableBuildDirPath =
self.runnableBuildDir?.absoluteInWorkingDir.resolvingSymlinks
self.runnableBuildDir?.absoluteInWorkingDir.realPath
let runnableBuildDir = try runnableBuildDirPath.map {
try NinjaBuildDir(at: $0, projectRootDir: ninja.projectRootDir)
.buildDir(for: .swift)
Expand Down Expand Up @@ -332,7 +332,7 @@ struct SwiftXcodegen: AsyncParsableCommand, Sendable {
}

func generate() async throws {
let buildDirPath = buildDir.absoluteInWorkingDir.resolvingSymlinks
let buildDirPath = buildDir.absoluteInWorkingDir.realPath
log.info("Generating project for '\(buildDirPath)'...")

let projectRootDir = self.projectRootDir?.absoluteInWorkingDir
Expand Down