From: Ben Soares <bsoares@dundee.ac.uk>
Date: Mon, 16 Dec 2019 20:45:32 +0000 (+0000)
Subject: JAL-3449 don't assume install4j jar in classpath of getdown
X-Git-Tag: Develop-2_11_2_0-d20201215~80^2~28^2~10
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=a2801ca3b43620de21f25f7aa3935bf0572192b4;p=jalview.git

JAL-3449 don't assume install4j jar in classpath of getdown
---

diff --git a/getdown/lib/getdown-core.jar b/getdown/lib/getdown-core.jar
index 12752c8..31742c1 100644
Binary files a/getdown/lib/getdown-core.jar and b/getdown/lib/getdown-core.jar differ
diff --git a/getdown/lib/getdown-launcher-local.jar b/getdown/lib/getdown-launcher-local.jar
index a79d379..e0dd04c 100644
Binary files a/getdown/lib/getdown-launcher-local.jar and b/getdown/lib/getdown-launcher-local.jar differ
diff --git a/getdown/lib/getdown-launcher.jar b/getdown/lib/getdown-launcher.jar
index e3a676a..6d2c2f9 100644
Binary files a/getdown/lib/getdown-launcher.jar and b/getdown/lib/getdown-launcher.jar differ
diff --git a/getdown/src/getdown/launcher/src/main/java/com/threerings/getdown/launcher/GetdownApp.java b/getdown/src/getdown/launcher/src/main/java/com/threerings/getdown/launcher/GetdownApp.java
index 4a44f9b..c76c727 100644
--- a/getdown/src/getdown/launcher/src/main/java/com/threerings/getdown/launcher/GetdownApp.java
+++ b/getdown/src/getdown/launcher/src/main/java/com/threerings/getdown/launcher/GetdownApp.java
@@ -35,7 +35,6 @@ import com.threerings.getdown.util.LaunchUtil;
 import com.threerings.getdown.util.StringUtil;
 import static com.threerings.getdown.Log.log;
 import jalview.bin.StartupNotificationListener;
-import com.install4j.api.launcher.Variables;
 
 /**
  * The main application entry point for Getdown.
@@ -108,6 +107,14 @@ public class GetdownApp
       t.printStackTrace();
     }
     
+    try {
+      StatusPanel.i4jVersion = com.install4j.api.launcher.Variables.getCompilerVariable("sys.install4jVersion");
+    } catch (IOException e) {
+      System.err.println("install4j version not available");
+    } catch (Throwable t) {
+      System.err.println("install4j not available");
+      t.printStackTrace();
+    }
     // record a few things for posterity
     log.info("------------------ VM Info ------------------");
     log.info("-- OS Name: " + System.getProperty("os.name"));
@@ -115,7 +122,7 @@ public class GetdownApp
     log.info("-- OS Vers: " + System.getProperty("os.version"));
     log.info("-- Java Vers: " + System.getProperty("java.version"));
     log.info("-- Java Home: " + System.getProperty("java.home"));
-    log.info("-- Install4j Vers: " + Variables.getCompilerVariable("sys.install4jVersion"));
+    log.info("-- Install4j Vers: " + StatusPanel.i4jVersion);
     log.info("-- Install4j Template Vers: " + System.getProperty("installer_template_version"));
     log.info("-- User Name: " + System.getProperty("user.name"));
     log.info("-- User Home: " + System.getProperty("user.home"));
diff --git a/getdown/src/getdown/launcher/src/main/java/com/threerings/getdown/launcher/StatusPanel.java b/getdown/src/getdown/launcher/src/main/java/com/threerings/getdown/launcher/StatusPanel.java
index 89b621e..4b5e05f 100644
--- a/getdown/src/getdown/launcher/src/main/java/com/threerings/getdown/launcher/StatusPanel.java
+++ b/getdown/src/getdown/launcher/src/main/java/com/threerings/getdown/launcher/StatusPanel.java
@@ -33,7 +33,6 @@ import com.threerings.getdown.util.MessageUtil;
 import com.threerings.getdown.util.Rectangle;
 import com.threerings.getdown.util.StringUtil;
 import static com.threerings.getdown.Log.log;
-import com.install4j.api.launcher.Variables;
 
 /**
  * Displays download and patching status.
@@ -280,11 +279,7 @@ public final class StatusPanel extends JComponent
     	if (_ifc.displayVersion) {
     		labelText.append("launcher version: " + Build.version());
     		labelText.append("\n");
-        try {
-          labelText.append("install4j version: " + Variables.getCompilerVariable("sys.install4jVersion"));
-        } catch(java.io.IOException e) {
-          labelText.append("install4j version: not available");
-        }
+    		labelText.append("install4j version: " + i4jVersion);
     		labelText.append("\n");
     		labelText.append("installer version: " + System.getProperty("installer_template_version"));
     		labelText.append("\n");
@@ -423,4 +418,6 @@ public final class StatusPanel extends JComponent
     protected static final Font FONT = new Font("SansSerif", Font.BOLD, 12);
     
     public String _appbase;
+    
+    public static String i4jVersion = null;
 }
diff --git a/j11lib/getdown-core.jar b/j11lib/getdown-core.jar
index 12752c8..31742c1 100644
Binary files a/j11lib/getdown-core.jar and b/j11lib/getdown-core.jar differ
diff --git a/j8lib/getdown-core.jar b/j8lib/getdown-core.jar
index 12752c8..31742c1 100644
Binary files a/j8lib/getdown-core.jar and b/j8lib/getdown-core.jar differ