JAL-3449 Added more versions to getdown splashscreen and fixed Jalview's Java Console...

[jalview.git] / build.gradle

diff --git a/build.gradle b/build.gradle
index e856939..336bc42 100644 (file)
--- 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")
@@ -1213,6 +1215,26 @@ install4j {
 
 
 task copyInstall4jTemplate(type: Copy) {
+  dependsOn setGitVals
+
+  def install4jTemplateMd5 = ""
+  def digest = MessageDigest.getInstance("MD5")
+  digest.update(
+    (file("${install4jDir}/${install4j_template}").text + 
+    file("${install4jDir}/${install4j_info_plist_file_associations}").text +
+    file("${install4jDir}/${install4j_installer_file_associations}").text).bytes)
+  def filesMd5 = new BigInteger(1, digest.digest()).toString(16)
+  if (filesMd5.length() >= 8) {
+    filesMd5 = filesMd5.substring(0,8)
+  }
+  install4jTemplateMd5 += filesMd5
+  install4jTemplateMd5 += "_${gitHash}"
+
+  inputs.file("${install4jDir}/${install4j_template}")
+  inputs.file("${install4jDir}/${install4j_info_plist_file_associations}")
+  inputs.file("${install4jDir}/${install4j_installer_file_associations}")
+  outputs.files(install4jConfFile)
+
   from (install4jDir) {
     include install4j_template
     rename (install4j_template, install4jConfFileName)
@@ -1220,9 +1242,11 @@ task copyInstall4jTemplate(type: Copy) {
       beginToken: '',
       endToken: '',
       tokens: [
-        '9999999999': JAVA_VERSION
+        '0000000000': JAVA_MIN_VERSION,
+        '9999999999': JAVA_MAX_VERSION
       ]
     )
+
     filter(ReplaceTokens,
       beginToken: '$$',
       endToken: '$$',
@@ -1235,6 +1259,7 @@ task copyInstall4jTemplate(type: Copy) {
         'WINDOWS_JAVA_VM_DIR': windowsJavaVMDir,
         'WINDOWS_JAVA_VM_TGZ': windowsJavaVMTgz,
         'INSTALL4JINFOPLISTFILEASSOCIATIONS': install4j_info_plist_file_associations,
+        'INSTALLER_TEMPLATE_MD5': install4jTemplateMd5,
         'COPYRIGHT_MESSAGE': install4j_copyright_message,
         'MACOS_BUNDLE_ID': install4j_macOS_bundle_id,
         'GETDOWN_RESOURCE_DIR': getdown_resource_dir,
@@ -1261,10 +1286,6 @@ task copyInstall4jTemplate(type: Copy) {
     }
   }
   into install4jDir
-  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
@@ -1411,3 +1432,5 @@ task helppages  {
 }
 
 // LARGE AMOUNT OF JALVIEWJS STUFF DELETED HERE
+task eclipseAutoBuildTask {}
+task eclipseSynchronizationTask {}