From 03e7796dca0c247c23ba4e5e10c372a55f1032cd Mon Sep 17 00:00:00 2001
From: Reinhard Pointner <rednoah@filebot.net>
Date: Mon, 22 Oct 2018 03:13:34 +0700
Subject: [PATCH] Port to OpenJDK 11

---
 app.properties |  1 +
 build.xml      | 22 ++++++++++++++++++++--
 2 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/app.properties b/app.properties
index 898cbece..4c37daf0 100644
--- a/app.properties
+++ b/app.properties
@@ -36,6 +36,7 @@ link.release.index: https://get.filebot.net/filebot
 # Build
 main.class: net.filebot.Main
 jre.version: 11.0.1
+jfx.version: 11
 
 # Minimum System Version
 jvm.version: 11
diff --git a/build.xml b/build.xml
index e4fa7677..3e05d691 100644
--- a/build.xml
+++ b/build.xml
@@ -96,12 +96,18 @@
 		<attribute name="dest" />
 		<sequential>
 			<exec executable="powershell" dir="${dir.cache}" failonerror="yes">
-				<arg line="get-java" />
+				<arg line="get-java get jdk x86_64" />
 			</exec>
 			<untar src="${dir.cache}/jre-${jre.version}_windows-x64_bin.tar.gz" dest="@{dest}" compression="gzip">
 				<patternset refid="pattern.jre" />
 				<cutdirsmapper dirs="1" />
 			</untar>
+			<exec executable="powershell" dir="${dir.cache}" failonerror="yes">
+				<arg line="get-java get jfx x86_64" />
+			</exec>
+			<unzip src="${dir.cache}/openjfx-${jfx.version}_windows-x64_bin-sdk.zip" dest="@{dest}/ext/jfx">
+				<cutdirsmapper dirs="1" />
+			</unzip>
 		</sequential>
 	</macrodef>
 
@@ -110,12 +116,18 @@
 		<attribute name="dest" />
 		<sequential>
 			<exec executable="get-java.sh" dir="${dir.cache}" failonerror="yes">
-				<arg line="get jre x86_64 Darwin" />
+				<arg line="get jdk x86_64 Darwin" />
 			</exec>
 			<untar src="${dir.cache}/jre-${jre.version}_osx-x64_bin.tar.gz" dest="@{dest}" compression="gzip">
 				<patternset refid="pattern.jre" />
 				<cutdirsmapper dirs="1" />
 			</untar>
+			<exec executable="get-java.sh" dir="${dir.cache}" failonerror="yes">
+				<arg line="get jfx x86_64 Darwin" />
+			</exec>
+			<unzip src="${dir.cache}/openjfx-${jfx.version}_osx-x64_bin-sdk.zip" dest="@{dest}/ext/jfx">
+				<cutdirsmapper dirs="1" />
+			</unzip>
 		</sequential>
 	</macrodef>
 
@@ -130,6 +142,12 @@
 				<patternset refid="pattern.jre" />
 				<cutdirsmapper dirs="1" />
 			</untar>
+			<exec executable="get-java.sh" dir="${dir.cache}" failonerror="yes">
+				<arg line="get jfx x86_64 Linux" />
+			</exec>
+			<unzip src="${dir.cache}/openjfx-${jfx.version}_linux-x64_bin-sdk.zip" dest="@{dest}/ext/jfx">
+				<cutdirsmapper dirs="1" />
+			</unzip>
 		</sequential>
 	</macrodef>