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

8264425: Update building.md on non-English locales on Windows #16694

Closed
wants to merge 6 commits into from

Conversation

magicus
Copy link
Member

@magicus magicus commented Nov 16, 2023

Update the build documentation to reflect the fact that non-English locales are only supported on a "best effort" principle, and add instructions how to install the necessary language pack to Visual Studio.


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-8264425: Update building.md on non-English locales on Windows (Bug - P3)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 16694

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Nov 16, 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 openjdk bot added the rfr Pull request is ready for review label Nov 16, 2023
@openjdk
Copy link

openjdk bot commented Nov 16, 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 16, 2023
@mlbridge
Copy link

mlbridge bot commented Nov 16, 2023

Webrevs

doc/building.md Outdated Show resolved Hide resolved
doc/building.html Outdated Show resolved Hide resolved
@magicus
Copy link
Member Author

magicus commented Nov 20, 2023

The entire markdown file with the changes can be viewed here:
https://github.com/magicus/jdk/blob/readme-locale/doc/building.md#windows

Copy link
Member

@naotoj naotoj left a comment

Choose a reason for hiding this comment

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

Thanks for the changes @magicus. This version looks very good in terms of the Windows locale environment.

@openjdk
Copy link

openjdk bot commented Nov 20, 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 readme-locale
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 20, 2023
@magicus
Copy link
Member Author

magicus commented Nov 21, 2023

/integrate

@openjdk
Copy link

openjdk bot commented Nov 21, 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:

8264425: Update building.md on non-English locales on Windows

Reviewed-by: naoto, 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.

@openjdk openjdk bot added ready Pull request is ready to be integrated and removed merge-conflict Pull request has merge conflict with target branch labels Nov 21, 2023
@openjdk
Copy link

openjdk bot commented Nov 21, 2023

Going to push as commit e055fae.
Since your change was applied there has been 1 commit pushed to the master branch:

  • c4aee66: 8320222: Wrong bytecode accepted, and StackMap table generated

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated Pull request has been integrated label Nov 21, 2023
@openjdk openjdk bot closed this Nov 21, 2023
@openjdk openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Nov 21, 2023
@magicus magicus deleted the readme-locale branch November 21, 2023 10:09
@openjdk
Copy link

openjdk bot commented Nov 21, 2023

@magicus Pushed as commit e055fae.

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

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.

3 participants