From: Ben Soares <b.soares@dundee.ac.uk>
Date: Sat, 29 Jan 2022 00:57:07 +0000 (+0000)
Subject: Merge branch 'develop' into improvement/JAL-3830_install4j9_macos_setup_application
X-Git-Tag: Release_2_11_2_1~66
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=36f083dc674297be2157d9f291a7cddba9d3250a;hp=-c;p=jalview.git

Merge branch 'develop' into improvement/JAL-3830_install4j9_macos_setup_application
---

36f083dc674297be2157d9f291a7cddba9d3250a
diff --combined build.gradle
index b378283,34a3461..1d56ca3
--- a/build.gradle
+++ b/build.gradle
@@@ -103,6 -103,7 +103,7 @@@ ext 
    // Import channel_properties
    channelDir = string("${jalviewDir}/${channel_properties_dir}/${propertiesChannelName}")
    channelGradleProperties = string("${channelDir}/channel_gradle.properties")
+   channelPropsFile = string("${channelDir}/${resource_dir}/${channel_props}")
    overrideProperties(channelGradleProperties, false)
    // local build environment properties
    // can be "projectDir/local.properties"
@@@ -449,11 -450,11 +450,11 @@@
      jreInstallsDir = System.getProperty("user.home") + jreInstallsDir.substring(1)
    }
    macosJavaVMDir = string("${jreInstallsDir}/jre-${JAVA_INTEGER_VERSION}-mac-x64/jre")
 -  macosJavaVMTgz = string("${jreInstallsDir}/tgz/jre-${JAVA_INTEGER_VERSION}-mac-x64.tar.gz")
    windowsJavaVMDir = string("${jreInstallsDir}/jre-${JAVA_INTEGER_VERSION}-windows-x64/jre")
 -  windowsJavaVMTgz = string("${jreInstallsDir}/tgz/jre-${JAVA_INTEGER_VERSION}-windows-x64.tar.gz")
    linuxJavaVMDir = string("${jreInstallsDir}/jre-${JAVA_INTEGER_VERSION}-linux-x64/jre")
 -  linuxJavaVMTgz = string("${jreInstallsDir}/tgz/jre-${JAVA_INTEGER_VERSION}-linux-x64.tar.gz")
 +  macosJavaVMTgz = string("${jreInstallsDir}/tgz/jre_${JAVA_INTEGER_VERSION}_mac_x64.tar.gz")
 +  windowsJavaVMTgz = string("${jreInstallsDir}/tgz/jre_${JAVA_INTEGER_VERSION}_windows_x64.tar.gz")
 +  linuxJavaVMTgz = string("${jreInstallsDir}/tgz/jre_${JAVA_INTEGER_VERSION}_linux_x64.tar.gz")
    install4jDir = string("${jalviewDir}/${install4j_utils_dir}")
    install4jConfFileName = string("jalview-install4j-conf.install4j")
    install4jConfFile = file("${install4jDir}/${install4jConfFileName}")
@@@ -1511,6 -1512,12 +1512,12 @@@ task getdownWebsite() 
      }
      getdownWebsiteResourceFilenames += "${getdownAppDistDir}/${getdown_build_properties}"
  
+     copy {
+       from channelPropsFile
+       into getdownWebsiteDir
+     }
+     getdownWebsiteResourceFilenames += file(channelPropsFile).getName()
+ 
      // set some getdown_txt_ properties then go through all properties looking for getdown_txt_...
      def props = project.properties.sort { it.key }
      if (getdownAltJavaMinVersion != null && getdownAltJavaMinVersion.length() > 0) {
@@@ -1684,6 -1691,7 +1691,7 @@@
        from launchJvl
        from getdownLauncher
        from "${getdownWebsiteDir}/${getdown_build_properties}"
+       from "${getdownWebsiteDir}/${channel_props}"
        if (file(getdownLauncher).getName() != getdown_launcher) {
          rename(file(getdownLauncher).getName(), getdown_launcher)
        }
diff --combined gradle.properties
index 95b1299,21360df..b1244b0
--- a/gradle.properties
+++ b/gradle.properties
@@@ -100,8 -100,8 +100,8 @@@ getdown_alt_java8_min_version  = 010800
  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
@@@ -112,13 -112,14 +112,14 @@@ j11modules = com.sun.istack.runtime,com
  flexmark_css = utils/doc/github.css
  
  channel_properties_dir = utils/channels
+ channel_props = channel.props
  
 -install4j_home_dir = ~/buildtools/install4j8
 +install4j_home_dir = ~/buildtools/install4j9
  install4j_copyright_message = ...
  install4j_bundle_id = org.jalview.jalview-desktop
  install4j_utils_dir = utils/install4j
  install4j_images_dir = utils/install4j
 -install4j_template = install4j8_template.install4j
 +install4j_template = install4j9_template.install4j
  install4j_info_plist_file_associations = file_associations_auto-Info_plist.xml
  install4j_installer_file_associations = file_associations_auto-install4j8.xml
  #install4j_DMG_uninstaller_app_files = uninstall_old_jalview_files.xml