The files target property: Add support for directories #1053
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
edwardalee
approved these changes
Mar 25, 2022
Co-authored-by: Edward A. Lee <eal@eecs.berkeley.edu>
lhstrh
reviewed
Mar 28, 2022
| * @param dstDir Where the file or directory should be placed. | ||
| * @return The name of the file or directory in destinationDirectory or an empty string on failure. | ||
| */ | ||
| public static String copyFileOrResource(String fileName, Path srcDir, |
There was a problem hiding this comment.
I think it would be better to rename fileName to fileOrDir.
| // because it is the only one currently capable of handling asynchronous events. | ||
| if (!targetConfig.threading) { | ||
| if (!targetConfig.threading && !targetConfig.setByUser.contains(TargetProperty.THREADING)) { |
There was a problem hiding this comment.
I'm a little confused about this change. What does it do? I seems entirely unrelated to the PR.
| public static String copyFileOrResource(String fileName, Path srcDir, | ||
| Path dstDir) { | ||
| // Try to copy the file or directory from the file system. | ||
| Path file = findFileOrDirectory(fileName, srcDir); |
There was a problem hiding this comment.
I would rename file to path here.
| } | ||
| } | ||
|
|
||
| String filenameWithoutPath = fileName; |
There was a problem hiding this comment.
The following takes the tail of a path (e.g., foo/bar/baz.lf yields baz.lf; foo/bar yields bar) and just looks for it on the class path. This doesn't seem right to me. I don't think there are any tests for this, and I think the FIXME below alludes to this. I realize this FIXME preexists this PR, but I think we should fix and not ignore it.
# for free
to join this conversation on GitHub.
Already have an account?
# 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.
This adds support for including entire directories in the
filestarget property (e.g.,files: ["/etc"]).I found this to be very convenient. Imagine a game that requires a number of images that are located in a folder.
It would be convenient to be able to use
files: ["images"]instead of listing each image file one by one.