JAL-3393 updated Jalview Test DMG background image

[jalview.git] / build.gradle

diff --git a/build.gradle b/build.gradle
index cf96abf..97061b0 100644 (file)
--- a/build.gradle
+++ b/build.gradle
@@ -231,7 +231,7 @@ ext {
     getdownAppDistDir = getdown_app_dir_release
     reportRsyncCommand = true
     install4jSuffix = ""
-    install4jInstallerName = "${jalview_name} Installer"
+    install4jInstallerName = "${jalview_name} Installer (${JALVIEW_VERSION})"
     break
 
     case "ARCHIVE":
@@ -1607,7 +1607,9 @@ task getdownWebsite() {
         codeFiles += f
       }
     }
-    codeFiles.sort().each{f ->
+    def jalviewJar = jar.archiveFileName.getOrNull()
+    // put jalview.jar first for CLASSPATH and .properties files reasons
+    codeFiles.sort{a, b -> ( a.getName() == jalviewJar ? -1 : ( b.getName() == jalviewJar ? 1 : a <=> b ) ) }.each{f ->
       def name = f.getName()
       def line = "code = ${getdownAppDistDir}/${name}\n"
       getdownTextString += line
@@ -1818,7 +1820,8 @@ task copyInstall4jTemplate {
 
     // disable install screen for OSX dmg (for 2.11.2.0)
     install4jConfigXml.'**'.macosArchive.each { macosArchive -> 
-      macosArchive.'@executeSetupApp' = "false"
+      macosArchive.attributes().remove('executeSetupApp')
+      macosArchive.attributes().remove('setupAppId')
     }
 
     // turn off checksum creation for LOCAL channel