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

8320763: Fix spacing arround assignment in spec.gmk.in #16825

Closed
wants to merge 3 commits into from

Conversation

magicus
Copy link
Member

@magicus magicus commented Nov 27, 2023

For some reason, we have not been consistent with using spaces around the assignment operators (:= and =) in spec.gmk.in. This has annoyed me for a long time.

When making this change, I noticed that there are a lot of late evaluation assignments (= instead of :=) that should not be there. To not confuse the code review, I will fix these separately. Thus this change will only change whitespace.


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-8320763: Fix spacing arround assignment in spec.gmk.in (Bug - P5)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 16825

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

Using diff file

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

Webrev

Link to Webrev Comment

@magicus magicus marked this pull request as draft November 27, 2023 14:12
@bridgekeeper
Copy link

bridgekeeper bot commented Nov 27, 2023

👋 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 Nov 27, 2023

@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 spec-cleanup-whitespace
git fetch https://git.openjdk.org/jdk.git master
git merge FETCH_HEAD
# resolve conflicts and follow the instructions given by git merge
git commit -m "Merge master"
git push

@openjdk openjdk bot added the merge-conflict Pull request has merge conflict with target branch label Nov 27, 2023
@openjdk
Copy link

openjdk bot commented Nov 27, 2023

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

@openjdk openjdk bot added the build build-dev@openjdk.org label Nov 27, 2023
@magicus magicus marked this pull request as ready for review November 27, 2023 14:17
@magicus
Copy link
Member Author

magicus commented Nov 27, 2023

/integrate auto

@openjdk openjdk bot added rfr Pull request is ready for review auto and removed merge-conflict Pull request has merge conflict with target branch labels Nov 27, 2023
@openjdk
Copy link

openjdk bot commented Nov 27, 2023

@magicus This pull request will be automatically integrated when it is ready

@mlbridge
Copy link

mlbridge bot commented Nov 27, 2023

Webrevs

@erikj79
Copy link
Member

erikj79 commented Nov 27, 2023

When making this change, I noticed that there are a lot of late evaluation assignments (= instead of :=) that should not be there.

Just be sure to not change those that are on purpose. At least some of them are interacting with the bootcycle and buildjdk spec files.

@openjdk
Copy link

openjdk bot commented Nov 27, 2023

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

8320763: Fix spacing arround assignment in spec.gmk.in

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

  • 12e983a: 8194743: Compiler implementation for Statements before super()
  • 5e24aaf: 8320001: javac crashes while adding type annotations to the return type of a constructor
  • f9e9131: 8319703: Serial: Remove generationSpec
  • a006d7e: 8294549: configure script should detect unsupported path
  • 4977922: 8320330: Improve implementation of RShift Value

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 Pull request is ready to be integrated label Nov 27, 2023
@openjdk
Copy link

openjdk bot commented Nov 27, 2023

/integrate

@openjdk
Copy link

openjdk bot commented Nov 27, 2023

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

  • 12e983a: 8194743: Compiler implementation for Statements before super()
  • 5e24aaf: 8320001: javac crashes while adding type annotations to the return type of a constructor
  • f9e9131: 8319703: Serial: Remove generationSpec
  • a006d7e: 8294549: configure script should detect unsupported path
  • 4977922: 8320330: Improve implementation of RShift Value

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Nov 27, 2023

@openjdk[bot] Pushed as commit f0a12c5.

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

@magicus magicus deleted the spec-cleanup-whitespace branch November 28, 2023 15:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
auto build build-dev@openjdk.org integrated Pull request has been integrated
Development

Successfully merging this pull request may close these issues.

3 participants