8349665: Make clean removes module-deps.gmk

[magicus]

After JDK-8292944, we only generate module-deps.gmk once at the start of Init.gmk. This causes make clean <some other target> to first generate and then remove module-deps.gmk after which the rest of the build proceeds without a module-deps.gmk, causing problems with dependencies.

---

Progress

• Change must be properly reviewed (1 review required, with at least 1 Reviewer)
• Change must not contain extraneous whitespace
• Commit message must refer to an issue

Issue

• JDK-8349665: Make clean removes module-deps.gmk (Bug - P3)

Reviewers

• Erik Joelsson (@erikj79 - Reviewer)

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk.git pull/24406/head:pull/24406
$ git checkout pull/24406

Update a local copy of the PR:
$ git checkout pull/24406
$ git pull https://git.openjdk.org/jdk.git pull/24406/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 24406

View PR using the GUI difftool:
$ git pr show -t 24406

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk/pull/24406.diff

Using Webrev

Link to Webrev Comment

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

8349665: Make clean removes module-deps.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 1 new commit pushed to the master branch:

• 11ad173: 8354944: Remove unnecessary PartiallyOrderedSet.nodes

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]

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

• build

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

[magicus]

Due to known upcoming merge conflicts, I will not try to integrate this until after JDK-8350774. They are not strictly dependent on each other, but JDK-8350774 will cause a merge conflict for this patch, and vice versa.

[mlbridge]

Webrevs

• 02: Full - Incremental (eea2b709)
• 01: Full - Incremental (dad99084)
• 00: Full (f8a50cd1)

[erikj79]

This doesn't seem to solve the issue for me. Running make clean java.base-java fails for me and it looks like it starts compiling all the interim langtools modules at once and getting errors like this:

Compiling up to 136 files for BUILD_java.compiler.interim
Compiling up to 360 files for BUILD_jdk.compiler.interim
Compiling up to 145 files for BUILD_jdk.internal.md.interim
Compiling up to 213 files for BUILD_jdk.javadoc.interim
Compiling up to 17 files for BUILD_JAVAC_SERVER
/Users/erik/dev/jdk/build/macosx-aarch64/buildtools/gensrc/jdk.internal.md.interim/module-info.java:51: error: module not found: jdk.compiler.interim
    requires jdk.compiler.interim;

[magicus]

Dang it! I tried a lot of approaches in a throwaway branch, and I thought I kept the correct one and tested it. Back to the drawing board, I guess. Thanks for double checking!

[magicus]

Now I believe it should work for real this time.

[magicus]

Well it works, but causes a regression of JDK-8292944 ("make help" as the first target after configure). sigh

[magicus]

It turns out there had already been a partial regression of JDK-8292944 by JDK-8349515... This is now fixed as well.

Third time's a charm! Now this should really, really work. (And we should really, really have a regression testing framework for the build system 😭).

[magicus]

/integrate

[openjdk]

Going to push as commit f25f4a3.
Since your change was applied there have been 2 commits pushed to the master branch:

• 2e8b195: 8354078: Implement JEP 521: Generational Shenandoah
• 11ad173: 8354944: Remove unnecessary PartiallyOrderedSet.nodes

Your commit was automatically rebased without conflicts.

[openjdk]

@magicus Pushed as commit f25f4a3.

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