Skip to content
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

8260406: Do not copy pure java source code to gensrc #2233

Closed

Conversation

@magicus
Copy link
Member

@magicus magicus commented Jan 26, 2021

For java.base gensrc we do the following:

# Copy two Java files that need no preprocessing.
$(SUPPORT_OUTPUTDIR)/gensrc/java.base/java/lang/%.java: $(CHARACTERDATA_TEMPLATES)/%.java.template
$(call LogInfo, Generating $(@F))
$(call install-file)

GENSRC_CHARACTERDATA += $(SUPPORT_OUTPUTDIR)/gensrc/java.base/java/lang/CharacterDataUndefined.java \
    $(SUPPORT_OUTPUTDIR)/gensrc/java.base/java/lang/CharacterDataPrivateUse.java

What this means is that we have two "template" files that are just compiled as java files, but only after being copied to gensrc. :-)

We should just rename these files to java and move them to the normal source directory.


Progress

  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue
  • Change must be properly reviewed

Issue

  • JDK-8260406: Do not copy pure java source code to gensrc

Reviewers

Download

$ git fetch https://git.openjdk.java.net/jdk pull/2233/head:pull/2233
$ git checkout pull/2233

@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented Jan 26, 2021

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

@openjdk openjdk bot added the rfr label Jan 26, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Jan 26, 2021

@magicus The following labels will be automatically applied to this pull request:

  • build
  • core-libs
  • i18n

When this pull request is ready to be reviewed, an "RFR" email will be sent to the corresponding mailing lists. If you would like to change these labels, use the /label pull request command.

@mlbridge
Copy link

@mlbridge mlbridge bot commented Jan 26, 2021

Webrevs

Copy link
Contributor

@AlanBateman AlanBateman left a comment

Good. I notice the comment in both source files says "Java.lang.Character" rather than "java.lang.Character", probably should fix that at some point.

@openjdk
Copy link

@openjdk openjdk bot commented Jan 26, 2021

@magicus 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:

8260406: Do not copy pure java source code to gensrc

Reviewed-by: alanb, erikj

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 4 new commits pushed to the master branch:

  • 5e8e0ad: 8242456: PreviewFeature.Feature enum removal of TEXT_BLOCKS
  • e080ce9: 8252545: runtime/ErrorHandling/TestHeapDumpOnOutOfMemoryError.java timed out
  • edd2707: 8260408: Shenandoah: adjust inline hints after JDK-8255019
  • 81a66df: 8259809: Remove PerfEvent class loading locking counters

Please see this link for an up-to-date comparison between the source branch of this pull request and the master branch.
As there are no conflicts, your changes will automatically be rebased on top of these commits when integrating. If you prefer to avoid this automatic rebasing, please check the documentation for the /integrate command for further details.

➡️ To integrate this PR with the above commit message to the master branch, type /integrate in a new comment.

@openjdk openjdk bot added the ready label Jan 26, 2021
@magicus
Copy link
Member Author

@magicus magicus commented Jan 26, 2021

/integrate

@openjdk openjdk bot closed this Jan 26, 2021
@openjdk openjdk bot added integrated and removed ready rfr labels Jan 26, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Jan 26, 2021

@magicus Since your change was applied there have been 4 commits pushed to the master branch:

  • 5e8e0ad: 8242456: PreviewFeature.Feature enum removal of TEXT_BLOCKS
  • e080ce9: 8252545: runtime/ErrorHandling/TestHeapDumpOnOutOfMemoryError.java timed out
  • edd2707: 8260408: Shenandoah: adjust inline hints after JDK-8255019
  • 81a66df: 8259809: Remove PerfEvent class loading locking counters

Your commit was automatically rebased without conflicts.

Pushed as commit 8d2f77f.

💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored.

@magicus magicus deleted the magicus:unmodified-templates-are-not-templates branch Jan 29, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
3 participants