-
Notifications
You must be signed in to change notification settings - Fork 124
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
base: pr/1621
Are you sure you want to change the base?
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 is no longer ready for integration - check the PR body for details. |
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.
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
Integration blocker
Issue
Reviewing
Using
git
Checkout this PR locally:
$ git fetch https://git.openjdk.org/valhalla.git pull/1622/head:pull/1622
$ git checkout pull/1622
Update a local copy of the PR:
$ git checkout pull/1622
$ git pull https://git.openjdk.org/valhalla.git pull/1622/head
Using Skara CLI tools
Checkout this PR locally:
$ git pr checkout 1622
View PR using the GUI difftool:
$ git pr show -t 1622
Using diff file
Download this PR as a diff file:
https://git.openjdk.org/valhalla/pull/1622.diff
Using Webrev
Link to Webrev Comment