JAL-3830 add the windows bash script to getdown files and install4j installers

diff --git a/build.gradle b/build.gradle
index 0a27370..009b0c1 100644 (file)
--- a/build.gradle
+++ b/build.gradle
@@ -1573,7 +1573,7 @@ task getdownWebsite() {
       }
     }
     
-    def getdownWrapperScripts = [ getdown_mac_wrapper_script, getdown_unix_wrapper_script, getdown_windows_wrapper_script ]
+    def getdownWrapperScripts = [ getdown_mac_wrapper_script, getdown_unix_wrapper_script, getdown_windows_wrapper_script, getdown_powershell_wrapper_script ]
     getdownWrapperScripts.each{ script ->
       def s = file( "${jalviewDir}/utils/getdown/${script}" )
       if (s.exists()) {

diff --git a/gradle.properties b/gradle.properties
index c4e9422..d87a598 100644 (file)
--- a/gradle.properties
+++ b/gradle.properties
@@ -136,7 +136,8 @@ install4j_dmg_ds_store = jalview_dmg_DS_Store
 install4j_dmg_wrapper_link = jalviewc
 getdown_mac_wrapper_script = jalviewc-macos
 getdown_unix_wrapper_script = jalviewc
-getdown_windows_wrapper_script = jalviewc.ps1
+getdown_windows_wrapper_script = jalviewc-windows
+getdown_powershell_wrapper_script = jalviewc.ps1
 
 OSX_KEYSTORE =
 OSX_KEYPASS =

diff --git a/utils/install4j/install4j8_template.install4j b/utils/install4j/install4j8_template.install4j
index f4c560b..0ab7fad 100644 (file)
--- a/utils/install4j/install4j8_template.install4j
+++ b/utils/install4j/install4j8_template.install4j
@@ -106,14 +106,16 @@
       <dirEntry mountPoint="454" file="${compiler:JALVIEW_DIR}/${compiler:GETDOWN_FILES_DIR}/${compiler:JAVA_VERSION}" uninstallMode="2" overrideOverwriteMode="true" overrideUninstallMode="true" subDirectory="files" />
       <dirEntry mountPoint="736" file="${compiler:JALVIEW_DIR}/${compiler:GETDOWN_WEBSITE_DIR}/${compiler:JAVA_VERSION}" uninstallMode="2" overrideOverwriteMode="true" overrideUninstallMode="true" subDirectory="files">
         <exclude>
-          <entry location="jalviewc.ps1" />
           <entry location="jalviewc" />
           <entry location="jalviewc-macos" />
+          <entry location="jalviewc-windows" />
+          <entry location="jalviewc.ps1" />
         </exclude>
       </dirEntry>
       <dirEntry mountPoint="736" file="${compiler:JALVIEW_DIR}/examples" overwriteMode="1" uninstallMode="2" overrideFileMode="true" overrideOverwriteMode="true" overrideUninstallMode="true" entryMode="subdir" subDirectory="examples" />
       <fileEntry mountPoint="736" file="${compiler:JALVIEW_DIR}/${compiler:GETDOWN_WEBSITE_DIR}/${compiler:JAVA_VERSION}/jalviewc" fileMode="755" overrideFileMode="true" />
       <fileEntry mountPoint="736" file="${compiler:JALVIEW_DIR}/${compiler:GETDOWN_WEBSITE_DIR}/${compiler:JAVA_VERSION}/jalviewc-macos" fileMode="755" overrideFileMode="true" />
+      <fileEntry mountPoint="736" file="${compiler:JALVIEW_DIR}/${compiler:GETDOWN_WEBSITE_DIR}/${compiler:JAVA_VERSION}/jalviewc-windows" fileMode="755" overrideFileMode="true" />
       <fileEntry mountPoint="736" file="${compiler:JALVIEW_DIR}/${compiler:GETDOWN_WEBSITE_DIR}/${compiler:JAVA_VERSION}/jalviewc.ps1" fileMode="755" overrideFileMode="true" />
       <dirEntry mountPoint="884" file="${compiler:MACOS_JAVA_VM_DIR}" fileMode="755" overrideFileMode="true" overrideUninstallMode="true" entryMode="subdir" subDirectory="${compiler:JRE_DIR}" />
       <dirEntry mountPoint="885" file="${compiler:WINDOWS_JAVA_VM_DIR}" fileMode="755" overrideFileMode="true" overrideUninstallMode="true" entryMode="subdir" subDirectory="${compiler:JRE_DIR}" />
@@ -715,7 +717,7 @@ return console.askYesNo(message, true);
               </action>
               <action id="1525" beanClass="com.install4j.runtime.beans.actions.files.DeleteFileAction" actionElevationType="elevated" rollbackBarrierExitCode="0">
                 <serializedBean>
-                  <property name="files" type="array" class="java.io.File" length="42">
+                  <property name="files" type="array" class="java.io.File" length="44">
                     <element index="0">
                       <object class="java.io.File">
                         <string>jre</string>
@@ -923,7 +925,17 @@ return console.askYesNo(message, true);
                     </element>
                     <element index="41">
                       <object class="java.io.File">
-                        <string>jalview.ps1v</string>
+                        <string>jalviewc.ps1v</string>
+                      </object>
+                    </element>
+                    <element index="42">
+                      <object class="java.io.File">
+                        <string>jalviewc-windows</string>
+                      </object>
+                    </element>
+                    <element index="43">
+                      <object class="java.io.File">
+                        <string>jalviewc-windowsv</string>
                       </object>
                     </element>
                   </property>