-
Notifications
You must be signed in to change notification settings - Fork 563
8354986: Update to Visual Studio 2022 version 17.13.2 on Windows #1807
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
8354986: Update to Visual Studio 2022 version 17.13.2 on Windows #1807
Conversation
|
👋 Welcome back kcr! A progress list of the required criteria for merging this PR into |
|
@kevinrushforth 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: 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
Please see this link for an up-to-date comparison between the source branch of this pull request and the ➡️ To integrate this PR with the above commit message to the |
|
Reviewers: @arapte @tiainen @sashamatveev /reviewers 3 |
|
@kevinrushforth |
|
@sashamatveev I would like you to review the media Makefile changes. |
sashamatveev
left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Media changes looks good.
|
Mailing list message from Peter Hull on openjfx-dev: On Mon, 19 May 2025 at 17:14, Kevin Rushforth <kcr at openjdk.org> wrote:
Related to this, on the wiki it says that Cygwin is needed |
|
Mailing list message from Nir Lisker on openjfx-dev: The instructions could be outdated. They need another pass in any case. On Tue, May 20, 2025, 09:03 Peter Hull <peterhull90 at gmail.com> wrote:
-------------- next part -------------- |
arapte
left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM
tiainen
left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I've managed to build and do some basic testing after updating to Visual Studio 17.13.2
|
@kevinrushforth this pull request can not be integrated into git checkout 8354986-vs2022-17.13.2
git fetch https://git.openjdk.org/jfx.git master
git merge FETCH_HEAD
# resolve conflicts and follow the instructions given by git merge
git commit -m "Merge master"
git push |
|
I merged with master to resolve the trivial merge conflict (kdiff3 resolved the conflict automatically). As a result, a re-review is required. |
|
/integrate |
|
Going to push as commit a1c5b1c.
Your commit was automatically rebased without conflicts. |
|
@kevinrushforth Pushed as commit a1c5b1c. 💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored. |
This PR updates the compiler on Windows to Visual Studio 2022 17.13.2 (from 17.6.5) to match JDK 25.
I ran a full headless and headful test run, including building media and WebKit. All tests pass.
NOTE: There is a compatibility issue, introduced in VS 2022 17.10, that is seen when compiling with a more recent version of Visual Studio and running against an older
msvcp140.dll. A workaround is documented in the VS 2022 17.10 release notes and is implemented by this PR. Without the workaround of compiling with_DISABLE_CONSTEXPR_MUTEX_CONSTRUCTORWebKit crashes in the ICU library when run on JDK 24 or earlier, since the version ofmsvcp140.dllin JDK 24 is the one from 17.6.5 (the JDK loads itsmsvcp140.dllfirst, causing the one we redistribute to be ignored). With this workaround, we can run both on older JDKs and on JDK 25.Progress
Issue
Reviewers
Reviewing
Using
gitCheckout this PR locally:
$ git fetch https://git.openjdk.org/jfx.git pull/1807/head:pull/1807$ git checkout pull/1807Update a local copy of the PR:
$ git checkout pull/1807$ git pull https://git.openjdk.org/jfx.git pull/1807/headUsing Skara CLI tools
Checkout this PR locally:
$ git pr checkout 1807View PR using the GUI difftool:
$ git pr show -t 1807Using diff file
Download this PR as a diff file:
https://git.openjdk.org/jfx/pull/1807.diff
Using Webrev
Link to Webrev Comment