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

8349665: Make clean removes module-deps.gmk #24406

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from

Conversation

magicus
Copy link
Member

@magicus magicus commented Apr 3, 2025

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)

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
Copy link

bridgekeeper bot commented Apr 3, 2025

👋 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
Copy link

openjdk bot commented Apr 3, 2025

❗ This change is not yet ready to be integrated.
See the Progress checklist in the description for automated requirements.

@openjdk
Copy link

openjdk bot commented Apr 3, 2025

@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
Copy link
Member Author

magicus commented Apr 3, 2025

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.

@magicus magicus force-pushed the fix-clean-module-deps branch from 1689fa7 to f8a50cd Compare April 4, 2025 14:31
@magicus magicus marked this pull request as ready for review April 4, 2025 14:31
@openjdk openjdk bot added the rfr Pull request is ready for review label Apr 4, 2025
@mlbridge
Copy link

mlbridge bot commented Apr 4, 2025

Webrevs

@erikj79
Copy link
Member

erikj79 commented Apr 7, 2025

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 magicus marked this pull request as draft April 7, 2025 20:34
@magicus
Copy link
Member Author

magicus commented Apr 7, 2025

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!

@openjdk openjdk bot removed the rfr Pull request is ready for review label Apr 7, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Development

Successfully merging this pull request may close these issues.

2 participants