Skip to content

Conversation

david-beaumont
Copy link
Contributor

@david-beaumont david-beaumont commented Sep 23, 2025

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

  • Change must not contain extraneous whitespace

Integration blocker

 ⚠️ Dependency #1621 must be integrated first

Issue

  • JDK-8368475: [lworld] Add preview classes to jimage at make time (Sub-task - P3)

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

@bridgekeeper
Copy link

bridgekeeper bot commented Sep 23, 2025

👋 Welcome back david-beaumont! A progress list of the required criteria for merging this PR into lworld will be added to the body of your pull request. There are additional pull request commands available for use with this pull request.

@openjdk
Copy link

openjdk bot commented Sep 23, 2025

@david-beaumont This change is no longer ready for integration - check the PR body for details.

@openjdk openjdk bot added ready Pull request is ready to be integrated rfr Pull request is ready for review labels Sep 23, 2025
@mlbridge
Copy link

mlbridge bot commented Sep 23, 2025

Webrevs

@david-beaumont david-beaumont changed the base branch from lworld to pr/1621 September 23, 2025 19:37
@openjdk openjdk bot removed the ready Pull request is ready to be integrated label Sep 23, 2025
@openjdk
Copy link

openjdk bot commented Sep 23, 2025

@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.

@openjdk
Copy link

openjdk bot commented Sep 23, 2025

@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.

Comment on lines +177 to +184
# 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

Copy link
Collaborator

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.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
rfr Pull request is ready for review
Development

Successfully merging this pull request may close these issues.

2 participants