JAL-3252 tgz unpacking no longer needed by getdown. Unfinished code and dependency...

[jalview.git] / build.gradle

diff --git a/build.gradle b/build.gradle
index 84c38db..aeb62b6 100644 (file)
--- a/build.gradle
+++ b/build.gradle
@@ -32,7 +32,6 @@ repositories {
 }
 
 dependencies {
-  compile 'org.apache.commons:commons-compress:1.18'
 }
 
 
@@ -1227,6 +1226,14 @@ task copyInstall4jTemplate {
       }
     }
 
+    // turn off checksum creation for LOCAL channel
+    def e = install4jConfigXml.application[0]
+    if (CHANNEL == "LOCAL") {
+      e.'@createChecksums' = "false"
+    } else {
+      e.'@createChecksums' = "true"
+    }
+
     // put file association actions where placeholder action is
     def install4jFileAssociationsText = install4jFileAssociationsFile.text
     def fileAssociationActions = new XmlParser().parseText("<actions>${install4jFileAssociationsText}</actions>")
@@ -1279,6 +1286,7 @@ task installers(type: com.install4j.gradle.Install4jTask) {
   def install4jBuildDir = "${install4j_build_dir}/${JAVA_VERSION}"
 
   variables = [
+    'JALVIEW_NAME': getdown_txt_title,
     'JALVIEW_DIR': "../..",
     'OSX_KEYSTORE': OSX_KEYSTORE,
     'JSIGN_SH': JSIGN_SH,
@@ -1298,6 +1306,7 @@ task installers(type: com.install4j.gradle.Install4jTask) {
     'LINUX_JAVA_VM_TGZ': linuxJavaVMTgz,
     'COPYRIGHT_MESSAGE': install4j_copyright_message,
     'MACOS_BUNDLE_ID': install4j_macOS_bundle_id,
+    'INSTALLER_NAME': install4j_installer_name,
     'INSTALL4J_UTILS_DIR': install4j_utils_dir,
     'GETDOWN_WEBSITE_DIR': getdown_website_dir,
     'GETDOWN_FILES_DIR': getdown_files_dir,
@@ -1312,8 +1321,7 @@ task installers(type: com.install4j.gradle.Install4jTask) {
   destination = "${jalviewDir}/${install4jBuildDir}"
   buildSelected = true
 
-  if (install4j_faster.equals("true") || CHANNEL.startsWith("DEVELOP") || CHANNEL.startsWith("LOCAL")) {
-    // this doesn't seem to work
+  if (install4j_faster.equals("true") || CHANNEL.startsWith("LOCAL")) {
     faster = true
     disableSigning = true
   }