8388795: Add --app-resources CLI option to copy files and directories into the application resources directory - #32474
8388795: Add --app-resources CLI option to copy files and directories into the application resources directory#32474sashamatveev wants to merge 2 commits into
Conversation
… into the application resources directory
|
👋 Welcome back almatvee! A progress list of the required criteria for merging this PR into |
|
❗ This change is not yet ready to be integrated. |
|
@sashamatveev The following label will be automatically applied to this pull request:
When this pull request is ready to be reviewed, an "RFR" email will be sent to the corresponding mailing list. If you would like to change these labels, use the /label pull request command. |
Webrevs
|
|
I can see that the platforms require different layouts, but the lib/ vs / distinction seems like a unnecessary case the app would need to observe? |
Currently --app-content writes to "lib" on Linux, root on Windows and "Contents" on macOS. --app-resources only changes destination on macOS. |
… into the application resources directory [v2]
|
8388795: Add --app-resources CLI option to copy files and directories into the application resources directory [v2]
|
| .addInitializer(JPackageCommand::setFakeRuntime) | ||
| .addInitializer(cmd -> inputs.addTo(cmd, resourcesFirst)) | ||
| .addInstallVerifier(inputs::verify) | ||
| .run(); |
There was a problem hiding this comment.
We probably don't want to install these packages in the test environment, where test packages can be installed; we can do all verification in an unpacked image, and installation doesn't improve coverage. To avoid package installation and limit testing to unpacking only, use .run(Action.CREATE_AND_UNPACK) instead of .run().
| \ A colon (":") list of paths to files and/or directories\n\ | ||
| \ to add to the application resources directory.\n\ | ||
| \ A colliding file from --app-resources replaces\n\ | ||
| \ one from --app-content.\n\ | ||
| \ This option can be used more than once.\n\ | ||
| \ Destination:\n\ | ||
| \ Linux: application image lib directory |
There was a problem hiding this comment.
Wouldn't it be better to explicitly specify where the content will be copied and eliminate the "Destination:" section:
\ A colon-separated list of paths to files and/or directories\n\
\ to add to the application's "lib" directory.\n\
\ If a file from --app-resources conflicts with one from\n\
--app-content, the file from --app-resources is used.\n\
\ This option can be used more than once.\n\
--app-resources.Specification:
Progress
Issues
Reviewing
Using
gitCheckout this PR locally:
$ git fetch https://git.openjdk.org/jdk.git pull/32474/head:pull/32474$ git checkout pull/32474Update a local copy of the PR:
$ git checkout pull/32474$ git pull https://git.openjdk.org/jdk.git pull/32474/headUsing Skara CLI tools
Checkout this PR locally:
$ git pr checkout 32474View PR using the GUI difftool:
$ git pr show -t 32474Using diff file
Download this PR as a diff file:
https://git.openjdk.org/jdk/pull/32474.diff
Using Webrev
Link to Webrev Comment