From: Ben Soares <b.soares@dundee.ac.uk>
Date: Thu, 31 Mar 2022 17:52:55 +0000 (+0100)
Subject: Merge branch 'task/JAL-3553_improved_install4j_output_txt' into merge/JAL-3978+JAL... 
X-Git-Tag: Release_2_11_2_6~64^2~24
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=ecdae8027a9bad9e43f0ab12c54aec09fade15a1;p=jalview.git

Merge branch 'task/JAL-3553_improved_install4j_output_txt' into merge/JAL-3978+JAL-3553+develop
---

ecdae8027a9bad9e43f0ab12c54aec09fade15a1
diff --cc build.gradle
index ec30174,6c7b7b9..420d37c
--- a/build.gradle
+++ b/build.gradle
@@@ -324,9 -318,9 +327,10 @@@ ext 
      case [ "LOCAL", "JALVIEWJS" ]:
      JALVIEW_VERSION = "TEST"
      getdownAppBase = file(getdownWebsiteDir).toURI().toString()
 +    getdownArchiveAppBase = file("${jalviewDir}/${getdown_archive_dir}").toURI().toString()
      getdownLauncher = string("${jalviewDir}/${getdown_lib_dir}/${getdown_launcher_local}")
      install4jExtraScheme = "jalviewl"
+     install4jCheckSums = false
      break
  
      default: // something wrong specified
@@@ -1943,19 -1812,9 +1947,15 @@@ task copyInstall4jTemplate 
        }
      }
  
 +    // disable install screen for OSX dmg (for 2.11.2.0)
 +    install4jConfigXml.'**'.macosArchive.each { macosArchive -> 
 +      macosArchive.attributes().remove('executeSetupApp')
 +      macosArchive.attributes().remove('setupAppId')
 +    }
 +
      // turn off checksum creation for LOCAL channel
      def e = install4jConfigXml.application[0]
-     if (CHANNEL == "LOCAL") {
-       e.'@createChecksums' = "false"
-     } else {
-       e.'@createChecksums' = "true"
-     }
+     e.'@createChecksums' = string(install4jCheckSums)
  
      // put file association actions where placeholder action is
      def install4jFileAssociationsText = install4jFileAssociationsFile.text