From: Ben Soares <b.soares@dundee.ac.uk>
Date: Mon, 5 Aug 2024 18:20:46 +0000 (+0100)
Subject: JAL-3631 Revert the Jalview installer icon back to the Jalview icon
X-Git-Tag: Release_2_11_4_0~15^2^2~9
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=15d55d9eecd6541e461ed302c246b902898cfd2a;p=jalview.git

JAL-3631 Revert the Jalview installer icon back to the Jalview icon
---

diff --git a/utils/install4j/install4j10_template.install4j b/utils/install4j/install4j10_template.install4j
index 920563b..16fc35c 100644
--- a/utils/install4j/install4j10_template.install4j
+++ b/utils/install4j/install4j10_template.install4j
@@ -75,9 +75,9 @@
       <variable name="WIZARD_HEIGHT" value="720" description="Default/initial width of installer wizard window.  Linux media types adapt this.&#xA;NOT USED" />
       <variable name="MACOSARCHIVE_X64_DMG_FILENAME" value="${compiler:APPLICATION_FOLDER}-${compiler:JALVIEW_VERSION}-${compiler:sys.platform}-x64-java_${compiler:JAVA_INTEGER_VERSION}" />
       <variable name="MACOSARCHIVE_AARCH64_DMG_FILENAME" value="${compiler:APPLICATION_FOLDER}-${compiler:JALVIEW_VERSION}-${compiler:sys.platform}-aarch64-java_${compiler:JAVA_INTEGER_VERSION}" />
-      <variable name="INSTALLER_ICON" value="jalview_installer.png" />
-      <variable name="INSTALLER_MAC_ICON" value="jalview_installer.icns" />
-      <variable name="INSTALLER_WINDOWS_ICON" value="jalview_installer.ico" />
+      <variable name="INSTALLER_ICON" value="jalview_installer.png" description="An icon with installation arrow.&#xA;NOT USED" />
+      <variable name="INSTALLER_MAC_ICON" value="jalview_installer.icns" description="An icon with installation arrow.&#xA;NOT USED" />
+      <variable name="INSTALLER_WINDOWS_ICON" value="jalview_installer.ico" description="An icon with installation arrow.&#xA;NOT USED" />
       <variable name="LOG_FILE" value=".jalview.log" />
     </variables>
     <codeSigning macEnabled="true" macPkcs12File="${compiler:OSX_KEYSTORE}" macNotarize="true" appleId="${compiler:OSX_APPLEID}">
@@ -417,7 +417,7 @@ public static final String getCanonicalFullPathToDirectoryHash(String installerA
 }
 </staticMembers>
     <applications>
-      <application id="installer" beanClass="com.install4j.runtime.beans.applications.InstallerApplication" actionElevationType="elevated" styleId="35" customIcnsFile="${compiler:JALVIEW_DIR}/${compiler:INSTALLER_MAC_ICON}" customIcoFile="${compiler:JALVIEW_DIR}/${compiler:INSTALLER_WINDOWS_ICON}">
+      <application id="installer" beanClass="com.install4j.runtime.beans.applications.InstallerApplication" actionElevationType="elevated" styleId="35" customIcnsFile="${compiler:JALVIEW_DIR}/${compiler:ICONS_DIR}/${compiler:MAC_ICONS_FILE}" customIcoFile="${compiler:JALVIEW_DIR}/${compiler:ICONS_DIR}/${compiler:WINDOWS_ICONS_FILE}">
         <serializedBean>
           <property name="frameHeight" type="int" value="720" />
           <property name="frameWidth" type="int" value="960" />
@@ -516,7 +516,7 @@ public static final String getCanonicalFullPathToDirectoryHash(String installerA
                 <property name="imageEdgeBorderWidth" type="int" value="2" />
                 <property name="imageFile">
                   <object class="com.install4j.api.beans.ExternalFile">
-                    <string>${compiler:JALVIEW_DIR}/${compiler:INSTALLER_ICON}</string>
+                    <string>${compiler:JALVIEW_DIR}/${compiler:ICONS_DIR}/${compiler:PNG_ICON_FILE}</string>
                   </object>
                 </property>
                 <property name="imageInsets">