X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=build.gradle;h=9b1eb69d2daddc1d9da951f3b6ec834ede8158f5;hb=4f8cf43cfb67fbc5ca94047b15004adb1a367dea;hp=eb4d11795b64bbab9aecd44e7ee44e1f9cd5ebd9;hpb=7ac3ec098a5f0ba4f120144c6e975f20466c8fc4;p=jalview.git

diff --git a/build.gradle b/build.gradle
index eb4d117..9b1eb69 100644
--- a/build.gradle
+++ b/build.gradle
@@ -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
@@ -1816,6 +1818,12 @@ 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") {