X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=build.gradle;h=07a409545bb3434ed98266a4115d3cda26cbdc99;hb=f82b6b6251f9cc35180881d4e5d7e48ca1783783;hp=00888450d1aafa830a9ed693cda144d587ad0e7b;hpb=00b73137cd165c4781c388b1230566986aed9213;p=jalview.git

diff --git a/build.gradle b/build.gradle
index 0088845..07a4095 100644
--- a/build.gradle
+++ b/build.gradle
@@ -55,7 +55,6 @@ ext {
   getdownResourceDir = getdownWebsiteDir + '/' + getdown_resource_dir
   getdownLauncher = jalviewDir + '/' + getdown_launcher
   getdownFilesDir = jalviewDir + '/' + getdown_files_dir + '/' + JAVA_VERSION + '/'
-  getdownLib1 = jalviewDir + '/' + getdown_lib1
   def getdownChannel = getdown_channel_name
   if (getdown_channel_name.equals("COMMIT")) {
     getdownChannel = getGitHash()
@@ -648,6 +647,9 @@ task getdownWebsite() {
     props.put("getdown_txt_java_min_version", getdown_alt_java_min_version)
     props.put("getdown_txt_multi_java_location", getdown_alt_multi_java_location)
 
+    if (getdown_local == "true") {
+      getdown_app_base = "file://"+file(getdownWebsiteDir).getAbsolutePath()
+    }
     props.put("getdown_txt_appbase", getdown_app_base)
     props.each{ prop, val ->
       if (prop.startsWith("getdown_txt_") && val != null) {
@@ -747,11 +749,6 @@ task getdownWebsite() {
     }
 
     copy {
-      from getdownLib1
-      into project.ext.getdownFilesDir + '/' + packageDir
-    }
-
-    copy {
       from jalviewDir + '/' + project.getProperty('getdown_txt_ui.background_image')
       from jalviewDir + '/' + project.getProperty('getdown_txt_ui.error_background')
       from jalviewDir + '/' + project.getProperty('getdown_txt_ui.progress_image')
@@ -770,8 +767,7 @@ task getdownDigest(type: JavaExec) {
   group = "distribution"
   description = "Digest the getdown website folder"
   dependsOn getdownWebsite
-  classpath = files(jalviewDir + '/' + getdown_core)
-  classpath file(jalviewDir + '/' + getdown_lib1)
+  classpath = files(jalviewDir + '/' + getdown_core, jalviewDir+'/'+getdown_launcher)
   main = "com.threerings.getdown.tools.Digester"
   args project.ext.getdownWebsiteDir
   inputs.dir(project.ext.getdownWebsiteDir)
@@ -804,6 +800,9 @@ install4j {
   }
   installDir = file(install4jHomeDir)
   mediaTypes = Arrays.asList(install4jMediaTypes.split(","))
+  if (install4jFaster.equals("true")) {
+    faster = true
+  }
 }
 
 def install4jConf
@@ -833,7 +832,9 @@ task copyInstall4jTemplate(type: Copy) {
         'MACOS_JAVA_VM_TGZ': macosJavaVMTgz,
         'WINDOWS_JAVA_VM_DIR': windowsJavaVMDir,
         'WINDOWS_JAVA_VM_TGZ': windowsJavaVMTgz,
-        'INSTALL4JINFOPLISTFILEASSOCIATIONS': install4jInfoPlistFileAssociations
+        'INSTALL4JINFOPLISTFILEASSOCIATIONS': install4jInfoPlistFileAssociations,
+        'COPYRIGHT_MESSAGE': install4jCopyrightMessage,
+        'MACOS_BUNDLE_ID': install4jMacOSBundleId
       ]
     )
     if (OSX_KEYPASS=="") {