1
0
mirror of https://github.com/mitb-archive/filebot synced 2024-12-22 15:58:52 -05:00

Update JDK8 patch

This commit is contained in:
Reinhard Pointner 2018-06-27 23:39:56 +07:00
parent b1f10e7353
commit b06ca48fe8

View File

@ -46,7 +46,7 @@ index 1a9fafe3..4e4be0e2 100644
# Default Windows Java Options # Default Windows Java Options
windows.application.options: -Dapplication.help=show -Dapplication.dir="%APPDATA%\\FileBot" -Dapplication.dir="%APPDATA%\\FileBot" -Djava.io.tmpdir="%APPDATA%\\FileBot\\tmp" -Dnet.filebot.AcoustID.fpcalc="%EXEDIR%\\lib\\fpcalc.exe" -Djna.boot.library.path="%EXEDIR%\\lib" -Djna.library.path="%EXEDIR%\\lib" -Djava.library.path="%EXEDIR%\\lib" windows.application.options: -Dapplication.help=show -Dapplication.dir="%APPDATA%\\FileBot" -Dapplication.dir="%APPDATA%\\FileBot" -Djava.io.tmpdir="%APPDATA%\\FileBot\\tmp" -Dnet.filebot.AcoustID.fpcalc="%EXEDIR%\\lib\\fpcalc.exe" -Djna.boot.library.path="%EXEDIR%\\lib" -Djna.library.path="%EXEDIR%\\lib" -Djava.library.path="%EXEDIR%\\lib"
diff --git a/build.xml b/build.xml diff --git a/build.xml b/build.xml
index a156632f..bd76f8e1 100644 index c9feebce..7aadfbef 100644
--- a/build.xml --- a/build.xml
+++ b/build.xml +++ b/build.xml
@@ -93,9 +93,10 @@ @@ -93,9 +93,10 @@
@ -61,16 +61,16 @@ index a156632f..bd76f8e1 100644
<patternset refid="pattern.jre" /> <patternset refid="pattern.jre" />
<cutdirsmapper dirs="1" /> <cutdirsmapper dirs="1" />
</untar> </untar>
@@ -216,7 +217,7 @@ @@ -219,7 +220,7 @@
</groovy> </manifestclasspath>
<!-- compile --> <!-- compile -->
- <javac srcdir="${dir.source}" destdir="${dir.build}" release="${jvm.version}" encoding="utf-8" debug="yes" debuglevel="lines,vars,source" includeAntRuntime="no"> - <javac srcdir="${dir.source}" destdir="${dir.build}" release="${jvm.version}" encoding="utf-8" debug="yes" includeAntRuntime="no">
+ <javac srcdir="${dir.source}" destdir="${dir.build}" target="${jvm.version}" source="${jvm.version}" encoding="utf-8" debug="yes" debuglevel="lines,vars,source" includeAntRuntime="no"> + <javac srcdir="${dir.source}" destdir="${dir.build}" target="${jvm.version}" source="${jvm.version}" encoding="utf-8" debug="yes" includeAntRuntime="no">
<classpath> <classpath refid="jar.classpath" />
<fileset dir="${dir.dist}/lib" /> </javac>
</classpath>
@@ -255,7 +256,7 @@ @@ -256,7 +257,7 @@
<fileset dir="${dir.installer}/appx" includes="*.exe, **/*.png" /> <fileset dir="${dir.installer}/appx" includes="*.exe, **/*.png" />
</copy> </copy>
<copy todir="${dir.staging}/lib"> <copy todir="${dir.staging}/lib">
@ -79,7 +79,7 @@ index a156632f..bd76f8e1 100644
</copy> </copy>
<copy todir="${dir.staging}/jar"> <copy todir="${dir.staging}/jar">
<fileset dir="${dir.dist}/lib" includes="*.jar" /> <fileset dir="${dir.dist}/lib" includes="*.jar" />
@@ -283,7 +284,7 @@ @@ -284,7 +285,7 @@
<arg line="new /o /pr . /cf priconfig.xml /in ${microsoft.application.name}" /> <arg line="new /o /pr . /cf priconfig.xml /in ${microsoft.application.name}" />
</exec> </exec>
<exec executable="makeappx" dir="${dir.dist}" failonerror="yes"> <exec executable="makeappx" dir="${dir.dist}" failonerror="yes">