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

8257758: Allow building of JavaFX native libs for Apple Silicon #363

Closed
wants to merge 2 commits into from

Conversation

@johanvos
Copy link
Collaborator

@johanvos johanvos commented Dec 8, 2020

Fix for JDK-8257758

In case the -PtargetArch=arm64 option is supplied to the gradle build, the
native components that are part of the JavaFX build will target this platform.


Progress

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

Issue

  • JDK-8257758: Allow building of JavaFX native libs for Apple Silicon

Reviewers

Download

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

Fix for JDK-8257758

In case the -PtargetArch=arm64 option is supplied to the gradle build, the
native components that are part of the JavaFX build will target this platform.
@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented Dec 8, 2020

👋 Welcome back jvos! 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 label Dec 8, 2020
@mlbridge
Copy link

@mlbridge mlbridge bot commented Dec 8, 2020

Webrevs

@johanvos johanvos requested a review from kevinrushforth Dec 8, 2020
Copy link
Member

@kevinrushforth kevinrushforth left a comment

I haven't tested it yet. I made a naming suggestion, but otherwise looks OK.

buildSrc/mac.gradle Outdated Show resolved Hide resolved
buildSrc/mac.gradle Outdated Show resolved Hide resolved
Copy link
Member

@kevinrushforth kevinrushforth left a comment

Looks good.

@openjdk
Copy link

@openjdk openjdk bot commented Dec 9, 2020

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

8257758: Allow building of JavaFX native libs for Apple Silicon

Reviewed-by: kcr

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

  • 1a8652a: 8257719: JFXPanel scene fails to render correctly on HiDPI after fix for JDK-8199592
  • 7fa02fe: 8257897: Fix webkit build for XCode 12
  • 794ffc0: 8231372: JFXPanel fails to render if setScene called on Swing thread

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 label Dec 9, 2020
@johanvos
Copy link
Collaborator Author

@johanvos johanvos commented Dec 9, 2020

/integrate

@openjdk openjdk bot closed this Dec 9, 2020
@openjdk openjdk bot added integrated and removed ready rfr labels Dec 9, 2020
@openjdk
Copy link

@openjdk openjdk bot commented Dec 9, 2020

@johanvos Since your change was applied there have been 3 commits pushed to the master branch:

  • 1a8652a: 8257719: JFXPanel scene fails to render correctly on HiDPI after fix for JDK-8199592
  • 7fa02fe: 8257897: Fix webkit build for XCode 12
  • 794ffc0: 8231372: JFXPanel fails to render if setScene called on Swing thread

Your commit was automatically rebased without conflicts.

Pushed as commit e1adfa9.

💡 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
2 participants