From: Ben Soares <bsoares@dundee.ac.uk>
Date: Thu, 21 Nov 2019 19:21:18 +0000 (+0000)
Subject: JAL-3449 JAL-3394 merged on install4j8 template
X-Git-Tag: Develop-2_11_2_0-d20201215~80^2~28^2~30
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=004ed0f4a0df401abfb9e76f50f89842d8115f6c;p=jalview.git

JAL-3449 JAL-3394 merged on install4j8 template
---

004ed0f4a0df401abfb9e76f50f89842d8115f6c
diff --cc build.gradle
index 69dc6da,8d84b25..e856939
--- a/build.gradle
+++ b/build.gradle
@@@ -1261,7 -1118,15 +1261,10 @@@ task copyInstall4jTemplate(type: Copy) 
      }
    }
    into install4jDir
 -
 -  inputs.files(i4jTemplate)
 -  if (install4jVersion >= 8) {
 -    inputs.files(install4jDir+"/"+install4j8InstallerFileAssociations)
 -  } else {
 -    inputs.files(install4jDir+"/"+install4jInstallerFileAssociations)
 -    inputs.files(install4jDir+"/"+install4jInfoPlistFileAssociations)
 -  }
 -  outputs.files(install4jConf)
++  inputs.file("${install4jDir}/${install4j_template}")
++  inputs.file("${install4jDir}/${install4j_installer_file_associations}")
++  inputs.file("${install4jDir}/${install4j_info_plist_file_associations}")
 +  outputs.files(install4jConfFile)
  
    doLast {
      // include file associations in installer
diff --cc gradle.properties
index 3710b59,dfb80f1..cea679c
--- a/gradle.properties
+++ b/gradle.properties
@@@ -110,17 -106,19 +110,17 @@@ j11libDir = j11li
  j11modDir = j11mod
  j11modules = com.sun.istack.runtime,com.sun.xml.bind,com.sun.xml.fastinfoset,com.sun.xml.streambuffer,com.sun.xml.txw2,com.sun.xml.ws.policy,java.activation,java.annotation,java.base,java.compiler,java.datatransfer,java.desktop,java.logging,java.management,java.management.rmi,java.naming,java.prefs,java.rmi,java.scripting,java.security.sasl,java.sql,java.xml,java.xml.bind,java.xml.soap,java.xml.ws,javax.jws,jdk.httpserver,jdk.jsobject,jdk.unsupported,jdk.xml.dom,org.jvnet.mimepull,org.jvnet.staxex,javax.servlet.api,java.ws.rs
  
 -install4jVersion = 8
 -install4jCopyrightMessage = ...
 -install4jMacOSBundleId = org.jalview.jalview-desktop
 -install4jResourceDir = utils/install4j
 -install4jTemplate = install4j_template.install4j
 -install4j8Template = install4j8_template.install4j
 -install4jInfoPlistFileAssociations = file_associations_auto-Info_plist.xml
 -install4jInstallerFileAssociations = file_associations_auto-install4j.xml
 -install4j8InstallerFileAssociations = file_associations_auto-install4j8.xml
 -install4jDMGUninstallerAppFiles = uninstall_old_jalview_files.xml
 -install4jBuildDir = build/install4j
 -install4jMediaTypes = windows,macosArchive,linuxRPM,linuxDeb,unixArchive,unixInstaller
 -install4jFaster = false
 +install4j_home_dir = ~/buildtools/install4j8
 +install4j_copyright_message = ...
 +install4j_macOS_bundle_id = org.jalview.jalview-desktop
 +install4j_utils_dir = utils/install4j
- install4j_template = install4j_template.install4j
++install4j_template = install4j8_template.install4j
 +install4j_info_plist_file_associations = file_associations_auto-Info_plist.xml
- install4j_installer_file_associations = file_associations_auto-install4j.xml
++install4j_installer_file_associations = file_associations_auto-install4j8.xml
 +#install4j_DMG_uninstaller_app_files = uninstall_old_jalview_files.xml
 +install4j_build_dir = build/install4j
 +install4j_media_types = windows,macosArchive,linuxRPM,linuxDeb,unixArchive,unixInstaller
 +install4j_faster = false
  
  OSX_KEYSTORE =
  OSX_KEYPASS =