moparisthebest/filebot
1
0
Fork 0
mirror of https://github.com/mitb-archive/filebot synced 2025-03-10 06:20:27 -04:00
Code Issues Releases Wiki Activity

Fix JDK8 build

Browse Source
This commit is contained in:
Reinhard Pointner 2019-02-21 11:58:17 +07:00
parent f9d41368a3
commit 66f8309a24
1 changed files with 31 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
jdk8.patch
View File

@ -34,7 +34,7 @@ index 9c444690..45de34ba 100644
windows.portable.application.options: -Dapplication.dir="%EXEDIR%\\data" -Duser.home="%EXEDIR%\\data" -Djava.io.tmpdir="%EXEDIR%\\data\\tmp" -Djava.util.prefs.PreferencesFactory=net.filebot.util.prefs.FilePreferencesFactory -Dnet.filebot.util.prefs.file="%EXEDIR%\\data\\settings.properties" windows.portable.application.options: -Dapplication.dir="%EXEDIR%\\data" -Duser.home="%EXEDIR%\\data" -Djava.io.tmpdir="%EXEDIR%\\data\\tmp" -Djava.util.prefs.PreferencesFactory=net.filebot.util.prefs.FilePreferencesFactory -Dnet.filebot.util.prefs.file="%EXEDIR%\\data\\settings.properties"
diff --git a/build.xml b/build.xml diff --git a/build.xml b/build.xml
index 1f9657a5..46eab6a1 100644 index a5ec7942..91cbd8db 100644
--- a/build.xml --- a/build.xml
+++ b/build.xml +++ b/build.xml
@@ -112,19 +112,13 @@ @@ -112,19 +112,13 @@
@ -61,7 +61,7 @@ index 1f9657a5..46eab6a1 100644
</sequential> </sequential>
</macrodef> </macrodef>
@@ -272,10 +266,8 @@ @@ -278,10 +272,8 @@
</manifestclasspath> </manifestclasspath>
<!-- compile --> <!-- compile -->
@ -73,7 +73,7 @@ index 1f9657a5..46eab6a1 100644
</javac> </javac>
<!-- copy resources --> <!-- copy resources -->
@@ -306,7 +298,7 @@ @@ -312,7 +304,7 @@
<target name="appx" depends="revision" description="Build Windows 10 package"> <target name="appx" depends="revision" description="Build Windows 10 package">
@ -82,7 +82,7 @@ index 1f9657a5..46eab6a1 100644
<property name="dir.staging" location="${dir.dist}/appx/${appx.arch}" /> <property name="dir.staging" location="${dir.dist}/appx/${appx.arch}" />
@@ -345,9 +337,9 @@ @@ -351,9 +343,9 @@
<target name="msi" depends="revision" description="Build Windows Installer package"> <target name="msi" depends="revision" description="Build Windows Installer package">
@ -95,7 +95,7 @@ index 1f9657a5..46eab6a1 100644
<property name="dir.staging" location="${dir.dist}/msi/${msi.package.platform}" /> <property name="dir.staging" location="${dir.dist}/msi/${msi.package.platform}" />
@@ -571,7 +563,7 @@ @@ -576,7 +568,7 @@
<fileset dir="${dir.installer}/deb-universal" /> <fileset dir="${dir.installer}/deb-universal" />
</copy-replace> </copy-replace>
@ -142,7 +142,7 @@ index 373a3b1c..d06a8521 100644
<!-- Apache Groovy --> <!-- Apache Groovy -->
diff --git a/source/net/filebot/Logging.java b/source/net/filebot/Logging.java diff --git a/source/net/filebot/Logging.java b/source/net/filebot/Logging.java
index af5319e6..b2d5795f 100644 index 469a16d8..4d988296 100644
--- a/source/net/filebot/Logging.java --- a/source/net/filebot/Logging.java
+++ b/source/net/filebot/Logging.java +++ b/source/net/filebot/Logging.java
@@ -12,6 +12,7 @@ import java.io.PrintWriter; @@ -12,6 +12,7 @@ import java.io.PrintWriter;
@ -392,7 +392,7 @@ index 6b482847..1d21eca0 100644
model.stream().filter(f -> isLockedFolder(f)).findFirst().ifPresent(f -> { model.stream().filter(f -> isLockedFolder(f)).findFirst().ifPresent(f -> {
invokeLater(250, () -> { invokeLater(250, () -> {
diff --git a/source/net/filebot/platform/mac/MacAppUtilities.java b/source/net/filebot/platform/mac/MacAppUtilities.java diff --git a/source/net/filebot/platform/mac/MacAppUtilities.java b/source/net/filebot/platform/mac/MacAppUtilities.java
index 5fb4de64..7f7e1901 100644 index 71ac7462..c8bf1713 100644
--- a/source/net/filebot/platform/mac/MacAppUtilities.java --- a/source/net/filebot/platform/mac/MacAppUtilities.java
+++ b/source/net/filebot/platform/mac/MacAppUtilities.java +++ b/source/net/filebot/platform/mac/MacAppUtilities.java
@@ -2,12 +2,10 @@ package net.filebot.platform.mac; @@ -2,12 +2,10 @@ package net.filebot.platform.mac;
@ -408,7 +408,7 @@ index 5fb4de64..7f7e1901 100644
import java.io.File; import java.io.File;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collection; import java.util.Collection;
@@ -95,20 +93,6 @@ public class MacAppUtilities { @@ -96,43 +94,6 @@ public class MacAppUtilities {
public static void initializeApplication(JMenuBar appMenuBar, Consumer<List<File>> openFileHandler) { public static void initializeApplication(JMenuBar appMenuBar, Consumer<List<File>> openFileHandler) {
// improved UI defaults // improved UI defaults
UIManager.put("TitledBorder.border", UIManager.getBorder("InsetBorder.aquaVariant")); UIManager.put("TitledBorder.border", UIManager.getBorder("InsetBorder.aquaVariant"));
@ -426,6 +426,29 @@ index 5fb4de64..7f7e1901 100644
- openFileHandler.accept(files); - openFileHandler.accept(files);
- } - }
- }); - });
-
- // add workflow service menu
- initializeWorkflowServiceMenu(appMenuBar.getMenu(0));
- }
-
- public static void initializeWorkflowServiceMenu(JMenu menu) {
- String root = System.getProperty("apple.app.workflows");
- String home = System.getProperty("user.home");
-
- if (root == null) {
- return;
- }
-
- menu.addSeparator();
-
- for (WorkflowType type : WorkflowType.values()) {
- File templateFolder = new File(root, type.getFolderName());
- File targetFolder = new File(home, type.getLibraryPath());
-
- if (templateFolder.exists()) {
- menu.add(new WorkflowMenu(type.getFolderName(), templateFolder, targetFolder));
- }
- }
} }
public static boolean isLockedFolder(File folder) { public static boolean isLockedFolder(File folder) {