From 33f9fc9a47c1907525e07683fa66797afb233b3e Mon Sep 17 00:00:00 2001 From: Ben Soares Date: Wed, 17 Mar 2021 00:30:55 +0000 Subject: [PATCH] JAL-3830 add the windows bash script to getdown files and install4j installers --- build.gradle | 2 +- gradle.properties | 3 ++- utils/install4j/install4j8_template.install4j | 18 +++++++++++++++--- 3 files changed, 18 insertions(+), 5 deletions(-) diff --git a/build.gradle b/build.gradle index 0a27370..009b0c1 100644 --- 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 --- 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 --- a/utils/install4j/install4j8_template.install4j +++ b/utils/install4j/install4j8_template.install4j @@ -106,14 +106,16 @@ - + + + @@ -715,7 +717,7 @@ return console.askYesNo(message, true); - + jre @@ -923,7 +925,17 @@ return console.askYesNo(message, true); - jalview.ps1v + jalviewc.ps1v + + + + + jalviewc-windows + + + + + jalviewc-windowsv -- 1.7.10.2