Find runfiles in directories that are themselves runfiles #1
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
@phst I submitted this PR to keep this runfiles library in sync with the Bazel-provided ones after a potential resolution of bazelbuild/bazel#14336. I have marked it as a draft just in case bazelbuild/bazel#14335 is not accepted. |
fmeum
force-pushed
the
runfiles-dirs
branch
2 times, most recently
from
6791d7d to
1e44425
Compare
|
@phst The corresponding Bazel PR bazelbuild/bazel#14335 has been approved. Would that be sufficient for you to accept this PR or do you want me to update Bazel docs first? |
absolutely, sorry for the delay! |
phst
approved these changes
Mar 8, 2022
|
@phst Friendly ping. Are there any more changes I should make? |
phst
approved these changes
Mar 23, 2022
When a target has a runfile that is contained in a directory that is itself one of its runfiles, the runfile will be shadowed by the SymlinkEntry for the directory. While this still allows to resolve the file in the runfiles symlink tree, a manifest-based lookup will fail. This PR extends the lookup logic to also find runfiles contained within directories that are themselves runfiles. It does so by searching the manifest not only for the exact provided rlocation path, but also for all path prefixes. If a prefix is looked up successfully, the corresponding suffix is resolved relative to the looked up path. See bazelbuild/bazel#14336 for more context.
phst
approved these changes
Mar 26, 2022
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
When a target has a runfile that is contained in a directory that is
itself one of its runfiles, the runfile will be shadowed by the
SymlinkEntry for the directory. While this still allows to resolve the
file in the runfiles symlink tree, a manifest-based lookup will fail.
This PR extends the lookup logic to also find runfiles contained within
directories that are themselves runfiles. It does so by searching the
manifest not only for the exact provided rlocation path, but also for
all path prefixes. If a prefix is looked up successfully, the
corresponding suffix is resolved relative to the looked up path.
See bazelbuild/bazel#14336 for more context.