From: Ben Soares <b.soares@dundee.ac.uk>
Date: Tue, 25 Jun 2024 10:31:17 +0000 (+0100)
Subject: JAL-3631 Use the icon file passed by install4j if a newer getdown-launcher is relaunched
X-Git-Tag: Release_2_11_4_0~24^2~16
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=b2fe62bb0a703da119270c9fba9799ee3fcfb949;p=jalview.git

JAL-3631 Use the icon file passed by install4j if a newer getdown-launcher is relaunched
---

diff --git a/getdown/lib/FJVL_VERSION b/getdown/lib/FJVL_VERSION
index 5658c0d..9a27132 100644
--- a/getdown/lib/FJVL_VERSION
+++ b/getdown/lib/FJVL_VERSION
@@ -1 +1 @@
-1.8.3-1.4.1_FJVL
+1.8.3-1.5.0_FJVL
diff --git a/getdown/lib/JVL_VERSION b/getdown/lib/JVL_VERSION
index de777a1..5446e8b 100644
--- a/getdown/lib/JVL_VERSION
+++ b/getdown/lib/JVL_VERSION
@@ -1 +1 @@
-1.8.3-1.4.1_JVL
+1.8.3-1.5.0_JVL
diff --git a/getdown/lib/getdown-core.jar b/getdown/lib/getdown-core.jar
index 7cb005e..3174687 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 cd0824c..85ed80e 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 d30f084..6809084 100644
Binary files a/getdown/lib/getdown-launcher.jar and b/getdown/lib/getdown-launcher.jar differ
diff --git a/getdown/src/getdown/ant/pom.xml b/getdown/src/getdown/ant/pom.xml
index 75ec538..95aea5a 100644
--- a/getdown/src/getdown/ant/pom.xml
+++ b/getdown/src/getdown/ant/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>com.threerings.getdown</groupId>
     <artifactId>getdown</artifactId>
-    <version>1.8.3-1.4.1_FJVL</version>
+    <version>1.8.3-1.5.0_FJVL</version>
   </parent>
 
   <artifactId>getdown-ant</artifactId>
diff --git a/getdown/src/getdown/core/pom.xml b/getdown/src/getdown/core/pom.xml
index 4670d8d..6cd52f7 100644
--- a/getdown/src/getdown/core/pom.xml
+++ b/getdown/src/getdown/core/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>com.threerings.getdown</groupId>
     <artifactId>getdown</artifactId>
-    <version>1.8.3-1.4.1_FJVL</version>
+    <version>1.8.3-1.5.0_FJVL</version>
   </parent>
 
   <artifactId>getdown-core</artifactId>
diff --git a/getdown/src/getdown/core/src/main/java/com/threerings/getdown/data/EnvConfig.java b/getdown/src/getdown/core/src/main/java/com/threerings/getdown/data/EnvConfig.java
index e46904c..7271088 100644
--- a/getdown/src/getdown/core/src/main/java/com/threerings/getdown/data/EnvConfig.java
+++ b/getdown/src/getdown/core/src/main/java/com/threerings/getdown/data/EnvConfig.java
@@ -205,8 +205,24 @@ public final class EnvConfig {
               List<String> addArgs = new ArrayList<>();
               addArgs.add(appDir);
               addArgs.add(appId);
+              
+              List<String> removeJvmArgs = null;
+              List<String> addJvmArgs = null;
+              String macIcons = System.getProperty("installer.mac_icons");
+              // we love our Mac users, so we do nice things to preserve our application identity
+              if (LaunchUtil.isMacOS()) {
+                removeJvmArgs = new ArrayList<>();
+                addJvmArgs = new ArrayList<>();
+                if (macIcons != null) {
+                  removeJvmArgs.add("-Xdock:icon=");
+                  addJvmArgs.add("-Xdock:icon=" + installerAppdir + File.separator + "resource" + File.separator + macIcons );
+                }
+                removeJvmArgs.add("-Xdock:name=");
+                addJvmArgs.add("-Xdock:name=" + ( appName != null ? appName : ChannelProperties.FALLBACK_APPNAME ));
+              }
+
               String startClassName = startClass == null ? null : startClass.getName();
-              int exitValue = LaunchUtils.startNewJvm(javaBin, null, null, prependClasspath, null, removeClasspath, startClassName, removeArgs, addArgs, Arrays.asList(argv), true, true, false, true, false); 
+              int exitValue = LaunchUtils.startNewJvm(javaBin, removeJvmArgs, addJvmArgs, prependClasspath, null, removeClasspath, startClassName, removeArgs, addArgs, Arrays.asList(argv), true, true, false, true, false); 
 
               if (exitValue == 0) {
                 notes.add(Note.info("Relaunching getdown succeeded.  Original getdown exiting now."));
diff --git a/getdown/src/getdown/launcher/pom.xml b/getdown/src/getdown/launcher/pom.xml
index 13303fa..fbd20cf 100644
--- a/getdown/src/getdown/launcher/pom.xml
+++ b/getdown/src/getdown/launcher/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>com.threerings.getdown</groupId>
     <artifactId>getdown</artifactId>
-    <version>1.8.3-1.4.1_FJVL</version>
+    <version>1.8.3-1.5.0_FJVL</version>
   </parent>
 
   <artifactId>getdown-launcher</artifactId>
diff --git a/getdown/src/getdown/mvn_cmd b/getdown/src/getdown/mvn_cmd
index 50e69d6..41725cf 100755
--- a/getdown/src/getdown/mvn_cmd
+++ b/getdown/src/getdown/mvn_cmd
@@ -3,7 +3,7 @@
 if [ x$JVLVERSION != x ]; then
   export VERSION=$JVLVERSION
 else
-  export VERSION=1.8.3-1.4.1_JVL
+  export VERSION=1.8.3-1.5.0_JVL
 fi
 
 if [ x${VERSION%_JVL} = x$VERSION ]; then
diff --git a/getdown/src/getdown/pom.xml b/getdown/src/getdown/pom.xml
index 4d7b0ec..3eb0565 100644
--- a/getdown/src/getdown/pom.xml
+++ b/getdown/src/getdown/pom.xml
@@ -10,7 +10,7 @@
   <groupId>com.threerings.getdown</groupId>
   <artifactId>getdown</artifactId>
   <packaging>pom</packaging>
-  <version>1.8.3-1.4.1_FJVL</version>
+  <version>1.8.3-1.5.0_FJVL</version>
 
   <name>getdown</name>
   <description>An application installer and updater.</description>
diff --git a/j11lib/getdown-core.jar b/j11lib/getdown-core.jar
index 7cb005e..3174687 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 7cb005e..3174687 100644
Binary files a/j8lib/getdown-core.jar and b/j8lib/getdown-core.jar differ