Bump aarch64 JavaFX to 17+ea9

RebeccaDeField · May 4, 2021 · 5c961e6 · 5c961e6
1 parent 561bdea
commit 5c961e6
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 9 deletions.
diff --git a/ant/javafx.xml b/ant/javafx.xml
@@ -55,7 +55,6 @@
         <property name="javafx.version" value="11.0.2"/>
         <property name="javafx.mirror" value="https://gluonhq.com/download"/>
         <property name="javafx.arch" value="aarch64"/>
-        <property name="javafx.separator" value="_"/>
         <property name="lib.dir" value="lib"/>
         <property name="dist.dir" value="out/dist"/>
         -->
@@ -71,15 +70,11 @@
         <condition property="javafx.arch" value="${javafx.aarch64.arch}">
             <equals arg1="aarch64" arg2="${jre.arch}"/>
         </condition>
-        <condition property="javafx.separator" value="${javafx.aarch64.separator}">
-            <equals arg1="aarch64" arg2="${jre.arch}"/>
-        </condition>
 
         <!-- Intel (fallback) -->
         <property name="javafx.version" value="${javafx.x86_64.version}" description="fallback"/>
         <property name="javafx.mirror" value="${javafx.x86_64.mirror}" description="fallback"/>
         <property name="javafx.arch" value="${javafx.x86_64.arch}" description="fallback"/>
-        <property name="javafx.separator" value="${javafx.x86_64.separator}" description="fallback"/>
 
         <loadresource property="javafx.version-url">
             <propertyresource name="javafx.version"/>
@@ -138,7 +133,7 @@
 
     <!-- Downloads and extracts javafx for the specified platform -->
     <target name="download-javafx-platform" depends="get-javafx-version">
-        <get src="${javafx.mirror}/openjfx-${javafx.version-url}${javafx.separator}${javafx.platform}-${javafx.arch}_bin-sdk.zip" verbose="true" dest="javafx-${javafx.platform}.zip"/>
+        <get src="${javafx.mirror}/openjfx-${javafx.version-url}-${javafx.platform}-${javafx.arch}_bin-sdk.zip" verbose="true" dest="javafx-${javafx.platform}.zip"/>
         <unzip src="javafx-${javafx.platform}.zip" dest="lib/javafx/${javafx.platform}/javafx-${javafx.version}" overwrite="true"/>
         <delete file="javafx-${javafx.platform}.zip"/>
     </target>

diff --git a/ant/project.properties b/ant/project.properties
@@ -32,13 +32,11 @@ jre.arch=${os.arch}
 javafx.x86_64.version=15.ea+3_monocle
 javafx.x86_64.mirror=https://download2.gluonhq.com/openjfx/15
 javafx.x86_64.arch=x64
-javafx.x86_64.separator=-
 
 # JavaFX ARM64
-javafx.aarch64.version=17-ea+8
+javafx.aarch64.version=17-ea+9_monocle
 javafx.aarch64.mirror=https://download2.gluonhq.com/openjfx/17
 javafx.aarch64.arch=aarch64
-javafx.aarch64.separator=_
 
 # Workaround to delay expansion of $${foo} (e.g. shell scripts)
 dollar=$