jfx
jfx copied to clipboard
8339212: When build jfx in Linux(aarch64), gradle downloads the wrong eclipse swt jar
Hi,
I have updated the name of the SWT.jar that needs to be downloaded during the build process for Linux aarch64. from: IS_LINUX ? "org.eclipse.swt.gtk.linux.x86_64_3.124.200.v20231113-1355" : ""
to: IS_LINUX && IS_AARCH64 ? "org.eclipse.swt.gtk.linux.aarch64_3.124.200.v20231113-1355" : IS_LINUX && !IS_AARCH64 ? "org.eclipse.swt.gtk.linux.x86_64_3.124.200.v20231113-1355" : ""
Please review.
Regards, Anupam
Progress
- [ ] Change must be properly reviewed (1 review required, with at least 1 Reviewer)
- [x] Change must not contain extraneous whitespace
- [x] Commit message must refer to an issue
Issue
- JDK-8339212: When build jfx in Linux(aarch64), gradle downloads the wrong eclipse swt jar (Bug - P4)
Reviewing
Using git
Checkout this PR locally:
$ git fetch https://git.openjdk.org/jfx.git pull/1549/head:pull/1549
$ git checkout pull/1549
Update a local copy of the PR:
$ git checkout pull/1549
$ git pull https://git.openjdk.org/jfx.git pull/1549/head
Using Skara CLI tools
Checkout this PR locally:
$ git pr checkout 1549
View PR using the GUI difftool:
$ git pr show -t 1549
Using diff file
Download this PR as a diff file:
https://git.openjdk.org/jfx/pull/1549.diff
Webrev
:wave: Welcome back anupamdev20! 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.
@anupamdev20 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:
8339212: gradle downloads x64 binary of SWT on Linux/aarch64
Reviewed-by: kcr, sykora
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:
- e0ceafb7dba15b4faa683c336828e79f19a59d30: 8334124: Rendering issues with CSS "text-shadow" in WebView
- ca70a07b3ee712b1d06baf8a3901e6ae96070124: 8337481: File API: file.name contains path instead of name
- a53bc589ac37d490b1406a2b977097a06bf5ac74: 8339236: Suppress removal warnings for Security Manager methods in iOS sources
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.
As you do not have Committer status in this project an existing Committer must agree to sponsor your change. Possible candidates are the reviewers of this PR (@kevinrushforth) but any other Committer may sponsor as well.
➡️ To flag this PR as ready for integration with the above commit message, type /integrate in a new comment. (Afterwards, your sponsor types /sponsor in a new comment to perform the integration).
@anupamdev20 You also need to add an entry for the Linux/aarch64 jar file in gradle/verification-metadata.xml. Copy the entry for the Linux / x64 jar file and modify it as needed. Without this, the build will fail on Linux / aarch64. We don't do Linux / aarch64 builds in our CI nor is there a GHA build on Linux / aarch64. I'll file a bug for the latter.
@tiainen Would you be able to test this once Anupam has added the checksum?
Reviewers: @kevinrushforth @tiainen
/reviewers 2
@kevinrushforth The total number of required reviews for this PR (including the jcheck configuration and the last /reviewers command) is now set to 2 (with at least 1 Reviewer, 1 Author).
I updated the JBS bug title to be clearer. Can you update this PR title to match?
Hi @kevinrushforth, Thankyou for the review. Can you please let me know how to get the checksum for aarch64? I see it gets generated automatically by gradle. ( https://github.com/openjdk/jfx/tree/master/gradle#readme ) I do not have aarch64 headful machine to generate the checksum either. As you suggested, copying the entry for Linux /x64 and modifying it will have the same checksum as x86-64 which would be wrong. Please suggest.
Thanks, ~Anupam
Can you please let me know how to get the checksum for aarch64?
Download the file locally, then:
shasum -a 256 org.eclipse.swt.gtk.linux.aarch64_3.124.200.v20231113-1355.jar
Thanks @kevinrushforth. I have updated verification-metadata.xml.
Regards, Anupam
The checksum you added looks correct (it matches the one I get when I download it). I still want to run one more test.
/integrate
@anupamdev20 Your change (at version b00c2f32eecc529277bdc44d118af8642b1b01c5) is now ready to be sponsored by a Committer.
/sponsor
Going to push as commit 2bf8ffc411d404be2a3f9107a62ffa7a72fcccbd.
Since your change was applied there have been 3 commits pushed to the master branch:
- e0ceafb7dba15b4faa683c336828e79f19a59d30: 8334124: Rendering issues with CSS "text-shadow" in WebView
- ca70a07b3ee712b1d06baf8a3901e6ae96070124: 8337481: File API: file.name contains path instead of name
- a53bc589ac37d490b1406a2b977097a06bf5ac74: 8339236: Suppress removal warnings for Security Manager methods in iOS sources
Your commit was automatically rebased without conflicts.
@kevinrushforth @anupamdev20 Pushed as commit 2bf8ffc411d404be2a3f9107a62ffa7a72fcccbd.
:bulb: You may see a message that your pull request was closed with unmerged commits. This can be safely ignored.