JAL-3473 Checked value of def and min. Set def to min if lower than min.
[jalview.git] / build.gradle
index 0f948cf..c5c16c3 100644 (file)
@@ -1,15 +1,13 @@
 import org.apache.tools.ant.filters.ReplaceTokens
-//import org.apache.tools.ant.filters.ReplaceRegexp
 import org.gradle.internal.os.OperatingSystem
-import org.gradle.plugins.ide.eclipse.model.*
-
+import org.gradle.plugins.ide.eclipse.model.Output
+import org.gradle.plugins.ide.eclipse.model.Library
 
 import groovy.transform.ExternalizeMethods
 
 buildscript {
   dependencies {
     classpath 'org.openclover:clover:4.3.1'
-    classpath 'org.apache.commons:commons-compress:1.18'
   }
 }
 
@@ -21,6 +19,27 @@ plugins {
   id 'com.install4j.gradle' version '7.0.9'
 }
 
+// local build environment properties
+def localProps = "${jalviewDir}/local.properties"
+if (file(localProps).exists()) {
+  try {
+    def p = new Properties()
+    def localPropsFIS = new FileInputStream(localProps)
+    p.load(localPropsFIS)
+    localPropsFIS.close()
+    p.each {
+      key, val -> 
+        def over = getProperty(key) != null
+        setProperty(key, val)
+        if (over) {
+          println("Overriding property '${key}' with local.properties value '${val}'")
+        }
+    }
+  } catch (Exception e) {
+    System.out.println("Exception reading local.properties")
+  }
+}
+
 repositories {
   jcenter()
   mavenCentral()
@@ -30,16 +49,20 @@ repositories {
   }
 }
 
+dependencies {
+  compile 'org.apache.commons:commons-compress:1.18'
+}
+
 mainClassName = launcherClass
-def cloverInstrDir = file("$buildDir/$cloverSourcesInstrDir")
-def classes = "$jalviewDir/$classesDir"
+def cloverInstrDir = file("${buildDir}/${cloverSourcesInstrDir}")
+def classes = "${jalviewDir}/${classesDir}"
 
 if (clover.equals("true")) {
   use_clover = true
-  classes = "$buildDir/$cloverClassesDir"
+  classes = "${buildDir}/${cloverClassesDir}"
 } else {
   use_clover = false
-  classes = "$jalviewDir/$classesDir"
+  classes = "${jalviewDir}/${classesDir}"
 }
 
 // configure classpath/args for j8/j11 compilation
@@ -51,91 +74,97 @@ def compile_source_compatibility
 def compile_target_compatibility
 
 ext {
-  getdownWebsiteDir = jalviewDir + '/' + getdown_website_dir + '/' + JAVA_VERSION
+  getdownWebsiteDir = "${jalviewDir}/${getdown_website_dir}/${JAVA_VERSION}"
   getdownDir = ""
   reportRsyncCmd = false
   buildDist = true
   buildProperties = buildPropertiesFile
+  getdownLauncher = "${jalviewDir}/${getdown_lib_dir}/${getdown_launcher}"
   switch (CHANNEL) {
 
     case "BUILD":
     // TODO: get bamboo build artifact URL for getdown artifacts
+    getdown_channel_base = bamboo_channelbase
+    getdown_channel_name = "${bamboo_planKey}/${JAVA_VERSION}"
+    getdown_app_base = "${bamboo_channelbase}/${bamboo_planKey}${bamboo_getdown_channel_suffix}/${JAVA_VERSION}"
     getdown_app_dir = getdown_app_dir_alt
-    buildProperties = jalviewDir + "/" + classesDir +"/" + buildPropertiesFile
+    buildProperties = "${jalviewDir}/${classesDir}/${buildPropertiesFile}"
     break
 
     case "RELEASE":
     getdown_channel_name = CHANNEL.toLowerCase()
-    getdownDir = getdown_channel_name + "/" + JAVA_VERSION
-    getdown_app_base = getdown_channel_base + "/" + getdownDir
+    getdownDir = "${getdown_channel_name}/${JAVA_VERSION}"
+    getdown_app_base = "${getdown_channel_base}/${getdownDir}"
     getdown_app_dir = getdown_app_dir_release
-    buildProperties = jalviewDir + "/" + classesDir +"/" + buildPropertiesFile
+    buildProperties = "${jalviewDir}/${classesDir}/${buildPropertiesFile}"
     reportRsyncCommand = true
     break
 
     case "ARCHIVE":
-    getdown_channel_name = CHANNEL.toLowerCase()+"/"+JALVIEW_VERSION
-    getdownDir = getdown_channel_name + "/" + JAVA_VERSION
-    getdown_app_base = getdown_channel_base + "/" + getdownDir
+    getdown_channel_name = CHANNEL.toLowerCase()+"/${JALVIEW_VERSION}"
+    getdownDir = "${getdown_channel_name}/${JAVA_VERSION}"
+    getdown_app_base = "${getdown_channel_base}/${getdownDir}"
     getdown_app_dir = getdown_app_dir_alt
-    if (!file(ARCHIVEDIR+"/"+packageDir).exists()) {
+    if (!file("${ARCHIVEDIR}/${packageDir}").exists()) {
       print "Must provide an ARCHIVEDIR value to produce an archive distribution"
       exit
     } else {
-      packageDir = ARCHIVEDIR + "/" + packageDir
-      buildProperties = ARCHIVEDIR +"/" + classesDir + "/" + buildPropertiesFile
+      packageDir = "${ARCHIVEDIR}/${packageDir}"
+      buildProperties = "${ARCHIVEDIR}/${classesDir}/${buildPropertiesFile}"
       buildDist = false
     }
     reportRsyncCommand = true
     break
 
     case "ARCHIVELOCAL":
-    getdown_channel_name = "archive" + "/" + JALVIEW_VERSION
-    getdownDir = getdown_channel_name + "/" + JAVA_VERSION
+    getdown_channel_name = "archive/${JALVIEW_VERSION}"
+    getdownDir = "${getdown_channel_name}/${JAVA_VERSION}"
     getdown_app_base = file(getdownWebsiteDir).toURI().toString()
     getdown_app_dir = getdown_app_dir_alt
-    if (!file(ARCHIVEDIR+"/"+packageDir).exists()) {
+    if (!file("${ARCHIVEDIR}/${packageDir}").exists()) {
       print "Must provide an ARCHIVEDIR value to produce an archive distribution"
       exit
     } else {
-      packageDir = ARCHIVEDIR + "/" + packageDir
-      buildProperties = ARCHIVEDIR +"/" + classesDir + "/" + buildPropertiesFile
+      packageDir = "${ARCHIVEDIR}/${packageDir}"
+      buildProperties = "${ARCHIVEDIR}/${classesDir}/${buildPropertiesFile}"
       buildDist = false
     }
     reportRsyncCommand = true
+    getdownLauncher = "${jalviewDir}/${getdown_lib_dir}/${getdown_launcher_local}"
     break
 
     case "DEVELOP":
     getdown_channel_name = CHANNEL.toLowerCase()
-    getdownDir = getdown_channel_name + "/" + JAVA_VERSION
-    getdown_app_base = getdown_channel_base + "/" + getdownDir
+    getdownDir = "${getdown_channel_name}/${JAVA_VERSION}"
+    getdown_app_base = "${getdown_channel_base}/${getdownDir}"
     getdown_app_dir = getdown_app_dir_alt
-    buildProperties = jalviewDir + "/" + classesDir +"/" + buildPropertiesFile
+    buildProperties = "${jalviewDir}/${classesDir}/${buildPropertiesFile}"
     reportRsyncCommand = true
     break
 
     case "TEST-RELEASE":
     getdown_channel_name = CHANNEL.toLowerCase()
-    getdownDir = getdown_channel_name + "/" + JAVA_VERSION
-    getdown_app_base = getdown_channel_base + "/" + getdownDir
+    getdownDir = "${getdown_channel_name}/${JAVA_VERSION}"
+    getdown_app_base = "${getdown_channel_base}/${getdownDir}"
     getdown_app_dir = getdown_app_dir_alt
-    buildProperties = jalviewDir + "/" + classesDir +"/" + buildPropertiesFile
+    buildProperties = "${jalviewDir}/${classesDir}/${buildPropertiesFile}"
     reportRsyncCommand = true
     break
 
     case ~/^SCRATCH(|-[-\w]*)$/:
     getdown_channel_name = CHANNEL
-    getdownDir = getdown_channel_name + "/" + JAVA_VERSION
-    getdown_app_base = getdown_channel_base + "/" + getdownDir
+    getdownDir = "${getdown_channel_name}/${JAVA_VERSION}"
+    getdown_app_base = "${getdown_channel_base}/${getdownDir}"
     getdown_app_dir = getdown_app_dir_alt
-    buildProperties = jalviewDir + "/" + classesDir +"/" + buildPropertiesFile
+    buildProperties = "${jalviewDir}/${classesDir}/${buildPropertiesFile}"
     reportRsyncCommand = true
     break
 
     case "LOCAL":
     getdown_app_base = file(getdownWebsiteDir).toURI().toString()
     getdown_app_dir = getdown_app_dir_alt
-    buildProperties = jalviewDir + "/" + classesDir +"/" + buildPropertiesFile
+    buildProperties = "${jalviewDir}/${classesDir}/${buildPropertiesFile}"
+    getdownLauncher = "${jalviewDir}/${getdown_lib_dir}/${getdown_launcher_local}"
     break
 
     default: // something wrong specified
@@ -145,20 +174,20 @@ ext {
 
   }
 
-  println("Using a "+CHANNEL+" profile. appbase="+getdown_app_base)
-  getdownAppDir = getdownWebsiteDir + '/' + getdown_app_dir
-  //getdownJ11libDir = getdownWebsiteDir + '/' + getdown_j11lib_dir
-  getdownResourceDir = getdownWebsiteDir + '/' + getdown_resource_dir
-  getdownInstallDir = getdownWebsiteDir + '/' + getdown_install_dir
-  getdownLauncher = jalviewDir + '/' + getdown_launcher
-  getdownFilesDir = jalviewDir + '/' + getdown_files_dir + '/' + JAVA_VERSION + '/'
-  getdownFilesInstallDir = getdownFilesDir+"/"+getdown_install_dir
+  getdownAppDir = "${getdownWebsiteDir}/${getdown_app_dir}"
+  //getdownJ11libDir = "${getdownWebsiteDir}/${getdown_j11lib_dir}"
+  getdownResourceDir = "${getdownWebsiteDir}/${getdown_resource_dir}"
+  getdownInstallDir = "${getdownWebsiteDir}/${getdown_install_dir}"
+  getdownFilesDir = "${jalviewDir}/${getdown_files_dir}/${JAVA_VERSION}/"
+  getdownFilesInstallDir = "${getdownFilesDir}/${getdown_install_dir}"
   /* compile without modules -- using classpath libraries
-  modules_compileClasspath = fileTree(dir: "$jalviewDir/$j11modDir", include: ["*.jar"])
+  modules_compileClasspath = fileTree(dir: "${jalviewDir}/${j11modDir}", include: ["*.jar"])
   modules_runtimeClasspath = modules_compileClasspath
   */
   gitHash = ""
   gitBranch = ""
+
+  println("Using a ${CHANNEL} profile.")
 }
 
 def JAVA_INTEGER_VERSION
@@ -214,28 +243,29 @@ if (JAVA_VERSION.equals("1.8")) {
   ]
   */
 } else {
-  throw new GradleException("JAVA_VERSION=$JAVA_VERSION not currently supported by Jalview")
+  throw new GradleException("JAVA_VERSION=${JAVA_VERSION} not currently supported by Jalview")
 }
 
 sourceSets {
 
   main {
     java {
-      srcDirs "$jalviewDir/$sourceDir"
-      outputDir = file("$classes")
+      srcDirs "${jalviewDir}/${sourceDir}"
+      outputDir = file("${classes}")
     }
 
     resources {
-      srcDirs "$jalviewDir/$resourceDir"
+      srcDirs "${jalviewDir}/${resourceDir}"
     }
 
-    jar.destinationDir = file("$jalviewDir/$packageDir")
+    jar.destinationDir = file("${jalviewDir}/${packageDir}")
 
     compileClasspath = files(sourceSets.main.java.outputDir)
-    compileClasspath += fileTree(dir: "$jalviewDir/$libDir", include: ["*.jar"])
+    compileClasspath += fileTree(dir: "${jalviewDir}/${libDir}", include: ["*.jar"])
 
     runtimeClasspath = compileClasspath
   }
+
   clover {
     java {
       srcDirs = [ cloverInstrDir ]
@@ -248,16 +278,16 @@ sourceSets {
     compileClasspath = configurations.cloverRuntime + files( sourceSets.clover.java.outputDir )
     compileClasspath += files(sourceSets.main.java.outputDir)
     compileClasspath += sourceSets.main.compileClasspath
-    compileClasspath += fileTree(dir: "$jalviewDir/$utilsDir", include: ["**/*.jar"])
-    compileClasspath += fileTree(dir: "$jalviewDir/$libDir", include: ["*.jar"])
+    compileClasspath += fileTree(dir: "${jalviewDir}/${utilsDir}", include: ["**/*.jar"])
+    compileClasspath += fileTree(dir: "${jalviewDir}/${libDir}", include: ["*.jar"])
 
     runtimeClasspath = compileClasspath
   }
 
   test {
     java {
-      srcDirs "$jalviewDir/$testSourceDir"
-      outputDir = file("$jalviewDir/$testOutputDir")
+      srcDirs "${jalviewDir}/${testSourceDir}"
+      outputDir = file("${jalviewDir}/${testOutputDir}")
     }
 
     resources {
@@ -272,8 +302,9 @@ sourceSets {
       compileClasspath += files(sourceSets.main.java.outputDir)
     }
 
-    compileClasspath += fileTree(dir: "$jalviewDir/$utilsDir", include: ["**/*.jar"])
-    compileClasspath += fileTree(dir: "$jalviewDir/$libDir", include: ["*.jar"])
+    compileClasspath += fileTree(dir: "${jalviewDir}/${libDir}", include: ["*.jar"])
+    compileClasspath += fileTree(dir: "${jalviewDir}/${utilsDir}/testnglibs", include: ["**/*.jar"])
+    compileClasspath += fileTree(dir: "${jalviewDir}/${utilsDir}/testlibs", include: ["**/*.jar"])
 
     runtimeClasspath = compileClasspath
   }
@@ -294,7 +325,7 @@ configurations {
 
 eclipse {
   project {
-    name = "Jalview with gradle build"
+    name = eclipse_project_name
 
     natures 'org.eclipse.jdt.core.javanature',
     'org.eclipse.jdt.groovy.core.groovyNature',
@@ -307,117 +338,89 @@ eclipse {
   classpath {
     //defaultOutputDir = sourceSets.main.java.outputDir
     def removeThese = []
-    configurations.each{ if (it.isCanBeResolved()) {
-      removeThese += it
+    configurations.each{
+      if (it.isCanBeResolved()) {
+        removeThese += it
+      }
     }
-  }
 
-  minusConfigurations += removeThese
-  plusConfigurations = [ ]
-  file {
+    minusConfigurations += removeThese
+    plusConfigurations = [ ]
+    file {
 
-    whenMerged { cp ->
-      def removeTheseToo = []
-      HashMap<String, Boolean> addedSrcPath = new HashMap<>();
-      cp.entries.each { entry ->
-        if (entry.kind == 'src') {
-          if (addedSrcPath.getAt(entry.path) || !(entry.path == "src" || entry.path == "test")) {
-            removeTheseToo += entry
-          } else {
-            addedSrcPath.putAt(entry.path, true)
+      whenMerged { cp ->
+        def removeTheseToo = []
+        HashMap<String, Boolean> alreadyAddedSrcPath = new HashMap<>();
+        cp.entries.each { entry ->
+          if (entry.kind == 'src') {
+            if (alreadyAddedSrcPath.getAt(entry.path) || !(entry.path == sourceDir || entry.path == testSourceDir)) {
+              removeTheseToo += entry
+            } else {
+              alreadyAddedSrcPath.putAt(entry.path, true)
+            }
           }
         }
-      }
-      cp.entries.removeAll(removeTheseToo)
-
-      print ("CP="+cp.inspect())
-
-      cp.entries += new Output("bin/main")
-      cp.entries += new Library(fileReference(helpParentDir))
-      cp.entries += new Library(fileReference(resourceDir))
-
-      HashMap<String, Boolean> addedLibPath = new HashMap<>();
+        cp.entries.removeAll(removeTheseToo)
 
-      // changing from sourcesets.main.classpath to specific Java version lib
-      //sourceSets.main.compileClasspath.each{
-      fileTree("$jalviewDir/$libDistDir").include("**/*.jar").include("*.jar").each {
-        //don't want to add outputDir as eclipse is using its own output dir in bin/main
-        if (it.isDirectory() || ! it.exists()) {
-          // don't add dirs to classpath
-          return
+        if (file("${jalviewDir}/${eclipse_bin_dir}/main").isDirectory()) {
+          cp.entries += new Output("${eclipse_bin_dir}/main")
         }
-        def itPath = it.toString()
-        if (itPath.startsWith(jalviewDirAbsolutePath+"/")) {
-          itPath = itPath.substring(jalviewDirAbsolutePath.length()+1)
+        if (file(helpParentDir).isDirectory()) {
+          cp.entries += new Library(fileReference(helpParentDir))
         }
-        if (addedLibPath.get(itPath)) {
-          //println("Not adding duplicate entry "+itPath)
-        } else {
-          //println("Adding entry "+itPath)
-          cp.entries += new Library(fileReference(itPath))
-          addedLibPath.put(itPath, true)
+        if (file(resourceDir).isDirectory()) {
+          cp.entries += new Library(fileReference(resourceDir))
         }
-      }
 
-      // changing from sourcesets.main.classpath to specific Java version lib
-      //sourceSets.test.compileClasspath.each{
-      fileTree(dir: "$jalviewDir/$utilsDir", include: ["**/*.jar"]).each {
-        //if ((it.isDirectory() || ! it.exists()) && ! (it.equals(sourceSets.main.java.outputDir))) {
-        //no longer want to add outputDir as eclipse is using its own output dir in bin/main
-        if (it.isDirectory() || ! it.exists()) {
-          // don't add dirs to classpath
-          return false // groovy "break" in .each loop
-        }
-        def itPath = it.toString()
-        if (itPath.startsWith(jalviewDirAbsolutePath+"/")) {
-          itPath = itPath.substring(jalviewDirAbsolutePath.length()+1)
-        }
-        if (addedLibPath.get(itPath)) {
-          // don't duplicate
-        } else {
-          def lib = new Library(fileReference(itPath))
-          // this doesn't work... yet.  Adding test=true attribute using withXml below
-          //def attrs = new Node(null, 'attributes', ["test":"true"])
-          //lib.appendNode(attrs) //
-          cp.entries += lib
-          addedLibPath.put(itPath, true)
-        }
-        }
-      }
+        HashMap<String, Boolean> alreadyAddedLibPath = new HashMap<>();
 
-      // withXml changes ignored by buildship, these add the "test=true" attribute
-      withXml {
-        def node = it.asNode()
-
-        def srcTestAttributes
-        node.children().each{ cpe ->
-          def attributes = cpe.attributes()
-          if (attributes.get("kind") == "src" && attributes.get("path") == "test") {
-            srcTestAttributes = cpe.find { a -> a.name() == "attributes" }
+        sourceSets.main.compileClasspath.findAll { it.name.endsWith(".jar") }.each {
+          //don't want to add outputDir as eclipse is using its own output dir in bin/main
+          if (it.isDirectory() || ! it.exists()) {
+            // don't add dirs to classpath
             return
           }
-        }
-        def addTestAttribute = true
-        srcTestAttributes.each{a ->
-          if (a.name() == "attribute" && a.attributes().getAt("name") == "test") {
-            addTestAttribute = false
+          def itPath = it.toString()
+          if (itPath.startsWith("${jalviewDirAbsolutePath}/")) {
+            // make relative path
+            itPath = itPath.substring(jalviewDirAbsolutePath.length()+1)
+          }
+          if (alreadyAddedLibPath.get(itPath)) {
+            //println("Not adding duplicate entry "+itPath)
+          } else {
+            //println("Adding entry "+itPath)
+            cp.entries += new Library(fileReference(itPath))
+            alreadyAddedLibPath.put(itPath, true)
           }
-        }
-        if (addTestAttribute) {
-          srcTestAttributes.append(new Node(null, "attribute", [name:"test", value:"true"]))
         }
 
-        node.children().each{ cpe ->
-          def attributes = cpe.attributes()
-          if (attributes.get("kind") == "lib" && attributes.get("path").startsWith("utils/")) {
-            cpe.appendNode('attributes')
-            .appendNode('attribute', [name:"test", value:"true"])
+        //fileTree(dir: "$jalviewDir/$utilsDir", include: ["test*/*.jar"]).each {
+        sourceSets.test.compileClasspath.findAll { it.name.endsWith(".jar") }.each {
+          //no longer want to add outputDir as eclipse is using its own output dir in bin/main
+          if (it.isDirectory() || ! it.exists()) {
+            // don't add dirs to classpath
+            return false // groovy "break" in .each closure
+          }
+          def itPath = it.toString()
+          if (itPath.startsWith("${jalviewDirAbsolutePath}/")) {
+            itPath = itPath.substring(jalviewDirAbsolutePath.length()+1)
+          }
+          if (alreadyAddedLibPath.get(itPath)) {
+            // don't duplicate
+          } else {
+            def lib = new Library(fileReference(itPath))
+            lib.entryAttributes["test"] = "true"
+            cp.entries += lib
+            alreadyAddedLibPath.put(itPath, true)
           }
         }
-      } // withXML
+
+      } // whenMerged
+
     } // file
 
     containers 'org.eclipse.buildship.core.gradleclasspathcontainer'
+
   } // classpath
 
   jdt {
@@ -426,10 +429,11 @@ eclipse {
     targetCompatibility = compile_target_compatibility
     javaRuntimeName = eclipse_java_runtime_name
 
+    // add in jalview project specific properties/preferences into eclipse core preferences
     file {
       withProperties { props ->
         def jalview_prefs = new Properties()
-        def ins = new FileInputStream(jalviewDirAbsolutePath+"/"+eclipse_extra_jdt_prefs_file)
+        def ins = new FileInputStream("${jalviewDirAbsolutePath}/${eclipse_extra_jdt_prefs_file}")
         jalview_prefs.load(ins)
         ins.close()
         jalview_prefs.forEach { t, v ->
@@ -439,10 +443,9 @@ eclipse {
         }
       }
     }
-  }
 
-  //synchronizationTasks eclipseClasspath
-  //autoBuildTasks eclipseClasspath
+  } // jdt
+
 }
 
 task cloverInstr() {
@@ -527,12 +530,16 @@ compileCloverJava {
 }
 
 clean {
-  delete sourceSets.main.java.outputDir
+  doFirst {
+    delete sourceSets.main.java.outputDir
+  }
 }
 
 cleanTest {
-  delete sourceSets.test.java.outputDir
-  delete cloverInstrDir
+  doFirst {
+    delete sourceSets.test.java.outputDir
+    delete cloverInstrDir
+  }
 }
 
 // format is a string like date.format("dd MMMM yyyy")
@@ -564,9 +571,9 @@ task setGitVals {
 
 task createBuildProperties(type: WriteProperties) {
   dependsOn setGitVals
-  inputs.dir("$jalviewDir/$sourceDir")
-  inputs.dir("$classes")
-  inputs.dir("$jalviewDir/$resourceDir")
+  inputs.dir("${jalviewDir}/${sourceDir}")
+  inputs.dir("${classes}")
+  inputs.dir("${jalviewDir}/${resourceDir}")
   outputFile (buildProperties)
   // taking time specific comment out to allow better incremental builds
   comment "--Jalview Build Details--\n"+getDate("yyyy-MM-dd HH:mm:ss")
@@ -577,15 +584,17 @@ task createBuildProperties(type: WriteProperties) {
   outputs.file(outputFile)
 }
 
-def buildingHTML = "$jalviewDir/$docDir/building.html"
-task deleteBuildingHTML(type: Delete) {
-  delete buildingHTML
+def buildingHTML = "${jalviewDir}/${docDir}/building.html"
+task cleanBuildingHTML(type: Delete) {
+  doFirst {
+    delete buildingHTML
+  }
 }
 
 task convertBuildingMD(type: Exec) {
-  dependsOn deleteBuildingHTML
-  def buildingMD = "$jalviewDir/$docDir/building.md"
-  def css = "$jalviewDir/$docDir/github.css"
+  dependsOn cleanBuildingHTML
+  def buildingMD = "${jalviewDir}/${docDir}/building.md"
+  def css = "${jalviewDir}/${docDir}/github.css"
 
   def pandoc = null
   pandoc_exec.split(",").each {
@@ -615,33 +624,36 @@ task convertBuildingMD(type: Exec) {
   inputs.file(css)
   outputs.file(buildingHTML)
 }
+
 clean {
-  delete buildingHTML
+  doFirst {
+    delete buildingHTML
+  }
 }
 
 task syncDocs(type: Sync) {
   dependsOn convertBuildingMD
-  def syncDir = "$classes/$docDir"
-  from fileTree("$jalviewDir/$docDir")
+  def syncDir = "${classes}/${docDir}"
+  from fileTree("${jalviewDir}/${docDir}")
   into syncDir
 
 }
 
-def helpFile = "$classes/$helpDir/help.jhm"
+def helpFile = "${classes}/${helpDir}/help.jhm"
 
 task copyHelp(type: Copy) {
-  def inputDir = "$jalviewDir/$helpParentDir/$helpDir"
-  def outputDir = "$classes/$helpDir"
+  def inputDir = "${jalviewDir}/${helpParentDir}/${helpDir}"
+  def outputDir = "${classes}/${helpDir}"
   from(inputDir) {
     exclude '**/*.gif'
-      exclude '**/*.jpg'
-      exclude '**/*.png'
-      filter(ReplaceTokens, beginToken: '$$', endToken: '$$', tokens: ['Version-Rel': JALVIEW_VERSION])
+    exclude '**/*.jpg'
+    exclude '**/*.png'
+    filter(ReplaceTokens, beginToken: '$$', endToken: '$$', tokens: ['Version-Rel': JALVIEW_VERSION,'Year-Rel': getDate("yyyy")])
   }
   from(inputDir) {
     include '**/*.gif'
-      include '**/*.jpg'
-      include '**/*.png'
+    include '**/*.jpg'
+    include '**/*.png'
   }
   into outputDir
 
@@ -651,16 +663,15 @@ task copyHelp(type: Copy) {
 }
 
 task syncLib(type: Sync) {
-  def syncDir = "$classes/$libDistDir"
-  from fileTree("$jalviewDir/$libDistDir")
+  def syncDir = "${classes}/${libDistDir}"
+  from fileTree("${jalviewDir}/${libDistDir}")
   into syncDir
 }
 
 task syncResources(type: Sync) {
-  from "$jalviewDir/$resourceDir"
+  from "${jalviewDir}/${resourceDir}"
   include "**/*.*"
-  exclude "install4j"
-  into "$classes"
+  into "${classes}"
   preserve {
     include "**"
   }
@@ -696,59 +707,73 @@ test {
   sourceCompatibility = compile_source_compatibility
   targetCompatibility = compile_target_compatibility
   jvmArgs += additional_compiler_args
-  print ("Setting target compatibility to "+targetCompatibility+"\n")
+
 }
 
 task buildIndices(type: JavaExec) {
   dependsOn copyHelp
   classpath = sourceSets.main.compileClasspath
   main = "com.sun.java.help.search.Indexer"
-  workingDir = "$classes/$helpDir"
+  workingDir = "${classes}/${helpDir}"
   def argDir = "html"
   args = [ argDir ]
-  inputs.dir("$workingDir/$argDir")
-
-  outputs.dir("$classes/doc")
-  outputs.dir("$classes/help")
-  outputs.file("$workingDir/JavaHelpSearch/DOCS")
-  outputs.file("$workingDir/JavaHelpSearch/DOCS.TAB")
-  outputs.file("$workingDir/JavaHelpSearch/OFFSETS")
-  outputs.file("$workingDir/JavaHelpSearch/POSITIONS")
-  outputs.file("$workingDir/JavaHelpSearch/SCHEMA")
-  outputs.file("$workingDir/JavaHelpSearch/TMAP")
+  inputs.dir("${workingDir}/${argDir}")
+
+  outputs.dir("${classes}/doc")
+  outputs.dir("${classes}/help")
+  outputs.file("${workingDir}/JavaHelpSearch/DOCS")
+  outputs.file("${workingDir}/JavaHelpSearch/DOCS.TAB")
+  outputs.file("${workingDir}/JavaHelpSearch/OFFSETS")
+  outputs.file("${workingDir}/JavaHelpSearch/POSITIONS")
+  outputs.file("${workingDir}/JavaHelpSearch/SCHEMA")
+  outputs.file("${workingDir}/JavaHelpSearch/TMAP")
 }
 
 task compileLinkCheck(type: JavaCompile) {
   options.fork = true
-  classpath = files("$jalviewDir/$utilsDir")
-  destinationDir = file("$jalviewDir/$utilsDir")
-  source = fileTree(dir: "$jalviewDir/$utilsDir", include: ["HelpLinksChecker.java", "BufferedLineReader.java"])
-
-  inputs.file("$jalviewDir/$utilsDir/HelpLinksChecker.java")
-  inputs.file("$jalviewDir/$utilsDir/HelpLinksChecker.java")
-  outputs.file("$jalviewDir/$utilsDir/HelpLinksChecker.class")
-  outputs.file("$jalviewDir/$utilsDir/BufferedLineReader.class")
+  classpath = files("${jalviewDir}/${utilsDir}")
+  destinationDir = file("${jalviewDir}/${utilsDir}")
+  source = fileTree(dir: "${jalviewDir}/${utilsDir}", include: ["HelpLinksChecker.java", "BufferedLineReader.java"])
+
+  inputs.file("${jalviewDir}/${utilsDir}/HelpLinksChecker.java")
+  inputs.file("${jalviewDir}/${utilsDir}/HelpLinksChecker.java")
+  outputs.file("${jalviewDir}/${utilsDir}/HelpLinksChecker.class")
+  outputs.file("${jalviewDir}/${utilsDir}/BufferedLineReader.class")
 }
 
-def helplinkscheckertouchfile = file("$jalviewDir/$utilsDir/HelpLinksChecker.touch")
 task linkCheck(type: JavaExec) {
   dependsOn prepare, compileLinkCheck
-  classpath = files("$jalviewDir/$utilsDir")
+
+  def helpLinksCheckerOutFile = file("${jalviewDir}/${utilsDir}/HelpLinksChecker.out")
+  classpath = files("${jalviewDir}/${utilsDir}")
   main = "HelpLinksChecker"
   workingDir = jalviewDir
-  def help = "$classes/$helpDir"
-  args = [ "$classes/$helpDir", "-nointernet" ]
+  def help = "${classes}/${helpDir}"
+  args = [ "${classes}/${helpDir}", "-nointernet" ]
+
+  def outFOS = new FileOutputStream(helpLinksCheckerOutFile, false) // false == don't append
+  def errFOS = outFOS
+  standardOutput = new org.apache.tools.ant.util.TeeOutputStream(
+    outFOS,
+    standardOutput)
+  errorOutput = new org.apache.tools.ant.util.TeeOutputStream(
+    outFOS,
+    errorOutput)
+
+  inputs.dir("${classes}/${helpDir}")
+  outputs.file(helpLinksCheckerOutFile)
+}
 
-  doLast {
-    helplinkscheckertouchfile.createNewFile()
-  }
+// import the pubhtmlhelp target
+ant.properties.basedir = "${jalviewDir}"
+ant.properties.helpBuildDir = "${jalviewDirAbsolutePath}/${classes}/${helpDir}"
+ant.importBuild "${utilsDir}/publishHelp.xml"
 
-  inputs.dir("$classes/$helpDir")
-  outputs.file(helplinkscheckertouchfile)
-}
 
 task cleanPackageDir(type: Delete) {
-  delete fileTree("$jalviewDir/$packageDir").include("*.jar")
+  doFirst {
+    delete fileTree(dir: "${jalviewDir}/${packageDir}", include: "*.jar")
+  }
 }
 
 jar {
@@ -763,7 +788,7 @@ jar {
     "Codebase": application_codebase
   }
 
-  destinationDir = file("$jalviewDir/$packageDir")
+  destinationDir = file("${jalviewDir}/${packageDir}")
   archiveName = rootProject.name+".jar"
 
   exclude "cache*/**"
@@ -772,19 +797,19 @@ jar {
   exclude "**/*.jar"
   exclude "**/*.jar.*"
 
-  inputs.dir("$classes")
-  outputs.file("$jalviewDir/$packageDir/$archiveName")
+  inputs.dir("${classes}")
+  outputs.file("${jalviewDir}/${packageDir}/${archiveName}")
 }
 
 task copyJars(type: Copy) {
-  from fileTree("$classes").include("**/*.jar").include("*.jar").files
-  into "$jalviewDir/$packageDir"
+  from fileTree(dir: "${classes}", include: "**/*.jar").files
+  into "${jalviewDir}/${packageDir}"
 }
 
 // doing a Sync instead of Copy as Copy doesn't deal with "outputs" very well
 task syncJars(type: Sync) {
-  from fileTree("$jalviewDir/$libDistDir").include("**/*.jar").include("*.jar").files
-  into "$jalviewDir/$packageDir"
+  from fileTree(dir: "${jalviewDir}/${libDistDir}", include: "**/*.jar").files
+  into "${jalviewDir}/${packageDir}"
   preserve {
     include jar.archiveName
   }
@@ -799,7 +824,7 @@ task makeDist {
   dependsOn cleanPackageDir
   dependsOn syncJars
   dependsOn jar
-  outputs.dir("$jalviewDir/$packageDir")
+  outputs.dir("${jalviewDir}/${packageDir}")
 }
 
 task cleanDist {
@@ -813,7 +838,7 @@ shadowJar {
   if (buildDist) {
     dependsOn makeDist
   }
-  from ("$jalviewDir/$libDistDir") {
+  from ("${jalviewDir}/${libDistDir}") {
     include("*.jar")
   }
   manifest {
@@ -832,10 +857,6 @@ task getdownWebsite() {
     dependsOn makeDist
   }
 
-       // clean the getdown website and files dir before creating getdown folders
-       delete project.ext.getdownWebsiteDir
-       delete project.ext.getdownFilesDir
-
   def getdownWebsiteResourceFilenames = []
   def getdownTextString = ""
   def getdownResourceDir = project.ext.getdownResourceDir
@@ -843,22 +864,26 @@ task getdownWebsite() {
   def getdownResourceFilenames = []
 
   doFirst {
+    // clean the getdown website and files dir before creating getdown folders
+    delete project.ext.getdownWebsiteDir
+    delete project.ext.getdownFilesDir
+
     copy {
       from buildProperties
       rename(buildPropertiesFile, getdown_build_properties)
       into project.ext.getdownAppDir
     }
-    getdownWebsiteResourceFilenames += getdown_app_dir+"/"+getdown_build_properties
+    getdownWebsiteResourceFilenames += "${getdown_app_dir}/${getdown_build_properties}"
 
     // go through properties looking for getdown_txt_...
     def props = project.properties.sort { it.key }
-       if (getdown_alt_java_min_version.length() > 0) {
-               props.put("getdown_txt_java_min_version", getdown_alt_java_min_version)
-       }
-       if (getdown_alt_java_max_version.length() > 0) {
-               props.put("getdown_txt_java_max_version", getdown_alt_java_max_version)
-       }
-       props.put("getdown_txt_multi_java_location", getdown_alt_multi_java_location)
+    if (getdown_alt_java_min_version.length() > 0) {
+      props.put("getdown_txt_java_min_version", getdown_alt_java_min_version)
+    }
+    if (getdown_alt_java_max_version.length() > 0) {
+      props.put("getdown_txt_java_max_version", getdown_alt_java_max_version)
+    }
+    props.put("getdown_txt_multi_java_location", getdown_alt_multi_java_location)
 
     props.put("getdown_txt_appbase", getdown_app_base)
     props.each{ prop, val ->
@@ -866,7 +891,7 @@ task getdownWebsite() {
         if (prop.startsWith("getdown_txt_multi_")) {
           def key = prop.substring(18)
           val.split(",").each{ v ->
-            def line = key + " = " + v + "\n"
+            def line = "${key} = ${v}\n"
             getdownTextString += line
           }
         } else {
@@ -878,16 +903,16 @@ task getdownWebsite() {
               r = file(val)
             } else if (val.indexOf('/') > 0) {
               // relative path (relative to jalviewDir)
-              r = file( jalviewDir + '/' + val )
+              r = file( "${jalviewDir}/${val}" )
             }
             if (r.exists()) {
-              val = getdown_resource_dir + '/' + r.getName()
+              val = "${getdown_resource_dir}/" + r.getName()
               getdownWebsiteResourceFilenames += val
               getdownResourceFilenames += r.getPath()
             }
           }
           if (! prop.startsWith("getdown_txt_resource")) {
-            def line = prop.substring(12) + " = " + val + "\n"
+            def line = prop.substring(12) + " = ${val}\n"
             getdownTextString += line
           }
         }
@@ -895,7 +920,7 @@ task getdownWebsite() {
     }
 
     getdownWebsiteResourceFilenames.each{ filename ->
-      getdownTextString += "resource = "+filename+"\n"
+      getdownTextString += "resource = ${filename}\n"
     }
     getdownResourceFilenames.each{ filename ->
       copy {
@@ -914,7 +939,8 @@ task getdownWebsite() {
       }
     }
     codeFiles.sort().each{f ->
-      def line = "code = " + getdown_app_dir + '/' + f.getName() + "\n"
+      def name = f.getName()
+      def line = "code = ${getdown_app_dir}/${name}\n"
       getdownTextString += line
       copy {
         from f.getPath()
@@ -925,9 +951,10 @@ task getdownWebsite() {
     // NOT USING MODULES YET, EVERYTHING SHOULD BE IN dist
     /*
     if (JAVA_VERSION.equals("11")) {
-    def j11libFiles = fileTree(dir: "$jalviewDir/$j11libDir", include: ["*.jar"]).getFiles()
+    def j11libFiles = fileTree(dir: "${jalviewDir}/${j11libDir}", include: ["*.jar"]).getFiles()
     j11libFiles.sort().each{f ->
-    def line = "code = " + getdown_j11lib_dir + '/' + f.getName() + "\n"
+    def name = f.getName()
+    def line = "code = ${getdown_j11lib_dir}/${name}\n"
     getdownTextString += line
     copy {
     from f.getPath()
@@ -939,13 +966,13 @@ task getdownWebsite() {
 
     // getdown-launcher.jar should not be in main application class path so the main application can move it when updated.  Listed as a resource so it gets updated.
     //getdownTextString += "class = " + file(getdownLauncher).getName() + "\n"
-    getdownTextString += "resource = " + getdown_launcher_new + "\n"
-    getdownTextString += "class = " + mainClass + "\n"
+    getdownTextString += "resource = ${getdown_launcher_new}\n"
+    getdownTextString += "class = ${mainClass}\n"
 
-    def getdown_txt = file(project.ext.getdownWebsiteDir + "/getdown.txt")
+    def getdown_txt = file("${project.ext.getdownWebsiteDir}/getdown.txt")
     getdown_txt.write(getdownTextString)
 
-    def launch_jvl = file(project.ext.getdownWebsiteDir + "/" + getdown_launch_jvl)
+    def launch_jvl = file("${project.ext.getdownWebsiteDir}/${getdown_launch_jvl}")
     launch_jvl.write("appbase="+props.get("getdown_txt_appbase"))
 
     copy {
@@ -956,6 +983,9 @@ task getdownWebsite() {
 
     copy {
       from getdownLauncher
+      if (file(getdownLauncher).getName() != getdown_launcher) {
+        rename(file(getdownLauncher).getName(), getdown_launcher)
+      }
       into project.ext.getdownWebsiteDir
     }
 
@@ -963,7 +993,10 @@ task getdownWebsite() {
       copy {
         from getdown_txt
         from getdownLauncher
-        from getdownWebsiteDir+"/"+getdown_build_properties
+        from "${getdownWebsiteDir}/${getdown_build_properties}"
+        if (file(getdownLauncher).getName() != getdown_launcher) {
+          rename(file(getdownLauncher).getName(), getdown_launcher)
+        }
         into getdownInstallDir
       }
 
@@ -977,18 +1010,21 @@ task getdownWebsite() {
       from getdown_txt
       from launch_jvl
       from getdownLauncher
-      from getdownWebsiteDir+"/"+getdown_build_properties
+      from "${getdownWebsiteDir}/${getdown_build_properties}"
+      if (file(getdownLauncher).getName() != getdown_launcher) {
+        rename(file(getdownLauncher).getName(), getdown_launcher)
+      }
       into getdownFilesDir
     }
 
     copy {
-         from getdownResourceDir
-      into project.ext.getdownFilesDir + '/' + getdown_resource_dir
+      from getdownResourceDir
+      into "${project.ext.getdownFilesDir}/${getdown_resource_dir}"
     }
   }
 
   if (buildDist) {
-    inputs.dir(jalviewDir + '/' + packageDir)
+    inputs.dir("${jalviewDir}/${packageDir}")
   }
   outputs.dir(project.ext.getdownWebsiteDir)
   outputs.dir(project.ext.getdownFilesDir)
@@ -998,11 +1034,13 @@ task getdownDigest(type: JavaExec) {
   group = "distribution"
   description = "Digest the getdown website folder"
   dependsOn getdownWebsite
-  classpath = files(jalviewDir + '/' + getdown_core, jalviewDir+'/'+getdown_launcher)
+  doFirst {
+    classpath = files("${getdownWebsiteDir}/${getdown_launcher}")
+  }
   main = "com.threerings.getdown.tools.Digester"
   args project.ext.getdownWebsiteDir
   inputs.dir(project.ext.getdownWebsiteDir)
-  outputs.file(project.ext.getdownWebsiteDir + '/' + "digest2.txt")
+  outputs.file("${project.ext.getdownWebsiteDir}/digest2.txt")
 }
 
 task getdown() {
@@ -1011,8 +1049,8 @@ task getdown() {
   dependsOn getdownDigest
   doLast {
     if (reportRsyncCommand) {
-      def fromDir = getdownWebsiteDir + (getdownWebsiteDir.endsWith("/")?"":"/")
-      def toDir = getdown_rsync_dest + "/" + getdownDir + (getdownDir.endsWith("/")?"":"/")
+      def fromDir = getdownWebsiteDir + (getdownWebsiteDir.endsWith('/')?'':'/')
+      def toDir = "${getdown_rsync_dest}/${getdownDir}" + (getdownDir.endsWith('/')?'':'/')
       println "LIKELY RSYNC COMMAND:"
       println "mkdir -p '$toDir'\nrsync -avh --delete '$fromDir' '$toDir'"
       if (RUNRSYNC == "true") {
@@ -1028,8 +1066,10 @@ task getdown() {
 }
 
 clean {
-  delete project.ext.getdownWebsiteDir
-  delete project.ext.getdownFilesDir
+  doFirst {
+    delete project.ext.getdownWebsiteDir
+    delete project.ext.getdownFilesDir
+  }
 }
 
 install4j {
@@ -1057,15 +1097,15 @@ def macosJavaVMDir
 def macosJavaVMTgz
 def windowsJavaVMDir
 def windowsJavaVMTgz
-def install4jDir = "$jalviewDir/$install4jResourceDir"
-def install4jConfFile = "jalview-installers-java"+JAVA_VERSION+".install4j"
-install4jConf = "$install4jDir/$install4jConfFile"
+def install4jDir = "${jalviewDir}/${install4jResourceDir}"
+def install4jConfFile = "jalview-installers-java${JAVA_VERSION}.install4j"
+install4jConf = "${install4jDir}/${install4jConfFile}"
 
 task copyInstall4jTemplate(type: Copy) {
-  macosJavaVMDir = System.env.HOME+"/buildtools/jre/openjdk-java_vm/getdown/macos-jre"+JAVA_VERSION+"/jre"
-  macosJavaVMTgz = System.env.HOME+"/buildtools/jre/openjdk-java_vm/install4j/tgz/macos-jre"+JAVA_VERSION+".tar.gz"
-  windowsJavaVMDir = System.env.HOME+"/buildtools/jre/openjdk-java_vm/getdown/windows-jre"+JAVA_VERSION+"/jre"
-  windowsJavaVMTgz = System.env.HOME+"/buildtools/jre/openjdk-java_vm/install4j/tgz/windows-jre"+JAVA_VERSION+".tar.gz"
+  macosJavaVMDir = "${System.env.HOME}/buildtools/jre/openjdk-java_vm/getdown/macos-jre${JAVA_VERSION}/jre"
+  macosJavaVMTgz = "${System.env.HOME}/buildtools/jre/openjdk-java_vm/install4j/tgz/macos-jre${JAVA_VERSION}.tar.gz"
+  windowsJavaVMDir = "${System.env.HOME}/buildtools/jre/openjdk-java_vm/getdown/windows-jre${JAVA_VERSION}/jre"
+  windowsJavaVMTgz = "${System.env.HOME}/buildtools/jre/openjdk-java_vm/install4j/tgz/windows-jre${JAVA_VERSION}.tar.gz"
   from (install4jDir) {
     include install4jTemplate
     rename (install4jTemplate, install4jConfFile)
@@ -1098,7 +1138,7 @@ task copyInstall4jTemplate(type: Copy) {
 
   doLast {
     // include file associations in installer
-    def installerFileAssociationsXml = file("$install4jDir/$install4jInstallerFileAssociations").text
+    def installerFileAssociationsXml = file("${install4jDir}/${install4jInstallerFileAssociations}").text
     ant.replaceregexp(
       byline: false,
       flags: "s",
@@ -1126,73 +1166,614 @@ task installers(type: com.install4j.gradle.Install4jTask) {
   dependsOn getdown
   dependsOn copyInstall4jTemplate
   projectFile = file(install4jConf)
-  println("Using projectFile "+projectFile)
   variables = [majorVersion: version.substring(2, 11), build: 001, OSX_KEYSTORE: OSX_KEYSTORE, JSIGN_SH: JSIGN_SH]
-  destination = "$jalviewDir/$install4jBuildDir/$JAVA_VERSION"
+  destination = "${jalviewDir}/${install4jBuildDir}/${JAVA_VERSION}"
   buildSelected = true
 
   if (OSX_KEYPASS) {
     macKeystorePassword=OSX_KEYPASS
+  }
 
+  doFirst {
+    println("Using projectFile "+projectFile)
   }
 
   inputs.dir(project.ext.getdownWebsiteDir)
   inputs.file(install4jConf)
   inputs.dir(macosJavaVMDir)
   inputs.dir(windowsJavaVMDir)
-  outputs.dir("$jalviewDir/$install4jBuildDir/$JAVA_VERSION")
-
+  outputs.dir("${jalviewDir}/${install4jBuildDir}/${JAVA_VERSION}")
 }
 
 clean {
-  delete install4jConf
+  doFirst {
+    delete install4jConf
+  }
 }
 
 task sourceDist (type: Tar) {
   
   def VERSION_UNDERSCORES = JALVIEW_VERSION.replaceAll("\\.", "_")
-  archiveFileName = project.name + "_" + VERSION_UNDERSCORES + ".tar.gz"
+  def outputFileName = "${project.name}_${VERSION_UNDERSCORES}.tar.gz"
+  // cater for buildship < 3.1 [3.0.1 is max version in eclipse 2018-09]
+  try {
+    archiveFileName = outputFileName
+  } catch (Exception e) {
+    archiveName = outputFileName
+  }
   
   compression Compression.GZIP
   
-  from jalviewDir
   into project.name
-   
-  exclude (".*")
-  exclude ("**/.*")
-  exclude ("*.class")
-  exclude ("**/*.class")
-  include (eclipse_extra_jdt_prefs_file)
-  include ("LICENSE")
-  include ("README")
-  include ("build.gradle")
-  include ("gradle.properties")
-  //include ("jalview-jalopy.xml")
-  //include ("JalviewApplet.jpx")
-  //include ("JalviewX.jpx")
-  //include ("nbbuild.xml")
-  //include ("nbproject/genfiles.properties")
-  //include ("nbproject/project.properties")
-  //include ("nbproject/project.xml")
-  include ("$sourceDir/*.java")
-  include ("$sourceDir/**/*.java")
-  include ("$sourceDir/**/*.cdr")
-  include ("$j8libDir/**/*.jar")
-  include ("$j11libDir/**/*.jar")
-  include ("$resourceDir/**/*")
-  include ("$helpDir/**/*")
+
+  def EXCLUDE_FILES=["build/*","bin/*","test-output/","test-reports","tests","clover*/*"
+  ,".*"
+  ,"benchmarking/*"
+  ,"**/.*"
+  ,"*.class"
+  ,"**/*.class","${j11modDir}/**/*.jar","appletlib","**/*locales"
+  ,"*locales/**",
+  ,"utils/InstallAnywhere"] 
+  def PROCESS_FILES=[   "AUTHORS",
+  "CITATION",
+  "FEATURETODO",
+  "JAVA-11-README",
+  "FEATURETODO",
+  "LICENSE",
+  "**/README",
+  "RELEASE",
+  "THIRDPARTYLIBS","TESTNG",
+  "build.gradle",
+  "gradle.properties",
+  "**/*.java",
+  "**/*.html",
+  "**/*.xml",
+  "**/*.gradle",
+  "**/*.groovy",
+  "**/*.properties",
+  "**/*.perl",
+  "**/*.sh"]
+
+  from(jalviewDir) {
+    exclude (EXCLUDE_FILES)
+    include (PROCESS_FILES)
+    filter(ReplaceTokens, beginToken: '$$', endToken: '$$', tokens: ['Version-Rel': JALVIEW_VERSION,'Year-Rel': getDate("yyyy")])
+  }
+  from(jalviewDir) {
+    exclude (EXCLUDE_FILES)
+    exclude (PROCESS_FILES)
   exclude ("appletlib")
   exclude ("**/*locales")
   exclude ("*locales/**")
   exclude ("utils/InstallAnywhere")
-  include ("$schemaDir/**/*")
-  include ("$utilsDir/**/*")
-  include ("$docDir/**/*")
-  include ("$examplesDir/**/*")
-  include ("getdown/**/*")
-  exclude (getdown_files_dir)
+
+    exclude (getdown_files_dir)
   exclude (getdown_website_dir)
 
+  // exluding these as not using jars as modules yet
+  exclude ("${j11modDir}/**/*.jar")
+}
+//  from (jalviewDir) {
+//    // explicit includes for stuff that seemed to not get included
+//    include(fileTree("test/**/*."))
+//    exclude(EXCLUDE_FILES)
+//    exclude(PROCESS_FILES)
+//  }
+}
+
+task helppages  {
+  dependsOn copyHelp
+  dependsOn pubhtmlhelp
+  
+  inputs.dir("${classes}/${helpDir}")
+  outputs.dir("${helpOutputDir}")
+}
+
+def jalviewjsBuildDir
+def jalviewjsSiteDir
+def jalviewjsTransferSiteDir
+task jalviewjsSitePath {
+  def relativeBuildDir = file(jalviewDirAbsolutePath).toPath().relativize(buildDir.toPath())
+  jalviewjsBuildDir = "${relativeBuildDir}/jalviewjs"
+  jalviewjsSiteDir = "${jalviewjsBuildDir}/${jalviewjs_site_dir}"
+  jalviewjsTransferSiteDir = "${jalviewjsBuildDir}/tmp/site"
+}
+
+def eclipseWorkspace
+task jalviewjsSetEclipseWorkspace {
+  def propKey = "jalviewjs_eclipse_workspace"
+  def propVal = null
+  if (project.hasProperty(propKey)) {
+    propVal = project.getProperty(propKey)
+    if (propVal.startsWith("~/")) {
+      propVal = System.getProperty("user.home") + propVal.substring(1)
+    }
+  }
+  def propsFileName = "${jalviewDirAbsolutePath}/${jalviewjsBuildDir}/${jalviewjs_eclipse_workspace_location_file}"
+  def propsFile = file(propsFileName)
+  def eclipseWsDir = propVal
+  def props = new Properties()
+
+  if (( eclipseWsDir == null || !file(eclipseWsDir).exists() ) && propsFile.exists()) {
+    def ins = new FileInputStream(propsFileName)
+    props.load(ins)
+    ins.close()
+    if (props.getProperty(propKey, null) != null) {
+      eclipseWsDir = props.getProperty(propKey)
+    }
+  }
+
+  def writeProps = false
+  if (eclipseWsDir == null || !file(eclipseWsDir).exists()) {
+    def tempDir = File.createTempDir()
+    eclipseWsDir = tempDir.getAbsolutePath()
+    writeProps = true
+  }
+  eclipseWorkspace = file(eclipseWsDir)
+
+  doFirst {
+    if (writeProps) {
+      props.setProperty(propKey, eclipseWsDir)
+      propsFile.parentFile.mkdirs()
+      def bytes = new ByteArrayOutputStream()
+      props.store(bytes, null)
+      def propertiesString = bytes.toString()
+      propsFile.text = propertiesString
+    }
+
+    println("ECLIPSE WORKSPACE: "+eclipseWorkspace.getPath())
+  }
+
+  inputs.property(propKey, eclipseWsDir)
+  outputs.file(propsFileName)
+}
+
+
+def eclipseBinary
+def eclipseVersion
+def eclipseDebug = false
+def eclipseVersionSuffix = ""
+task jalviewjsEclipsePaths {
+  def eclipseProduct
+
+  def eclipseRoot = jalviewjs_eclipse_root
+  if (eclipseRoot.startsWith("~/")) {
+    eclipseRoot = System.getProperty("user.home") + eclipseRoot.substring(1)
+  }
+  if (OperatingSystem.current().isMacOsX()) {
+    eclipseRoot += "/Eclipse.app"
+    eclipseBinary = "${eclipseRoot}/Contents/MacOS/eclipse"
+    eclipseProduct = "${eclipseRoot}/Contents/Eclipse/.eclipseproduct"
+  } else if (OperatingSystem.current().isWindows()) { // check these paths!!
+    if (file("${eclipseRoot}/eclipse").isDirectory() && file("${eclipseRoot}/eclipse/.eclipseproduct").exists()) {
+      eclipseRoot += "/eclipse"
+    }
+    eclipseBinary = "${eclipseRoot}/eclipse"
+    eclipseProduct = "${eclipseRoot}/.eclipseproduct"
+  } else { // linux or unix
+    if (file("${eclipseRoot}/eclipse").isDirectory() && file("${eclipseRoot}/eclipse/.eclipseproduct").exists()) {
+      eclipseRoot += "/eclipse"
+    }
+    eclipseBinary = "${eclipseRoot}/eclipse"
+    eclipseProduct = "${eclipseRoot}/.eclipseproduct"
+  }
+
+  eclipseVersion = "4.12" // default
+  def assumedVersion = true
+  if (file(eclipseProduct).exists()) {
+    def fis = new FileInputStream(eclipseProduct)
+    def props = new Properties()
+    props.load(fis)
+    eclipseVersion = props.getProperty("version")
+    fis.close()
+    assumedVersion = false
+  }
+  /*
+  String[] v = eclipseVersion.split("\\.")
+  def v0 = Integer.valueOf(v[0])
+  def v1 = Integer.valueOf(v[1])
+  if (v0 < 4 || ( v0 == 4 && v1 < 13 )) {
+    eclipseVersionSuffix = "_4.12"
+  } else {
+    eclipseVersionSuffix = "_4.13"
+  }
+  */
+
+  
+  def propKey = "eclipse_debug"
+  eclipseDebug = (project.hasProperty(propKey) && project.getProperty(propKey).equals("true"))
+
+  doFirst {
+    if (!assumedVersion) {
+      println("ECLIPSE VERSION=${eclipseVersion}")
+    }
+  }
+}
+
+task eclipseSetup {
+  dependsOn eclipseProject
+  dependsOn eclipseClasspath
+  dependsOn eclipseJdt
+}
+
+/* using the Copy task below
+task OLDjalviewjsEclipseCopyDropins {
+  dependsOn jalviewjsEclipsePaths
+  dependsOn jalviewjsCleanEclipse
+  def inputFiles = fileTree(dir: "${jalviewDir}/${jalviewjs_eclipse_dropins_dir}", include: "*.jar")
+  inputFiles += file(jalviewjs_j2s_plugin)
+  def outputDir = "${buildDir}/jalviewjs
+
+  inputs.files inputFiles
+  inputFiles.each { file ->
+    outputs.file("${outputDir}/${file.name}")
+  }
+
+  doLast {
+    inputFiles.each { file ->
+      copy {
+        from file
+        into outputDir
+      }
+    }
+  }
+}
+*/
+
+// this version (type: Copy) will delete anything in the eclipse dropins folder that isn't in fromDropinsDir
+task jalviewjsEclipseCopyDropins(type: Copy) {
+  dependsOn jalviewjsEclipsePaths
+
+  def inputFiles = fileTree(dir: "${jalviewDir}/${jalviewjs_eclipse_dropins_dir}", include: "*.jar")
+  inputFiles += file("${jalviewDir}/${jalviewjs_j2s_plugin}")
+  def outputDir = "${jalviewDir}/${jalviewjsBuildDir}/${jalviewjs_eclipse_tmp_dropins_dir}"
+
+  from inputFiles
+  into outputDir
+}
+
+// this eclipse -clean doesn't actually work
+task jalviewjsCleanEclipse(type: Exec) {
+  dependsOn eclipseSetup
+  dependsOn jalviewjsEclipsePaths
+  dependsOn jalviewjsEclipseCopyDropins
+
+  executable(eclipseBinary)
+  args(["-nosplash", "--launcher.suppressErrors", "-data", eclipseWorkspace.getPath(), "-clean", "-console", "-consoleLog"])
+  if (eclipseDebug) {
+    args += "-debug"
+  }
+  args += "-l"
+
+  def inputString = """exit
+y
+"""
+  def inputByteStream = new ByteArrayInputStream(inputString.getBytes())
+  standardInput = inputByteStream
+}
+/* not really working yet
+jalviewjsEclipseCopyDropins.finalizedBy jalviewjsCleanEclipse
+*/
+
+task jalviewjsUnzipFiles {
+  dependsOn jalviewjsSitePath
+
+  def zipFiles = fileTree(dir: "${jalviewDir}/${jalviewjs_libjs_dir}", include: "*.zip")
+  zipFiles += "${jalviewDir}/${jalviewjs_swingjs_zip}"
+
+  doLast {
+    zipFiles.each { file_zip -> 
+      copy {
+        from zipTree(file_zip)
+        into "${jalviewDir}/${jalviewjsSiteDir}"
+      }
+    }
+  }
+
+  inputs.files zipFiles
+  outputs.dir "${jalviewDir}/${jalviewjsSiteDir}"
+}
+
+task jalviewjsCreateJ2sSettings(type: WriteProperties) {
+  group "JalviewJS"
+  description "Create the .j2s file from the j2s.* properties"
+
+  dependsOn jalviewjsSitePath
+
+  outputFile ("${jalviewDir}/${jalviewjs_j2s_settings}")
+  def j2s_props = project.properties.findAll { it.key.startsWith("j2s.") }.sort { it.key }
+  def siteDirProperty = "j2s.site.directory"
+  def setSiteDir = false
+  j2s_props.each { prop, val ->
+    if (val != null) {
+      if (prop == siteDirProperty) {
+        if (!(val.startsWith('/') || val.startsWith("file://") )) {
+          val = "${jalviewDir}/${jalviewjsTransferSiteDir}/${val}"
+        }
+        setSiteDir = true
+      }
+      property(prop,val)
+    }
+    if (!setSiteDir) { // default site location, don't override specifically set property
+      property(siteDirProperty,"${jalviewDir}/${jalviewjsTransferSiteDir}")
+    }
+  }
+  inputs.properties(j2s_props)
+  outputs.file(outputFile)
+}
+
+task jalviewjsEclipseSetup {
+  dependsOn jalviewjsEclipseCopyDropins
+  dependsOn jalviewjsSetEclipseWorkspace
+  dependsOn jalviewjsCreateJ2sSettings
+}
+
+task jalviewjsCopyResources (type: Sync) {
+  dependsOn jalviewjsSitePath
+  def inputFiles = fileTree(dir: "${jalviewDir}/${resourceDir}")
+  def outputDir = "${jalviewDir}/${jalviewjsSiteDir}/${jalviewjs_j2s_subdir}"
+
+  from inputFiles
+  into outputDir
+  def outputFiles = []
+  rename { filename ->
+    outputFiles += "${outputDir}/${filename}"
+    null
+  }
+  preserve {
+    include "**"
+  }
+  outputs.files outputFiles
+  inputs.files inputFiles
+}
+
+task jalviewjsCopySiteResources (type: Sync) {
+  dependsOn jalviewjsSitePath
+  def inputFiles = fileTree(dir: "${jalviewDir}/${jalviewjs_site_resource_dir}")
+  def outputDir = "${jalviewDir}/${jalviewjsSiteDir}"
+
+  from inputFiles
+  into outputDir
+  def outputFiles = []
+  rename { filename ->
+    outputFiles += "${outputDir}/${filename}"
+    null
+  }
+  preserve {
+    include "**"
+  }
+  outputs.files outputFiles
+  inputs.files inputFiles
+}
+
+task jalviewjsProjectImport(type: Exec) {
+  dependsOn eclipseSetup
+  dependsOn jalviewjsEclipsePaths
+  dependsOn jalviewjsEclipseSetup
+
+  def projdir = eclipseWorkspace.getPath()+"/.metadata/.plugins/org.eclipse.core.resources/.projects/jalview/org.eclipse.jdt.core"
+  executable(eclipseBinary)
+  args(["-nosplash", "--launcher.suppressErrors", "-application", "com.seeq.eclipse.importprojects.headlessimport", "-data", eclipseWorkspace.getPath(), "-import", jalviewDirAbsolutePath])
+  if (eclipseDebug) {
+    args += "-debug"
+  }
+  args += [ "--launcher.appendVmargs", "-vmargs", "-Dorg.eclipse.equinox.p2.reconciler.dropins.directory=${jalviewDirAbsolutePath}/${jalviewjsBuildDir}/${jalviewjs_eclipse_tmp_dropins_dir}" ]
+
+  inputs.file("${jalviewDir}/.project")
+  outputs.upToDateWhen { file(projdir).exists() }
+}
+
+task jalviewjsTranspile(type: Exec) {
+  dependsOn jalviewjsEclipseSetup 
+  dependsOn jalviewjsProjectImport
+  dependsOn jalviewjsEclipsePaths
+
+  executable(eclipseBinary)
+  args(["-nosplash", "--launcher.suppressErrors", "-application", "org.eclipse.jdt.apt.core.aptBuild", "-data", eclipseWorkspace, "-${jalviewjs_eclipse_build_arg}", eclipse_project_name ])
+  if (eclipseDebug) {
+    args += "-debug"
+  }
+  args += [ "--launcher.appendVmargs", "-vmargs", "-Dorg.eclipse.equinox.p2.reconciler.dropins.directory=${jalviewDirAbsolutePath}/${jalviewjsBuildDir}/${jalviewjs_eclipse_tmp_dropins_dir}" ]
+
+  def stdout
+  def stderr
+  doFirst {
+    stdout = new ByteArrayOutputStream()
+    stderr = new ByteArrayOutputStream()
+
+    def logOutFileName = "${jalviewDirAbsolutePath}/${jalviewjsBuildDir}/${jalviewjs_j2s_stdout}"
+    def logOutFile = file(logOutFileName)
+    logOutFile.createNewFile()
+    logOutFile.text = """ROOT: ${jalviewjs_eclipse_root}
+BINARY: ${eclipseBinary}
+VERSION: ${eclipseVersion}
+WORKSPACE: ${eclipseWorkspace}
+DEBUG: ${eclipseDebug}
+----
+"""
+    def logOutFOS = new FileOutputStream(logOutFile, true) // true == append
+    //def logErrFileName = "${jalviewDir}/${jalviewjsBuildDir}/${jalviewjs_j2s_stderr}"
+    //def logErrFile = file(logFileName)
+    //logErrFile.createNewFile()
+    //def logErrFOS = new FileErrputStream(logErrFile, false)
+    // combine stdout and stderr
+    def logErrFOS = logOutFOS
+
+    if (jalviewjs_j2s_to_console.equals("true")) {
+      standardOutput = new org.apache.tools.ant.util.TeeOutputStream(
+        new org.apache.tools.ant.util.TeeOutputStream(
+          logOutFOS,
+          stdout),
+        standardOutput)
+      errorOutput = new org.apache.tools.ant.util.TeeOutputStream(
+        new org.apache.tools.ant.util.TeeOutputStream(
+          logErrFOS,
+          stderr),
+        errorOutput)
+    } else {
+      standardOutput = new org.apache.tools.ant.util.TeeOutputStream(
+        logOutFOS,
+        stdout)
+      errorOutput = new org.apache.tools.ant.util.TeeOutputStream(
+        logErrFOS,
+        stderr)
+    }
+  }
+
+  doLast {
+    if (stdout.toString().contains("Error processing ")) {
+      // j2s did not complete transpile
+      throw new GradleException("Error during transpilation:\n${stderr}\nSee eclipse transpile log file '${jalviewDir}/${jalviewjsBuildDir}/${jalviewjs_j2s_stdout}'")
+    }
+  }
+
+  inputs.dir("${jalviewDir}/${sourceDir}")
+  outputs.dir("${jalviewDir}/${jalviewjsTransferSiteDir}")
+  outputs.upToDateWhen( { file("${jalviewDir}/${jalviewjsTransferSiteDir}${jalviewjs_server_resource}").exists() } )
+}
+
+task jalviewjsCopyTransferSite(type: Copy) {
+  dependsOn jalviewjsTranspile
+  from "${jalviewDir}/${jalviewjsTransferSiteDir}"
+  into "${jalviewDir}/${jalviewjsSiteDir}"
+}
+
+jalviewjsUnzipFiles.mustRunAfter jalviewjsCopyTransferSite
+jalviewjsCopyResources.mustRunAfter jalviewjsCopyTransferSite
+jalviewjsCopySiteResources.mustRunAfter jalviewjsCopyTransferSite
+
+task jalviewjsPrepareSite {
+  group "JalviewJS"
+  description "Prepares the website folder including unzipping files and copying resources"
+  dependsOn jalviewjsSitePath
+  dependsOn jalviewjsUnzipFiles
+  dependsOn jalviewjsCopyResources
+  dependsOn jalviewjsCopySiteResources
+}
+
+task jalviewjsBuildSite {
+  group "JalviewJS"
+  description "Builds the whole website including transpiled code"
+  dependsOn jalviewjsCopyTransferSite
+  dependsOn jalviewjsPrepareSite
+}
+
+task cleanJalviewjsSite {
+  doFirst {
+    delete "${jalviewDir}/${jalviewjsTransferSiteDir}"
+    delete "${jalviewDir}/${jalviewjsSiteDir}"
+  }
+}
+
+task jalviewjsSiteTar(type: Tar) {
+  group "JalviewJS"
+  description "Creates a tar.gz file for the website"
+  dependsOn jalviewjsBuildSite
+  def outputFilename = "jalviewjs-site-${JALVIEW_VERSION}.tar.gz"
+  try {
+    archiveFileName = outputFilename
+  } catch (Exception e) {
+    archiveName = outputFilename
+  }
+
+  compression Compression.GZIP
+
+  from "${jalviewDir}/${jalviewjsSiteDir}"
+  into jalviewjs_site_dir // this is inside the tar file
+
+  inputs.dir("${jalviewDir}/${jalviewjsSiteDir}")
+}
+
+task jalviewjsServer {
+  group "JalviewJS"
+  description "Starts a webserver on localhost to test the website"
+  dependsOn jalviewjsSitePath
+  def htmlFile = "${jalviewDirAbsolutePath}/jalviewjsTest.html"
+  doLast {
+
+    SimpleHttpFileServerFactory factory = new SimpleHttpFileServerFactory()
+    def port = Integer.valueOf(jalviewjs_server_port)
+    def start = port
+    def running = false
+    def url
+    while(port < start+1000 && !running) {
+      try {
+        def doc_root = new File("${jalviewDirAbsolutePath}/${jalviewjsSiteDir}")
+        def jalviewjsServer = factory.start(doc_root, port)
+        running = true
+        url = jalviewjsServer.getResourceUrl(jalviewjs_server_resource)
+        println("SERVER STARTED with document root ${doc_root}.")
+        println("Go to "+url+" . Run  gradle --stop  to stop (kills all gradle daemons).")
+        println("For debug: "+url+"?j2sdebug")
+
+        file(htmlFile).text = """
+        <p><a href="${url}">Jalview JS Test. &lt;${url}&gt;</a></p>
+        <p><a href="${url}?j2sdebug">Jalview JS Test with debug. &lt;${url}?j2sdebug&lt;</a></p>
+        """
+
+      } catch (Exception e) {
+        port++;
+      }
+    }
+
+  }
+
+  outputs.file(htmlFile)
+  outputs.upToDateWhen({false})
+}
+
+task cleanJalviewjsAll {
+  group "JalviewJS"
+  description "Delete all configuration and build artifacts to do with JalviewJS build"
+  dependsOn cleanJalviewjsSite
+  dependsOn jalviewjsEclipsePaths
+  
+  doFirst {
+    delete "${jalviewDir}/${jalviewjsBuildDir}"
+    delete "${jalviewDir}/${eclipse_bin_dir}"
+    if (eclipseWorkspace != null && file(eclipseWorkspace.getAbsolutePath()+"/.metadata").exists()) {
+      delete file(eclipseWorkspace.getAbsolutePath()+"/.metadata")
+    }
+    delete "${jalviewDir}/${jalviewjs_j2s_settings}"
+  }
+
+  outputs.upToDateWhen( { false } )
+}
+
+task jalviewjs {
+  group "JalviewJS"
+  description "Build the site"
+  dependsOn jalviewjsBuildSite
+}
+
+
+task jalviewjsIDECopyTransferSite(type: Copy) {
+  from "${jalviewDir}/${jalviewjsTransferSiteDir}"
+  into "${jalviewDir}/${jalviewjsSiteDir}"
+}
+
+task jalviewjsIDEj2s {
+  group "JalviewJS in Eclipse"
+  description "Creates the .j2s file"
+  dependsOn jalviewjsCreateJ2sSettings
+}
+
+task jalviewjsIDEBuildSite {
+  group "JalviewJS in Eclipse"
+  description "Copies the Eclipse transpiled site and unzips supporting zipfiles"
+  dependsOn jalviewjsIDECopyTransferSite
+  dependsOn jalviewjsPrepareSite
+}
+
+task jalviewjsIDESiteClean {
+  group "JalviewJS in Eclipse"
+  description "Deletes the Eclipse transpiled site"
+  dependsOn cleanJalviewjsSite
+}
+
+task jalviewjsIDEServer {
+  group "JalviewJS in Eclipse"
+  description "Starts a webserver on localhost to test the website"
+  dependsOn jalviewjsServer
 }