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

8242507: Add support for Visual Studio 2019 #195

Closed

Conversation

@kevinrushforth
Copy link
Member

@kevinrushforth kevinrushforth commented Apr 22, 2020

This PR adds support for Microsoft Visual Studio 2019 (VS 2019), but does not change the default compiler, which remains at VS 2017 15.9.16. Changing the build compiler to VS 2019 will be proposed in a future PR using a new bug ID, and isn't planned until after the JDK updates their compiler.

In order to allow developer builds to use Microsoft Visual Studio 2019, we need the following changes at build time and runtime.

At build time:

  1. Copy vsruntime140_1.dll (if present) to output sdk/bin dir
  2. Don't copy the unused concrt140.dll (it is not used in VS 2017 either)

At runtime:

  1. Load vsruntime140_1.dll if present
  2. Don't load the unused concrt140.dll

Additionally, I removed two unused build variables, ext.MSVCR and ext.MSVCP, which would otherwise have needed to be updated.

I have done a full build and test run using both VS 2017 (which is still the default), and VS 2019.


Progress

  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue
  • Change must be properly reviewed

Issue

Reviewers

  • Ambarish Rapte (arapte - Reviewer)
  • Johan Vos (jvos - Reviewer)

Download

$ git fetch https://git.openjdk.java.net/jfx pull/195/head:pull/195
$ git checkout pull/195

Load vsruntime140_1.dll if present
@kevinrushforth kevinrushforth self-assigned this Apr 22, 2020
@kevinrushforth kevinrushforth requested a review from johanvos Apr 22, 2020
@kevinrushforth
Copy link
Member Author

@kevinrushforth kevinrushforth commented Apr 22, 2020

/reviewers 2

@kevinrushforth
Copy link
Member Author

@kevinrushforth kevinrushforth commented Apr 22, 2020

@arapte can you be the second reviewer on this?

@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented Apr 22, 2020

👋 Welcome back kcr! A progress list of the required criteria for merging this PR into master will be added to the body of your pull request.

@openjdk openjdk bot added the rfr label Apr 22, 2020
@openjdk
Copy link

@openjdk openjdk bot commented Apr 22, 2020

@kevinrushforth
The number of required reviews for this PR is now set to 2 (with at least 1 of role reviewers).

@mlbridge
Copy link

@mlbridge mlbridge bot commented Apr 22, 2020

Webrevs

@arapte
arapte approved these changes May 5, 2020
Copy link
Member

@arapte arapte left a comment

Looks good to me, verified the build locally.

Copy link
Collaborator

@johanvos johanvos left a comment

Confirmed to work on our build systems.

@openjdk
Copy link

@openjdk openjdk bot commented May 5, 2020

@kevinrushforth This change now passes all automated pre-integration checks. When the change also fulfills all project specific requirements, type /integrate in a new comment to proceed. After integration, the commit message will be:

8242507: Add support for Visual Studio 2019

Reviewed-by: arapte, jvos
  • If you would like to add a summary, use the /summary command.
  • To credit additional contributors, use the /contributor command.
  • To add additional solved issues, use the /solves command.

Since the source branch of this PR was last updated there have been 20 commits pushed to the master branch:

  • 2e90076: 8242507: Add support for Visual Studio 2019
  • 39d9c3b: 8244110: NPE in MenuButtonSkinBase change listener
  • 99f7747: 8241999: ChoiceBox: incorrect toggle selected for uncontained
  • 1cae6a8: 8176499: Dependence on java.util.Timer freezes screen when OS time resets backwards
  • 2b9eb52: 8237504: Update copyright header for files modified in 2020
  • 3130fc8: 8198402: ToggleButton.setToggleGroup causes memory leak when button is removed via ToggleGroup.getToggles()
  • 8ad5805: 8191758: Match WebKit's font weight rendering with JavaFX
  • 66c3b38: 8227425: Add support for e-paper displays on i.MX6 devices
  • e30049f: 8242077: Add information about HTTP/2 and HttpClient usage in WebEngine
  • e0ffca3: 8242505: Some WebKit tests might fail because Microsoft libraries are not loaded
  • ... and 10 more: https://git.openjdk.java.net/jfx/compare/7044cefbbd824027581382dd25aaa540aa0eae1a...master

As there are no conflicts, your changes will automatically be rebased on top of these commits when integrating. If you prefer to avoid automatic rebasing, please merge master into your branch, and then specify the current head hash when integrating, like this: /integrate 2e900764e6dc80d21f50146fc7dcf1771ba1400b.

➡️ 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 label May 5, 2020
@kevinrushforth
Copy link
Member Author

@kevinrushforth kevinrushforth commented May 5, 2020

/integrate

@openjdk openjdk bot closed this May 5, 2020
@openjdk openjdk bot added integrated and removed ready labels May 5, 2020
@openjdk
Copy link

@openjdk openjdk bot commented May 5, 2020

@kevinrushforth The following commits have been pushed to master since your change was applied:

  • 39d9c3b: 8244110: NPE in MenuButtonSkinBase change listener
  • 99f7747: 8241999: ChoiceBox: incorrect toggle selected for uncontained
  • 1cae6a8: 8176499: Dependence on java.util.Timer freezes screen when OS time resets backwards
  • 2b9eb52: 8237504: Update copyright header for files modified in 2020
  • 3130fc8: 8198402: ToggleButton.setToggleGroup causes memory leak when button is removed via ToggleGroup.getToggles()
  • 8ad5805: 8191758: Match WebKit's font weight rendering with JavaFX
  • 66c3b38: 8227425: Add support for e-paper displays on i.MX6 devices
  • e30049f: 8242077: Add information about HTTP/2 and HttpClient usage in WebEngine
  • e0ffca3: 8242505: Some WebKit tests might fail because Microsoft libraries are not loaded
  • ceb3fce: 8087555: [ChoiceBox] uncontained value not shown
  • 818ac00: 8175358: Memory leak when moving MenuButton into another Scene
  • 91d4c8b: 8241737: TabPaneSkin memory leak on replacing selectionModel
  • 48476eb: 8241582: Infinite animation does not start from the end when started with a negative rate
  • dedf7cb: 8242490: Upgrade to gcc 9.2 on Linux
  • 5e9fb82: 8242577: Cell selection fails on iOS most of the times
  • 69e4266: 8242489: ChoiceBox: initially toggle not sync'ed to selection
  • 1d88180: 8243112: Skip failing test SVGTest.testSVGRenderingWithPattern
  • ec8608f: 8223298: SVG patterns are drawn wrong
  • e82046e: 8242530: [macos] Some audio files miss spectrum data when another audio file plays first

Your commit was automatically rebased without conflicts.

Pushed as commit 2e90076.

@openjdk openjdk bot removed the rfr label May 5, 2020
@kevinrushforth kevinrushforth deleted the kevinrushforth:8242507-vs2019-prep branch May 26, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Linked issues

Successfully merging this pull request may close these issues.

None yet

3 participants