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

8326947: Minimize MakeBase.gmk #18041

Closed
wants to merge 19 commits into from
Closed

Conversation

magicus
Copy link
Member

@magicus magicus commented Feb 28, 2024

This is part of a general "spring cleaning" of the build system, addressing old code that has bit-rotted, been subject to lava flow, or just had bad or smelly code that we've never gotten around to fix.

This particular patch tries to make MakeBase truly minimal; only including the core parts of the build system that all makefiles will need. This is now limited to essential functionality for named parameter functions, variable dependency, tool execution, logging and fixpath functionality. MakeBase still includes Utils.gmk and FileUtils.gmk, and thus "provides" this functionality as well. Separating these out as well will be the subject of a future patch.


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

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 18041

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Feb 28, 2024

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

@magicus
Copy link
Member Author

magicus commented Feb 28, 2024

I have verified using COMPARE_BUILD on windows-x64, linux-x64, linux-aarch64, macosx-x64 and macosx-aarch64 that there are no differences in the resulting build.

@openjdk openjdk bot added the rfr Pull request is ready for review label Feb 28, 2024
@openjdk
Copy link

openjdk bot commented Feb 28, 2024

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

  • build
  • client
  • compiler
  • core-libs

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.

@openjdk openjdk bot added build build-dev@openjdk.org client client-libs-dev@openjdk.org core-libs core-libs-dev@openjdk.org compiler compiler-dev@openjdk.org labels Feb 28, 2024
@mlbridge
Copy link

mlbridge bot commented Feb 28, 2024

Webrevs

@magicus
Copy link
Member Author

magicus commented Feb 28, 2024

/label -client -compiler -core-libs

@openjdk openjdk bot removed client client-libs-dev@openjdk.org compiler compiler-dev@openjdk.org core-libs core-libs-dev@openjdk.org labels Feb 28, 2024
@openjdk
Copy link

openjdk bot commented Feb 28, 2024

@magicus
The client label was successfully removed.

The compiler label was successfully removed.

The core-libs label was successfully removed.

Copy link
Member

@erikj79 erikj79 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The distinction between Utils.gmk and BaseUtils.gmk seems a bit arbitrary at a glance, especially since both are still included from MakeBase.gmk. How would you know in which file to add a new macro?

make/ReleaseFile.gmk Outdated Show resolved Hide resolved
@magicus
Copy link
Member Author

magicus commented Feb 28, 2024

The distinction was that BaseUtils.gmk are needed for MakeBase.gmk, Utils.gmk and FileUtils.gmk, but these three are not dependent on anything else. My initial goal was to stop having MakeBase.gmk include Utils.gmk as well, but it required a lot of extra includes and I did not want to do that in this PR. (Maybe it is not a good idea at all; I have not yet really decided).

I agree that the split seems a bit arbitrary. Maybe it was a bad idea. Let me ponder it for a while.

@openjdk
Copy link

openjdk bot commented Mar 13, 2024

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

8326947: Minimize MakeBase.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 2 new commits pushed to the master branch:

  • ecc603c: 8201183: sjavac build failures: "Connection attempt failed: Connection refused"
  • ff5c9a4: 8329528: G1 does not update TAMS correctly when dropping retained regions during Concurrent Start pause

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.

@bridgekeeper
Copy link

bridgekeeper bot commented Apr 11, 2024

@magicus This pull request has been inactive for more than 4 weeks and will be automatically closed if another 4 weeks passes without any activity. To avoid this, simply add a new comment to the pull request. Feel free to ask for assistance if you need help with progressing this pull request towards integration!

Copy link
Member

@erikj79 erikj79 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good now.

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Apr 11, 2024
@magicus
Copy link
Member Author

magicus commented Apr 11, 2024

/integrate

@openjdk
Copy link

openjdk bot commented Apr 11, 2024

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

  • 2e3682a: 8319678: Several tests from corelibs areas ignore VM flags
  • 63684cd: 8327250: assert(!method->is_old()) failed: Should not be installing old methods
  • ecc603c: 8201183: sjavac build failures: "Connection attempt failed: Connection refused"
  • ff5c9a4: 8329528: G1 does not update TAMS correctly when dropping retained regions during Concurrent Start pause

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated Pull request has been integrated label Apr 11, 2024
@openjdk openjdk bot closed this Apr 11, 2024
@openjdk openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Apr 11, 2024
@openjdk
Copy link

openjdk bot commented Apr 11, 2024

@magicus Pushed as commit 1606187.

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

@magicus magicus deleted the minimize-makebase branch April 11, 2024 14:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
build build-dev@openjdk.org integrated Pull request has been integrated
Development

Successfully merging this pull request may close these issues.

2 participants