Fix generated resources #538
Merged
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
jdai8
commented
May 13, 2021
| target_path = target_path, | ||
| c_dir = c_dir, |
There was a problem hiding this comment.
This was the only usage of c_dir. Since we don't need it anymore I removed it from the return values as well.
Comment on lines
-273
to
+272
| line = "{target_path}={c_dir}{res_path}\n".format( | ||
| res_path = res_path, | ||
| line = "{target_path}={f_path}\n".format( |
There was a problem hiding this comment.
Thanks for this change @jdai8! I was so confused why zipping was failing for some resource files generated under bazel-out.
To be super clear this argument line {target_path}={c_dir}{res_path} is saying that the file located at {c_dir}{res_path} should be zipped under {target_path} for the resource jar. So moving to {target_path}={f_path} should be more stable, because f.path should always be how input files are located by a bazel action and {target_path} remains the same.
cgruber
approved these changes
Jul 10, 2021
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.
Fixes #281.
The issue is that we were using
short_path, which excludes the configuration root. Usingfile.pathinstead fixes this. Note that we still want to useshort_pathwhen deciding where to place the file in the jar. We don't want resources in the jar to look likebazel-bin/darwin-fastbuild/....Tested this on our repo internally and it seems to work.