TSCBasic: correct resolveSymlink on Windows
#144
Conversation
This would fail to properly resolve the symbolic links on Windows since the result of the resolution would be a path relative to the location of the original path. However, we would instead treat the path as the absolute path. Correct this which is required to resolve modulemaps inside of directories with symbolic links. This was found by building IndexStoreDB on Windows with SwiftPM.
compnerd
requested review from
abertelrud,
aciidgh,
friedbunny and
neonichu
as code owners
|
@swift-ci please test |
| ?? path.pathString | ||
| var resolved: URL = URL(fileURLWithPath: path.pathString) | ||
| if let destination = try? FileManager.default.destinationOfSymbolicLink(atPath: path.pathString) { | ||
| resolved = URL(fileURLWithPath: destination, relativeTo: URL(fileURLWithPath: path.pathString)) |
There was a problem hiding this comment.
In theory, could we use AbsolutePath.init(_ str: String, relativeTo basePath: AbsolutePath) here, which takes a string such as what destinationOfSymbolicLink returns (either relative or absolute path) and returns the resulting absolute path?
There was a problem hiding this comment.
We could, but we want the standardized URL ... so we would need to construct the URL first anyway.
|
Also, it would be great to add more testing around this (possibly in separate PR), although I realize that such tests aren't yet running in CI on Windows (I think...?). |
|
Yeah, the tests don't work because the tests explicit create file systems in memory using |
This would fail to properly resolve the symbolic links on Windows since
the result of the resolution would be a path relative to the location of
the original path. However, we would instead treat the path as the
absolute path. Correct this which is required to resolve modulemaps
inside of directories with symbolic links.
This was found by building IndexStoreDB on Windows with SwiftPM.