-
Notifications
You must be signed in to change notification settings - Fork 126
8368475: [lworld] Add preview classes to jimage at make time #1622
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
8368475: [lworld] Add preview classes to jimage at make time #1622
Conversation
|
👋 Welcome back david-beaumont! A progress list of the required criteria for merging this PR into |
|
@david-beaumont This change now passes all automated pre-integration checks. ℹ️ This project also has non-automated pre-integration requirements. Please see the file CONTRIBUTING.md for details. After integration, the commit message for the final commit will be: You can use pull request commands such as /summary, /contributor and /issue to adjust it as needed. At the time when this comment was updated there had been 3 new commits pushed to the
Please see this link for an up-to-date comparison between the source branch of this pull request and the As you do not have Committer status in this project an existing Committer must agree to sponsor your change. ➡️ To flag this PR as ready for integration with the above commit message, type |
5e813e8 to
591d129
Compare
|
@david-beaumont Please do not rebase or force-push to an active PR as it invalidates existing review comments. Note for future reference, the bots always squash all changes into a single commit automatically as part of the integration. See OpenJDK Developers’ Guide for more information. |
591d129 to
c73d387
Compare
|
@david-beaumont Please do not rebase or force-push to an active PR as it invalidates existing review comments. Note for future reference, the bots always squash all changes into a single commit automatically as part of the integration. See OpenJDK Developers’ Guide for more information. |
0c0ad6a to
b192c84
Compare
| # Restructure the class file hierarchy from <module>/<classpath>/... to <module>/META-INF/preview/<classpath>/... | ||
| $(PREVIEW_OUTPUTDIR)/_copy_valueclasses.marker: $($(MODULE)-$(VALUECLASSES_STR)) | ||
| $(call MakeTargetDir) | ||
| $(CP) -R $(VALUECLASS_OUTPUTDIR)/$(MODULE)/. $(@D)/ | ||
| $(TOUCH) $@ | ||
|
|
||
| TARGETS += $(PREVIEW_OUTPUTDIR)/_copy_valueclasses.marker | ||
|
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I expect build reviewer will suggest using the SetupCopyFiles mechanism to copy files.
|
@david-beaumont This pull request has been inactive for more than 4 weeks and will be automatically closed if another 4 weeks passes without any activity. To avoid this, simply issue a |
35b3c2a to
f76c16e
Compare
|
/keepalive |
|
@david-beaumont The pull request is being re-evaluated and the inactivity timeout has been reset. |
|
@david-beaumont this pull request can not be integrated into git checkout jdk_8368475_makefile
git fetch https://git.openjdk.org/valhalla.git pr/1621
git merge FETCH_HEAD
# resolve conflicts and follow the instructions given by git merge
git commit -m "Merge pr/1621"
git push |
|
The parent pull request that this pull request depends on has been closed without being integrated and the target branch of this pull request has been updated as the previous branch was deleted. This means that changes from the parent pull request will start to show up in this pull request. If closing the parent pull request was done in error, it will need to be re-opened and this pull request will need to manually be retargeted again. |
|
The parent pull request that this pull request depends on has now been integrated and the target branch of this pull request has been updated. This means that changes from the dependent pull request can start to show up as belonging to this pull request, which may be confusing for reviewers. To remedy this situation, simply merge the latest changes from the new target branch into this pull request by running commands similar to these in the local repository for your personal fork: git checkout jdk_8368475_makefile
git fetch https://git.openjdk.org/valhalla.git lworld
git merge FETCH_HEAD
# if there are conflicts, follow the instructions given by git merge
git commit -m "Merge lworld"
git push |
c73d387 to
6ea658b
Compare
|
@david-beaumont Please do not rebase or force-push to an active PR as it invalidates existing review comments. Note for future reference, the bots always squash all changes into a single commit automatically as part of the integration. See OpenJDK Developers’ Guide for more information. |
* likely test fix * Copy value classes into preview directories for inclusion in jimage
6ea658b to
b32d27c
Compare
|
@david-beaumont Please do not rebase or force-push to an active PR as it invalidates existing review comments. Note for future reference, the bots always squash all changes into a single commit automatically as part of the integration. See OpenJDK Developers’ Guide for more information. |
Copies valuetype classes for each module into corresponding "/META-INF/preview/..." sub-directories to be pulled into jimage files and processed by the new preview mode handling code.
There might be a better way to do this in terms of Makefile semantics, but this seems to work well enough and doesn't prevent the value-class JAR files being generated for patching (which is still how everyone will get value classes until the rest of the work is plumbed in).
To enable the new preview mode work, set the "DISABLE_PREVIEW_PATCHING" system property to "true".
This should be review against #1621.
Progress
Issue
Reviewing
Using
gitCheckout this PR locally:
$ git fetch https://git.openjdk.org/valhalla.git pull/1622/head:pull/1622$ git checkout pull/1622Update a local copy of the PR:
$ git checkout pull/1622$ git pull https://git.openjdk.org/valhalla.git pull/1622/headUsing Skara CLI tools
Checkout this PR locally:
$ git pr checkout 1622View PR using the GUI difftool:
$ git pr show -t 1622Using diff file
Download this PR as a diff file:
https://git.openjdk.org/valhalla/pull/1622.diff
Using Webrev
Link to Webrev Comment