From: Jim Procter <j.procter@dundee.ac.uk>
Date: Tue, 2 Nov 2021 12:12:34 +0000 (+0000)
Subject: Merge branch 'develop' of https://source.jalview.org/git/jalview into develop
X-Git-Tag: Release_2_11_2_0~25^2
X-Git-Url: http://source.jalview.org/gitweb/?p=jalview.git;a=commitdiff_plain;h=2d6ea94db824bac30fb0c98f86cc0cd3b9c5b4a8;hp=ee942237fe5155b25f5419ece71a4084a47e2f41

Merge branch 'develop' of https://source.jalview.org/git/jalview into develop
---

diff --git a/gradle.properties b/gradle.properties
index d0fb57d..f0c0d9e 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -100,8 +100,8 @@ getdown_alt_java8_min_version  = 01080000
 getdown_alt_java8_max_version  = 01089999
 getdown_alt_java11_min_version = 11000000
 getdown_alt_java11_max_version =
-#getdown_alt_java11_txt_multi_java_location = [windows-amd64] /getdown/jre/windows-jre11.jar,[linux-amd64] /getdown/jre/linux-jre11.tgz,[mac os x] /getdown/jre/macos-jre11.tgz
-#getdown_alt_java8_txt_multi_java_location = [windows-amd64] /getdown/jre/windows-jre1.8.tgz,[linux-amd64] /getdown/jre/linux-jre1.8.tgz,[mac os x] /getdown/jre/macos-jre1.8.tgz
+#getdown_alt_java11_txt_multi_java_location = [windows-amd64] /getdown/jre/jre-11-windows-x64.zip,[linux-amd64] /getdown/jre/jre-11-linux-x64.zip,[mac os x] /getdown/jre/jre-11-mac-x64.zip
+#getdown_alt_java8_txt_multi_java_location = [windows-amd64] /getdown/jre/jre-8-windows-x64.zip,[linux-amd64] /getdown/jre/jre-8-linux-x64.zip,[mac os x] /getdown/jre/jre-8-mac-x64.zip
 jre_installs_dir = ~/buildtools/jre
 
 j8libDir = j8lib
diff --git a/utils/download_jres.sh b/utils/download_jres.sh
index 5aa4b57..8029e82 100755
--- a/utils/download_jres.sh
+++ b/utils/download_jres.sh
@@ -100,6 +100,10 @@ for FEATURE_VERSION in 8 11 17; do
             echo "Creating ${NAME}.${EXT} for install4j bundling"
             [ \! -d ${ARCHIVEDIR} ] && mkdir -p "${ARCHIVEDIR}"
             $TAR -C "${JREDIR}" -zcf "${ARCHIVEDIR}/${NAME}.${EXT}" .
+            # make symbolic link with _ instead of - for install4j9
+            NEWNAME=${NAME//-/_}
+            echo "Linking from ${NEWNAME}.${EXT} for install4j9"
+            ln -s "${NAME}.${EXT}" "${ARCHIVEDIR}/${NEWNAME}.${EXT}"
             ;;
           *)
             echo "Archiving as '${CREATEARCHIVE}' file not supported"