1
0
mirror of https://github.com/mitb-archive/filebot synced 2025-03-09 05:51:31 -04:00

Port to OpenJDK 11

This commit is contained in:
Reinhard Pointner 2018-10-22 03:13:34 +07:00
parent 0be7c2da2c
commit 03e7796dca
2 changed files with 21 additions and 2 deletions

View File

@ -36,6 +36,7 @@ link.release.index: https://get.filebot.net/filebot
# Build # Build
main.class: net.filebot.Main main.class: net.filebot.Main
jre.version: 11.0.1 jre.version: 11.0.1
jfx.version: 11
# Minimum System Version # Minimum System Version
jvm.version: 11 jvm.version: 11

View File

@ -96,12 +96,18 @@
<attribute name="dest" /> <attribute name="dest" />
<sequential> <sequential>
<exec executable="powershell" dir="${dir.cache}" failonerror="yes"> <exec executable="powershell" dir="${dir.cache}" failonerror="yes">
<arg line="get-java" /> <arg line="get-java get jdk x86_64" />
</exec> </exec>
<untar src="${dir.cache}/jre-${jre.version}_windows-x64_bin.tar.gz" dest="@{dest}" compression="gzip"> <untar src="${dir.cache}/jre-${jre.version}_windows-x64_bin.tar.gz" dest="@{dest}" compression="gzip">
<patternset refid="pattern.jre" /> <patternset refid="pattern.jre" />
<cutdirsmapper dirs="1" /> <cutdirsmapper dirs="1" />
</untar> </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> </sequential>
</macrodef> </macrodef>
@ -110,12 +116,18 @@
<attribute name="dest" /> <attribute name="dest" />
<sequential> <sequential>
<exec executable="get-java.sh" dir="${dir.cache}" failonerror="yes"> <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> </exec>
<untar src="${dir.cache}/jre-${jre.version}_osx-x64_bin.tar.gz" dest="@{dest}" compression="gzip"> <untar src="${dir.cache}/jre-${jre.version}_osx-x64_bin.tar.gz" dest="@{dest}" compression="gzip">
<patternset refid="pattern.jre" /> <patternset refid="pattern.jre" />
<cutdirsmapper dirs="1" /> <cutdirsmapper dirs="1" />
</untar> </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> </sequential>
</macrodef> </macrodef>
@ -130,6 +142,12 @@
<patternset refid="pattern.jre" /> <patternset refid="pattern.jre" />
<cutdirsmapper dirs="1" /> <cutdirsmapper dirs="1" />
</untar> </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> </sequential>
</macrodef> </macrodef>