From 49a555c3890bc93583a5e0d8f0f237db21f5e3d3 Mon Sep 17 00:00:00 2001 From: Ben Soares Date: Fri, 5 Apr 2019 17:19:07 +0100 Subject: [PATCH] JAL-3130 This commit concentrates on the Mac OS X DMG app bundle, ensuring only one JRE needed in the .app bundle for 1) install4j, 2) getdown, 3) jalview --- build.gradle | 1 + getdown/lib/getdown-core-1.8.3-SNAPSHOT.jar | Bin 137937 -> 137977 bytes getdown/lib/getdown-launcher.jar | Bin 194984 -> 195005 bytes resources/install4j/jalview_getdown.install4j | 72 ++++++++++++++++++++----- src/jalview/gui/Desktop.java | 10 +++- 5 files changed, 69 insertions(+), 14 deletions(-) diff --git a/build.gradle b/build.gradle index 7b6cd6b..4a63af9 100644 --- a/build.gradle +++ b/build.gradle @@ -180,6 +180,7 @@ task syncLib(type: Sync) { task syncResources(type: Sync) { from "$jalviewDir/$resourceDir" include "**/*.*" + exclude "install4j" into "$jalviewDir/$classesDir" preserve { include "**" diff --git a/getdown/lib/getdown-core-1.8.3-SNAPSHOT.jar b/getdown/lib/getdown-core-1.8.3-SNAPSHOT.jar index e8eef5fc92812daec4be6d35a1d075a1642e86b6..545f20bb00aa28ab944a56013ea8edc521f72cb5 100644 GIT binary patch delta 6699 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 Jci=fj{U4-G@=5>z delta 6640 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 w)B=({@P} - - + + - - - + @@ -21,13 +19,19 @@ + + + + + + @@ -36,11 +40,19 @@ + + + + + + @@ -79,7 +91,7 @@ - + @@ -1469,7 +1481,7 @@ return console.askYesNo(message, true); - + @@ -1479,6 +1491,7 @@ return console.askYesNo(message, true); + @@ -1486,7 +1499,7 @@ return console.askYesNo(message, true); - + @@ -1511,6 +1524,8 @@ return console.askYesNo(message, true); + + @@ -1528,6 +1543,8 @@ return console.askYesNo(message, true); + + @@ -1550,6 +1567,8 @@ return console.askYesNo(message, true); + + @@ -1579,6 +1598,8 @@ return console.askYesNo(message, true); + + @@ -1627,6 +1648,8 @@ return console.askYesNo(message, true); + + @@ -1637,7 +1660,7 @@ return console.askYesNo(message, true); - + @@ -1647,6 +1670,7 @@ return console.askYesNo(message, true); + @@ -1654,12 +1678,34 @@ return console.askYesNo(message, true); + + + + + + + + + + + + + + + + + + + + + + - - - + + + diff --git a/src/jalview/gui/Desktop.java b/src/jalview/gui/Desktop.java index fc36047..1fed71e 100644 --- a/src/jalview/gui/Desktop.java +++ b/src/jalview/gui/Desktop.java @@ -553,7 +553,15 @@ public class Desktop extends jalview.jbgui.GDesktop + System.getProperty("java.version") + "\n" + System.getProperty("os.arch") + " " + System.getProperty("os.name") + " " - + System.getProperty("os.version")); + + System.getProperty("os.version") + + (jalview.bin.Cache.getProperty("VERSION").equals("DEVELOPMENT") + ? "\nJava path:" + + System.getProperty( + "java.home") + + File.separator + "bin" + + File.separator + "java" + : "") + ); showConsole(showjconsole); -- 1.7.10.2