From: Ben Soares <bsoares@dundee.ac.uk>
Date: Thu, 13 Feb 2020 17:13:31 +0000 (+0000)
Subject: JAL-3449 getdown resilience change to launcher classpath, includes the backup getdown... 
X-Git-Tag: Develop-2_11_2_0-d20201215~80^2~15
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=2b30d81e00e8db1e03bc0cc1acfd988333447d59;p=jalview.git

JAL-3449 getdown resilience change to launcher classpath, includes the backup getdown-launcher.jar
---

diff --git a/utils/install4j/install4j8_template.install4j b/utils/install4j/install4j8_template.install4j
index e551ad5..321abc4 100644
--- a/utils/install4j/install4j8_template.install4j
+++ b/utils/install4j/install4j8_template.install4j
@@ -105,7 +105,7 @@
   </files>
   <launchers>
     <launcher name="Offline Jalview Launcher" id="737" menuName="${compiler:sys.shortName}" icnsFile="${compiler:JALVIEW_DIR}/resources/images/jalview_logos.icns" customMacBundleIdentifier="true" macBundleIdentifier="${compiler:MACOS_BUNDLE_ID}" fileset="734" useCustomMacosExecutableName="true" customMacosExecutableName="${compiler:sys.shortName}">
-      <executable name="${compiler:sys.shortName}" iconSet="true" iconFile="${compiler:JALVIEW_DIR}/resources/images/jalview_logos.ico" executableDir="." redirectStdout="true" executableMode="gui" changeWorkingDirectory="false" singleInstance="true" checkConsoleParameter="true">
+      <executable name="${compiler:sys.shortName}" iconSet="true" iconFile="${compiler:JALVIEW_DIR}/resources/images/jalview_logos.ico" redirectStdout="true" executableMode="gui" changeWorkingDirectory="false" workingDirectory="" singleInstance="true" checkConsoleParameter="true">
         <versionInfo include="true" fileDescription="${compiler:sys.shortName}" legalCopyright="${compiler:COPYRIGHT_MESSAGE}" internalName="${compiler:sys.shortName}" productName="${compiler:sys.shortName}" />
       </executable>
       <splashScreen width="640" height="480" bitmapFile="${compiler:JALVIEW_DIR}/resources/images/jalview_logo_background_fade-640x480.png" textOverlay="true">
@@ -116,8 +116,8 @@
       </splashScreen>
       <java mainClass="com.threerings.getdown.launcher.GetdownApp" vmParameters="-Dinstaller_template_version=${compiler:INSTALLER_TEMPLATE_VERSION}" arguments="${launcher:sys.launcherDirectory} jalview">
         <classPath>
-          <archive location="getdown-launcher.jar" />
-          <scanDirectory location="${compiler:GETDOWN_INSTALL_DIR}" failOnError="false" />
+          <archive location="getdown-launcher.jar" failOnError="false" />
+          <archive location="${compiler:GETDOWN_INSTALL_DIR}/getdown-launcher.jar" failOnError="false" />
         </classPath>
       </java>
       <macStaticAssociationActions mode="selected">
@@ -130,7 +130,7 @@
       </iconImageFiles>
     </launcher>
     <launcher name="Jalview package" id="1876" menuName="${compiler:sys.shortName} ${compiler:JALVIEW_VERSION}" fileset="1873">
-      <executable name="${compiler:sys.shortName}" iconSet="true" redirectStderr="false" failOnStderrOutput="false" executableMode="gui" changeWorkingDirectory="false" singleInstance="true" />
+      <executable name="${compiler:sys.shortName}" iconSet="true" redirectStderr="false" failOnStderrOutput="false" executableMode="gui" changeWorkingDirectory="false" workingDirectory="" singleInstance="true" />
       <java mainClass="jalview.bin.Launcher" vmParameters="-Dinstaller_template_version=${compiler:INSTALLER_TEMPLATE_VERSION}">
         <classPath>
           <scanDirectory location="${compiler:GETDOWN_DIST_DIR}" failOnError="false" />