8258407: Split up CompileJavaModules.gmk into make/modules/$M/Java.gmk

[magicus]

Right now CompileJavaModules.gmk contains two different part: one part with the functionality needed to compile a java module, and one part were all special requirements for all modules are listed.

The second part should be removed from CompileJavaModules.gmk, and instead listed directly for each individual module in make/modules/$M/Java.gmk.

I used a special-written shell script to automatically extract the module-specific part from CompileJavaModules.gmk into the respective Java.gmk files, to avoid risking any hard-to-detect copy/paste errors. After this I did a sed -i to remove the module-specific prefix. All this makes me confident that I have correctly moved the variables (I realize this is hard to verify from the patch).

---

Progress

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

Issue

• JDK-8258407: Split up CompileJavaModules.gmk into make/modules/$M/Java.gmk

Reviewers

• Erik Joelsson (@erikj79 - Reviewer) ⚠️ Review applies to a869f4b

Download

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

[bridgekeeper]

👋 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]

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

• 2d
• build
• compiler
• core-libs
• hotspot-jfr
• kulla
• net
• serviceability

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.

[magicus]

/label remove 2d compiler core-libs hotspot-jfr kulla net serviceability

[openjdk]

@magicus
The 2d label was successfully removed.

The compiler label was successfully removed.

The core-libs label was successfully removed.

The hotspot-jfr label was successfully removed.

The kulla label was successfully removed.

The net label was successfully removed.

The serviceability label was successfully removed.

[mlbridge]

Webrevs

• 03: Full (6cb110a)
• 02: Full - Incremental (a869f4b)
• 01: Full - Incremental (1e1cb85)
• 00: Full (09b5bee)

[erikj79]

Looks good to me. I assume you have run compare builds on all platforms.

[openjdk]

@magicus this pull request can not be integrated into master due to one or more merge conflicts. To resolve these merge conflicts and update this pull request you can run the following commands in the local repository for your personal fork:

git checkout modularize-java-part
git fetch https://git.openjdk.java.net/jdk master
git merge FETCH_HEAD
# resolve conflicts and follow the instructions given by git merge
git commit -m "Merge master"
git push

[magicus]

@erikj79 Actually, I had not done that. But it was a great idea. Now I have, and it looks good. :-)

[openjdk]

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

8258407: Split up CompileJavaModules.gmk into make/modules/$M/Java.gmk

Reviewed-by: 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 no new commits pushed to the master branch. If another commit should be pushed before you perform the /integrate command, your PR will be automatically rebased. If you prefer to avoid any potential 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.

[magicus]

/integrate

[openjdk]

@magicus Pushed as commit 1bd015f.

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