eessppeelllloo/processing4
1
0
Fork 0
mirror of https://github.com/processing/processing4.git synced 2026-01-26 18:01:07 +01:00
Code Issues Packages Projects Releases Wiki Activity

finish replacing JDK 11 and JavaFX 16 with JDK 17 and JavaFX 17 (fixes #285)

Browse Source
This commit is contained in:
Ben Fry
2021-10-05 22:04:06 -04:00
parent a1e0d78edb
commit 80f74c1cdf
3 changed files with 17 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
java/libraries/javafx/.gitignore vendored
View File

@@ -1,5 +1,5 @@
# ignore the sdk download files
javafx-*-sdk-*.zip
javafx-*.zip
# everything is downloaded from online
/library

19
java/libraries/javafx/build.xml
View File

@@ -41,7 +41,7 @@
https://gluonhq.com/download/javafx-16-sdk-linux
-->
<!-- JavaFX was removed from the Oracle's JDK for ARM and Java 11.
<!-- JavaFX was removed from the Oracle JDK for ARM and Java 11.
There are arm32 and aarch64 builds for Linux (compatible with the Pi?)
but they're Early Access releases of JavaFX 17.
Downloads page is at https://gluonhq.com/products/javafx/
@@ -56,8 +56,12 @@
versions. Not a good way to mix, unless have unique JARs for each platform,
which would be ~60 MB extra (for platforms that are < 2% usage). -->
<!--
https://download2.gluonhq.com/openjfx/17.0.0.1/openjfx-17.0.0.1_linux-x64_bin-sdk.zip
https://download2.gluonhq.com/openjfx/17.0.0.1/openjfx-17.0.0.1_osx-x64_bin-sdk.zip
-->
<target name="retrieve-gluon">
<get src="https://gluonhq.com/download/${gluon.base}"
<get src="https://download2.gluonhq.com/openjfx/${gluon.version}/openjfx-${gluon.version}_${platform.name}-x64_bin-sdk.zip"
dest="${gluon.base}.zip"
usetimestamp="true" />
@@ -111,7 +115,7 @@
</target>
<target name="download-javafx">
<property name="gluon.version" value="16" />
<property name="gluon.version" value="17.0.0.1" />
<!-- current Early Access version, includes support for other architectures -->
<!-- <property name="gluon.version" value="17-ea" /> -->
@@ -120,17 +124,20 @@
<!-- javafx-${gluon.version}-sdk-${gluon.platform} -->
<antcall target="retrieve-gluon">
<param name="gluon.base" value="javafx-${gluon.version}-sdk-mac" />
<param name="gluon.base" value="javafx-${gluon.version}-macos" />
<param name="platform.name" value="osx" />
<param name="platform.path" value="${library.path}/macosx" />
</antcall>
<antcall target="retrieve-gluon">
<param name="gluon.base" value="javafx-${gluon.version}-sdk-windows" />
<param name="gluon.base" value="javafx-${gluon.version}-windows" />
<param name="platform.name" value="windows" />
<param name="platform.path" value="${library.path}/windows64" />
</antcall>
<antcall target="retrieve-gluon">
<param name="gluon.base" value="javafx-${gluon.version}-sdk-linux" />
<param name="gluon.base" value="javafx-${gluon.version}-linux" />
<param name="platform.name" value="linux" />
<param name="platform.path" value="${library.path}/linux64" />
</antcall>
</target>