moparisthebest
/
filebot
mirror of https://github.com/mitb-archive/filebot
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix JDK8 build

This commit is contained in:
Reinhard Pointner 2019-05-28 21:30:27 +07:00
parent 54ad4729cc
commit d9c7f11e24
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
jdk8.patch
View File

@ -51,7 +51,7 @@ index 1a3274f6..48abb46e 100644
-Djna.boot.library.path="%EXEDIR%\\lib" \ -Djna.boot.library.path="%EXEDIR%\\lib" \
-Djna.library.path="%EXEDIR%\\lib" \ -Djna.library.path="%EXEDIR%\\lib" \
diff --git a/build.xml b/build.xml diff --git a/build.xml b/build.xml
index 5c9501d2..136c51c0 100644 index 5c9501d2..60d6fde5 100644
--- a/build.xml --- a/build.xml
+++ b/build.xml +++ b/build.xml
@@ -111,30 +111,14 @@ @@ -111,30 +111,14 @@
@ -79,7 +79,7 @@ index 5c9501d2..136c51c0 100644
- <arg line="get jfx x86_64 Windows ${jfx.pkg}" /> - <arg line="get jfx x86_64 Windows ${jfx.pkg}" />
+ <exec executable="powershell" dir="${dir.cache}" failonerror="yes"> + <exec executable="powershell" dir="${dir.cache}" failonerror="yes">
+ <env key="PROCESSOR_ARCHITECTURE" value="x86" /> + <env key="PROCESSOR_ARCHITECTURE" value="x86" />
+ <arg line="get-java" /> + <arg line="get-java-8" />
</exec> </exec>
- <unzip src="${dir.cache}/${jfx.pkg}" dest="@{dest}/ext/modules"> - <unzip src="${dir.cache}/${jfx.pkg}" dest="@{dest}/ext/modules">
+ <untar src="${dir.cache}/jre-${jre.major}u${jre.build}-windows-i586.tar.gz" dest="@{dest}" compression="gzip"> + <untar src="${dir.cache}/jre-${jre.major}u${jre.build}-windows-i586.tar.gz" dest="@{dest}" compression="gzip">