From 47cf12a87f6e308b65236516faaa41d24662cfe9 Mon Sep 17 00:00:00 2001
From: Ben Soares <bsoares@dundee.ac.uk>
Date: Thu, 21 Nov 2019 20:45:21 +0000
Subject: [PATCH] JAL-3449 added an install4j compiler var

---
 build.gradle                                  |    5 ++++-
 gradle.properties                             |    4 ++--
 utils/install4j/install4j8_template.install4j |    5 +++--
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/build.gradle b/build.gradle
index e856939..9059447 100644
--- a/build.gradle
+++ b/build.gradle
@@ -282,6 +282,8 @@ ext {
 
 
   // for install4j
+  JAVA_MIN_VERSION = JAVA_VERSION
+  JAVA_MAX_VERSION = JAVA_VERSION
   macosJavaVMDir = string("${System.env.HOME}/buildtools/jre/openjdk-java_vm/getdown/macos-jre${JAVA_VERSION}/jre")
   macosJavaVMTgz = string("${System.env.HOME}/buildtools/jre/openjdk-java_vm/install4j/tgz/macos-jre${JAVA_VERSION}.tar.gz")
   windowsJavaVMDir = string("${System.env.HOME}/buildtools/jre/openjdk-java_vm/getdown/windows-jre${JAVA_VERSION}/jre")
@@ -1220,7 +1222,8 @@ task copyInstall4jTemplate(type: Copy) {
       beginToken: '',
       endToken: '',
       tokens: [
-        '9999999999': JAVA_VERSION
+        '1111111111': JAVA_MIN_VERSION,
+        '9999999999': JAVA_MAX_VERSION
       ]
     )
     filter(ReplaceTokens,
diff --git a/gradle.properties b/gradle.properties
index cea679c..8eb78ff 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -89,7 +89,7 @@ getdown_txt_ui.progress_text = 000000
 getdown_txt_ui.status = 20, 380, 600, 58
 getdown_txt_ui.status_text = 000066
 #getdown_txt_ui.text_shadow = FFFFFF
-getdown_txt_ui.install_error = http://www.jalview.org/faq/getdownerror
+getdown_txt_ui.install_error = https://www.jalview.org/faq/getdownerror
 getdown_txt_ui.mac_dock_icon = resources/images/jalview_logos.ico
 getdown_alt_java8_min_version  = 01080000
 getdown_alt_java8_max_version  = 01089999
@@ -130,7 +130,7 @@ pandoc_exec = /usr/local/bin/pandoc,/usr/bin/pandoc
 dev = false
 
 CHANNEL=LOCAL
-getdown_channel_base = http://www.jalview.org/getdown
+getdown_channel_base = https://www.jalview.org/getdown
 getdown_channel_name = SCRATCH-DEFAULT
 getdown_app_dir_release = release
 getdown_app_dir_alt = alt
diff --git a/utils/install4j/install4j8_template.install4j b/utils/install4j/install4j8_template.install4j
index 1d7c17f..8889ddf 100644
--- a/utils/install4j/install4j8_template.install4j
+++ b/utils/install4j/install4j8_template.install4j
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<install4j version="8.0.1" transformSequenceNumber="8">
+<install4j version="8.0.2" transformSequenceNumber="8">
   <directoryPresets config="." />
-  <application name="Jalview" applicationId="6595-2347-1923-0725" mediaDir="../../build/install4j" lzmaCompression="true" shortName="Jalview" publisher="University of Dundee" publisherWeb="http://www.jalview.org/" version="$$VERSION$$" allPathsRelative="true" macVolumeId="5aac4968c304f65" javaMinVersion="9999999999" allowBetaVM="true" jdkMode="jdk" jdkName="JDK 11.0">
+  <application name="Jalview" applicationId="6595-2347-1923-0725" mediaDir="../../build/install4j" lzmaCompression="true" shortName="Jalview" publisher="University of Dundee" publisherWeb="https://www.jalview.org/" version="$$VERSION$$" allPathsRelative="true" macVolumeId="5aac4968c304f65" javaMinVersion="0000000000" javaMaxVersion="9999999999" allowBetaVM="true" jdkMode="jdk" jdkName="JDK 11.0">
     <searchSequence>
       <directory location="${compiler:JRE_DIR}" />
       <registry />
@@ -11,6 +11,7 @@
       <variable name="OSX_KEYSTORE" />
       <variable name="JSIGN_SH" />
       <variable name="JRE_DIR" value="jre" description="The folder under the app folder that the JRE will be either copied or unpacked into" />
+      <variable name="INSTALLER_VERSION" value="2.11.1" />
     </variables>
     <codeSigning macEnabled="true" macPkcs12File="${compiler:OSX_KEYSTORE}" />
   </application>
-- 
1.7.10.2