X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=build.gradle;h=d32a6b2460b907f19a2ad7611df9ea6e27dc50dd;hb=2f0f4a60825f566eb793cba837144e2de767a9a6;hp=52c0385b6459302c6a85d1971d40debe3b003e26;hpb=6f830d8a3d9347f9cf31b41f0b05a33ec74bc0b8;p=jalview.git

diff --git a/build.gradle b/build.gradle
index 52c0385..d32a6b2 100644
--- a/build.gradle
+++ b/build.gradle
@@ -19,27 +19,6 @@ 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()
@@ -74,6 +53,27 @@ def compile_source_compatibility
 def compile_target_compatibility
 
 ext {
+  // local build environment properties
+  def localProps = "${jalviewDirAbsolutePath}/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")
+    }
+  }
+
   getdownWebsiteDir = "${jalviewDir}/${getdown_website_dir}/${JAVA_VERSION}"
   getdownDir = ""
   reportRsyncCmd = false
@@ -246,6 +246,7 @@ if (JAVA_VERSION.equals("1.8")) {
   throw new GradleException("JAVA_VERSION=${JAVA_VERSION} not currently supported by Jalview")
 }
 
+
 sourceSets {
 
   main {
@@ -310,6 +311,7 @@ sourceSets {
   }
 }
 
+
 // clover bits
 dependencies {
   if (use_clover) {
@@ -318,11 +320,13 @@ dependencies {
   }
 }
 
+
 configurations {
   cloverRuntime
   cloverRuntime.extendsFrom cloverCompile
 }
 
+
 eclipse {
   project {
     name = eclipse_project_name
@@ -395,12 +399,13 @@ eclipse {
         }
 
         //fileTree(dir: "$jalviewDir/$utilsDir", include: ["test*/*.jar"]).each {
-        sourceSets.test.compileClasspath.findAll { it.name.endsWith(".jar") }.each {
+        sourceSets.test.compileClasspath.findAll { it.name.endsWith(".jar") }.any {
           //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
+            return false // groovy "continue" in .any closure
           }
+
           def itPath = it.toString()
           if (itPath.startsWith("${jalviewDirAbsolutePath}/")) {
             itPath = itPath.substring(jalviewDirAbsolutePath.length()+1)
@@ -451,6 +456,7 @@ eclipse {
 
 }
 
+
 task cloverInstr() {
   // only instrument source, we build test classes as normal
   inputs.files files (sourceSets.main.allJava) // , fileTree(dir:"$jalviewDir/$testSourceDir", include: ["**/*.java"]))
@@ -490,7 +496,6 @@ task cloverReport {
     com.atlassian.clover.reporters.xml.XMLReporter.runReport(args)
   }
 }
-
 // end clover bits
 
 
@@ -505,6 +510,7 @@ compileJava {
 
 }
 
+
 compileTestJava {
   if (use_clover) {
     dependsOn compileCloverJava
@@ -532,12 +538,14 @@ compileCloverJava {
   classpath += configurations.cloverRuntime
 }
 
+
 clean {
   doFirst {
     delete sourceSets.main.java.outputDir
   }
 }
 
+
 cleanTest {
   doFirst {
     delete sourceSets.test.java.outputDir
@@ -545,12 +553,14 @@ cleanTest {
   }
 }
 
+
 // format is a string like date.format("dd MMMM yyyy")
 def getDate(format) {
   def date = new Date()
   return date.format(format)
 }
 
+
 task setGitVals {
   def hashStdOut = new ByteArrayOutputStream()
   exec {
@@ -572,6 +582,7 @@ task setGitVals {
   outputs.upToDateWhen { false }
 }
 
+
 task createBuildProperties(type: WriteProperties) {
   dependsOn setGitVals
   inputs.dir("${jalviewDir}/${sourceDir}")
@@ -587,6 +598,7 @@ task createBuildProperties(type: WriteProperties) {
   outputs.file(outputFile)
 }
 
+
 def buildingHTML = "${jalviewDir}/${docDir}/building.html"
 task cleanBuildingHTML(type: Delete) {
   doFirst {
@@ -594,6 +606,7 @@ task cleanBuildingHTML(type: Delete) {
   }
 }
 
+
 task convertBuildingMD(type: Exec) {
   dependsOn cleanBuildingHTML
   def buildingMD = "${jalviewDir}/${docDir}/building.md"
@@ -628,12 +641,14 @@ task convertBuildingMD(type: Exec) {
   outputs.file(buildingHTML)
 }
 
+
 clean {
   doFirst {
     delete buildingHTML
   }
 }
 
+
 task syncDocs(type: Sync) {
   dependsOn convertBuildingMD
   def syncDir = "${classes}/${docDir}"
@@ -642,8 +657,8 @@ task syncDocs(type: Sync) {
 
 }
 
-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}"
@@ -665,12 +680,14 @@ task copyHelp(type: Copy) {
   outputs.dir(outputDir)
 }
 
+
 task syncLib(type: Sync) {
   def syncDir = "${classes}/${libDistDir}"
   from fileTree("${jalviewDir}/${libDistDir}")
   into syncDir
 }
 
+
 task syncResources(type: Sync) {
   from "${jalviewDir}/${resourceDir}"
   include "**/*.*"
@@ -680,6 +697,7 @@ task syncResources(type: Sync) {
   }
 }
 
+
 task prepare {
   dependsOn syncResources
   dependsOn syncDocs
@@ -713,6 +731,7 @@ test {
 
 }
 
+
 task buildIndices(type: JavaExec) {
   dependsOn copyHelp
   classpath = sourceSets.main.compileClasspath
@@ -732,6 +751,7 @@ task buildIndices(type: JavaExec) {
   outputs.file("${workingDir}/JavaHelpSearch/TMAP")
 }
 
+
 task compileLinkCheck(type: JavaCompile) {
   options.fork = true
   classpath = files("${jalviewDir}/${utilsDir}")
@@ -744,6 +764,7 @@ task compileLinkCheck(type: JavaCompile) {
   outputs.file("${jalviewDir}/${utilsDir}/BufferedLineReader.class")
 }
 
+
 task linkCheck(type: JavaExec) {
   dependsOn prepare, compileLinkCheck
 
@@ -804,11 +825,13 @@ jar {
   outputs.file("${jalviewDir}/${packageDir}/${archiveName}")
 }
 
+
 task copyJars(type: Copy) {
   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(dir: "${jalviewDir}/${libDistDir}", include: "**/*.jar").files
@@ -818,6 +841,7 @@ task syncJars(type: Sync) {
   }
 }
 
+
 task makeDist {
   group = "build"
   description = "Put all required libraries in dist"
@@ -830,6 +854,7 @@ task makeDist {
   outputs.dir("${jalviewDir}/${packageDir}")
 }
 
+
 task cleanDist {
   dependsOn cleanPackageDir
   dependsOn cleanTest
@@ -853,6 +878,7 @@ shadowJar {
   minimize()
 }
 
+
 task getdownWebsite() {
   group = "distribution"
   description = "Create the getdown minimal app folder, and website folder for this version of jalview. Website folder also used for offline app installer"
@@ -1033,6 +1059,7 @@ task getdownWebsite() {
   outputs.dir(project.ext.getdownFilesDir)
 }
 
+
 task getdownDigest(type: JavaExec) {
   group = "distribution"
   description = "Digest the getdown website folder"
@@ -1046,6 +1073,7 @@ task getdownDigest(type: JavaExec) {
   outputs.file("${project.ext.getdownWebsiteDir}/digest2.txt")
 }
 
+
 task getdown() {
   group = "distribution"
   description = "Create the minimal and full getdown app folder for installers and website and create digest file"
@@ -1068,6 +1096,7 @@ task getdown() {
   }
 }
 
+
 clean {
   doFirst {
     delete project.ext.getdownWebsiteDir
@@ -1075,6 +1104,7 @@ clean {
   }
 }
 
+
 install4j {
   def install4jHomeDir = "/opt/install4j"
   def hostname = "hostname".execute().text.trim()
@@ -1095,6 +1125,7 @@ install4j {
   }
 }
 
+
 def install4jConf
 def macosJavaVMDir
 def macosJavaVMTgz
@@ -1163,6 +1194,7 @@ task copyInstall4jTemplate(type: Copy) {
   }
 }
 
+
 task installers(type: com.install4j.gradle.Install4jTask) {
   group = "distribution"
   description = "Create the install4j installers"
@@ -1188,12 +1220,14 @@ task installers(type: com.install4j.gradle.Install4jTask) {
   outputs.dir("${jalviewDir}/${install4jBuildDir}/${JAVA_VERSION}")
 }
 
+
 clean {
   doFirst {
     delete install4jConf
   }
 }
 
+
 task sourceDist (type: Tar) {
   
   def VERSION_UNDERSCORES = JALVIEW_VERSION.replaceAll("\\.", "_")
@@ -1264,6 +1298,7 @@ task sourceDist (type: Tar) {
 //  }
 }
 
+
 task helppages  {
   dependsOn copyHelp
   dependsOn pubhtmlhelp
@@ -1272,10 +1307,12 @@ task helppages  {
   outputs.dir("${helpOutputDir}")
 }
 
+
 def jalviewjsBuildDir
 def jalviewjsSiteDir
 def jalviewjsTransferSiteJsDir
 def jalviewjsTransferSiteLibDir
+def jalviewjsTransferSiteSwingJsDir
 def jalviewjsTransferSiteCoreDir
 task jalviewjsSitePath {
   def relativeBuildDir = file(jalviewDirAbsolutePath).toPath().relativize(buildDir.toPath())
@@ -1283,9 +1320,11 @@ task jalviewjsSitePath {
   jalviewjsSiteDir = "${jalviewjsBuildDir}/${jalviewjs_site_dir}"
   jalviewjsTransferSiteJsDir = "${jalviewjsBuildDir}/tmp/${jalviewjs_site_dir}_js"
   jalviewjsTransferSiteLibDir = "${jalviewjsBuildDir}/tmp/${jalviewjs_site_dir}_lib"
+  jalviewjsTransferSiteSwingJsDir = "${jalviewjsBuildDir}/tmp/${jalviewjs_site_dir}_swingjs"
   jalviewjsTransferSiteCoreDir = "${jalviewjsBuildDir}/tmp/${jalviewjs_site_dir}_core"
 }
 
+
 def eclipseWorkspace
 task jalviewjsSetEclipseWorkspace {
   def propKey = "jalviewjs_eclipse_workspace"
@@ -1354,7 +1393,7 @@ task jalviewjsEclipsePaths {
     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"
+      eclipseRoot += "/eclipse.exe"
     }
     eclipseBinary = "${eclipseRoot}/eclipse"
     eclipseProduct = "${eclipseRoot}/.eclipseproduct"
@@ -1366,7 +1405,7 @@ task jalviewjsEclipsePaths {
     eclipseProduct = "${eclipseRoot}/.eclipseproduct"
   }
 
-  eclipseVersion = "4.12" // default
+  eclipseVersion = "4.13" // default
   def assumedVersion = true
   if (file(eclipseProduct).exists()) {
     def fis = new FileInputStream(eclipseProduct)
@@ -1376,17 +1415,6 @@ task jalviewjsEclipsePaths {
     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"))
@@ -1398,35 +1426,13 @@ task jalviewjsEclipsePaths {
   }
 }
 
+
 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) {
@@ -1440,6 +1446,7 @@ task jalviewjsEclipseCopyDropins(type: Copy) {
   into outputDir
 }
 
+
 // this eclipse -clean doesn't actually work
 task jalviewjsCleanEclipse(type: Exec) {
   dependsOn eclipseSetup
@@ -1459,16 +1466,33 @@ y
   def inputByteStream = new ByteArrayInputStream(inputString.getBytes())
   standardInput = inputByteStream
 }
+
 /* not really working yet
 jalviewjsEclipseCopyDropins.finalizedBy jalviewjsCleanEclipse
 */
 
-def jalviewjsTransferSiteUnzipDir
+
+task jalviewjsTransferUnzipSwingJs {
+  dependsOn jalviewjsSitePath
+
+  def file_zip = "${jalviewDir}/${jalviewjs_swingjs_zip}"
+
+  doLast {
+    copy {
+      from zipTree(file_zip)
+      into "${jalviewDir}/${jalviewjsTransferSiteSwingJsDir}"
+    }
+  }
+
+  inputs.file file_zip
+  outputs.dir "${jalviewDir}/${jalviewjsTransferSiteSwingJsDir}"
+}
+
+
 task jalviewjsTransferUnzipLib {
   dependsOn jalviewjsSitePath
 
   def zipFiles = fileTree(dir: "${jalviewDir}/${jalviewjs_libjs_dir}", include: "*.zip")
-  zipFiles += "${jalviewDir}/${jalviewjs_swingjs_zip}"
 
   doLast {
     zipFiles.each { file_zip -> 
@@ -1483,6 +1507,13 @@ task jalviewjsTransferUnzipLib {
   outputs.dir "${jalviewDir}/${jalviewjsTransferSiteLibDir}"
 }
 
+
+task jalviewjsTransferUnzipAllLibs {
+  dependsOn jalviewjsTransferUnzipSwingJs
+  dependsOn jalviewjsTransferUnzipLib
+}
+
+
 task jalviewjsCreateJ2sSettings(type: WriteProperties) {
   group "JalviewJS"
   description "Create the .j2s file from the j2s.* properties"
@@ -1511,16 +1542,19 @@ task jalviewjsCreateJ2sSettings(type: WriteProperties) {
   outputs.file(outputFile)
 }
 
+
 task jalviewjsEclipseSetup {
   dependsOn jalviewjsEclipseCopyDropins
   dependsOn jalviewjsSetEclipseWorkspace
   dependsOn jalviewjsCreateJ2sSettings
 }
 
-task jalviewjsSyncLib (type: Sync) {
+
+task jalviewjsSyncAllLibs (type: Sync) {
   dependsOn jalviewjsSitePath
-  dependsOn jalviewjsTransferUnzipLib
+  dependsOn jalviewjsTransferUnzipAllLibs
   def inputFiles = fileTree(dir: "${jalviewDir}/${jalviewjsTransferSiteLibDir}")
+  inputFiles += fileTree(dir: "${jalviewDir}/${jalviewjsTransferSiteSwingJsDir}")
   def outputDir = "${jalviewDir}/${jalviewjsSiteDir}"
 
   from inputFiles
@@ -1537,25 +1571,6 @@ task jalviewjsSyncLib (type: Sync) {
   inputs.files inputFiles
 }
 
-task jalviewjsSyncCore (type: Sync) {
-  dependsOn jalviewjsSitePath
-  dependsOn "jalviewjsBuildAllCores"
-  def inputFiles = fileTree(dir: "${jalviewDir}/${jalviewjsTransferSiteCoreDir}")
-  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 jalviewjsSyncResources (type: Sync) {
   dependsOn jalviewjsSitePath
@@ -1576,6 +1591,7 @@ task jalviewjsSyncResources (type: Sync) {
   inputs.files inputFiles
 }
 
+
 task jalviewjsSyncSiteResources (type: Sync) {
   dependsOn jalviewjsSitePath
   def inputFiles = fileTree(dir: "${jalviewDir}/${jalviewjs_site_resource_dir}")
@@ -1595,6 +1611,7 @@ task jalviewjsSyncSiteResources (type: Sync) {
   inputs.files inputFiles
 }
 
+
 task jalviewjsSyncBuildProperties (type: Sync) {
   dependsOn jalviewjsSitePath
   dependsOn createBuildProperties
@@ -1615,11 +1632,19 @@ task jalviewjsSyncBuildProperties (type: Sync) {
   inputs.files inputFiles
 }
 
+
 task jalviewjsProjectImport(type: Exec) {
   dependsOn eclipseSetup
   dependsOn jalviewjsEclipsePaths
   dependsOn jalviewjsEclipseSetup
 
+  doFirst {
+    // do not run a headless import when we claim to be in Eclipse
+    if (ECLIPSE_IDE_DEVELOPER.equals("true")) {
+      throw new StopExecutionException("Not running headless import whilst ECLIPSE_IDE_DEVELOPER is '"+ECLIPSE_IDE_DEVELOPER+"'")
+    }
+  }
+
   //def projdir = eclipseWorkspace.getPath()+"/.metadata/.plugins/org.eclipse.core.resources/.projects/jalview/org.eclipse.jdt.core"
   def projdir = eclipseWorkspace.getPath()+"/.metadata/.plugins/org.eclipse.core.resources/.projects/jalview"
   executable(eclipseBinary)
@@ -1635,11 +1660,19 @@ task jalviewjsProjectImport(type: Exec) {
   }
 }
 
+
 task jalviewjsTranspile(type: Exec) {
   dependsOn jalviewjsEclipseSetup 
   dependsOn jalviewjsProjectImport
   dependsOn jalviewjsEclipsePaths
 
+  doFirst {
+    // do not run a headless transpile when we claim to be in Eclipse
+    if (ECLIPSE_IDE_DEVELOPER.equals("true")) {
+      throw new StopExecutionException("Not running headless transpile whilst ECLIPSE_IDE_DEVELOPER is '"+ECLIPSE_IDE_DEVELOPER+"'")
+    }
+  }
+
   executable(eclipseBinary)
   args(["-nosplash", "--launcher.suppressErrors", "-application", "org.eclipse.jdt.apt.core.aptBuild", "-data", eclipseWorkspace, "-${jalviewjs_eclipse_build_arg}", eclipse_project_name ])
   if (eclipseDebug) {
@@ -1664,10 +1697,6 @@ 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
 
@@ -1695,6 +1724,7 @@ DEBUG: ${eclipseDebug}
   doLast {
     if (stdout.toString().contains("Error processing ")) {
       // j2s did not complete transpile
+      //throw new TaskExecutionException("Error during transpilation:\n${stderr}\nSee eclipse transpile log file '${jalviewDir}/${jalviewjsBuildDir}/${jalviewjs_j2s_transpile_stdout}'")
       throw new GradleException("Error during transpilation:\n${stderr}\nSee eclipse transpile log file '${jalviewDir}/${jalviewjsBuildDir}/${jalviewjs_j2s_transpile_stdout}'")
     }
   }
@@ -1704,6 +1734,240 @@ DEBUG: ${eclipseDebug}
   outputs.upToDateWhen( { file("${jalviewDir}/${jalviewjsTransferSiteJsDir}${jalviewjs_server_resource}").exists() } )
 }
 
+
+def jalviewjsCallCore(FileCollection list, String prefixFile, String suffixFile, String jsfile, String zjsfile, File logOutFile, Boolean logOutConsole) {
+
+  def stdout = new ByteArrayOutputStream()
+  def stderr = new ByteArrayOutputStream()
+
+  def coreFile = file(jsfile)
+  def msg = ""
+  msg = "Generating ${jsfile}"
+  println(msg)
+  logOutFile.createNewFile()
+  logOutFile.append(msg+"\n")
+
+  def coreTop = file(prefixFile)
+  def coreBottom = file(suffixFile)
+  coreFile.getParentFile().mkdirs()
+  coreFile.createNewFile()
+  coreFile.write( coreTop.text )
+  list.each {
+    f ->
+    if (f.exists()) {
+      def t = f.text
+      t.replaceAll("Clazz\\.","Clazz_")
+      t.replaceAll("Class__","Clazz._")
+      coreFile.append( t )
+    } else {
+      msg = "...file '"+f.getPath()+"' does not exist, skipping"
+      println(msg)
+      logOutFile.append(msg+"\n")
+    }
+  }
+  coreFile.append( coreBottom.text )
+
+  msg = "Generating ${zjsfile}"
+  println(msg)
+  logOutFile.append(msg+"\n")
+  def logOutFOS = new FileOutputStream(logOutFile, true) // true == append
+  def logErrFOS = logOutFOS
+
+  javaexec {
+    classpath = files(["${jalviewDir}/tools/closure_compiler.jar"])
+    args = [ "--js", jsfile, "--js_output_file", zjsfile ]
+
+    msg = "\nRunning '"+commandLine.join(' ')+"'\n"
+    println(msg)
+    logOutFile.append(msg+"\n")
+
+    if (logOutConsole) {
+      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)
+    }
+  }
+  msg = "--"
+  println(msg)
+  logOutFile.append(msg+"\n")
+}
+
+
+def jalviewjsJalviewTemplateName = "JalviewJS"
+def jalviewjsJalviewCoreName = "_jalview"
+task jalviewjsNoTranspileBuildAllCores {
+  dependsOn jalviewjsSitePath
+  dependsOn jalviewjsTransferUnzipSwingJs
+
+  def j2sDir = "${jalviewDir}/${jalviewjsTransferSiteJsDir}/${jalviewjs_j2s_subdir}"
+  def jsDir = "${jalviewDir}/${jalviewjsTransferSiteSwingJsDir}/${jalviewjs_js_subdir}"
+  def outputDir = "${jalviewDir}/${jalviewjsTransferSiteCoreDir}/${jalviewjs_j2s_subdir}/core"
+  def prefixFile = "${jsDir}/core/coretop2.js"
+  def suffixFile = "${jsDir}/core/corebottom2.js"
+
+  inputs.file prefixFile
+  inputs.file suffixFile
+
+  def classlistFiles = []
+  // add the classlists found int the jalviewjs_classlists_dir
+  fileTree(dir: "${jalviewDir}/${jalviewjs_classlists_dir}", include: "*.txt").each {
+    file ->
+    def name = file.getName() - ".txt"
+    classlistFiles += [
+      'file': file,
+      'name': name
+    ]
+  }
+
+  // _jmol and _jalview cores. Add any other peculiar classlist.txt files here
+  classlistFiles += [ 'file': file("${jalviewDir}/${jalviewjs_classlist_jmol}"), 'name': "_jvjmol" ]
+  classlistFiles += [ 'file': file("${jalviewDir}/${jalviewjs_classlist_jalview}"), 'name': jalviewjsJalviewCoreName ]
+
+  def classlists = []
+
+  classlistFiles.each {
+    hash ->
+
+    def file = hash['file']
+    if (! file.exists()) {
+      println("...classlist file '"+file.getPath()+"' does not exist, skipping")
+      return false // this is a "continue" in groovy .each closure
+    }
+    def name = hash['name']
+    if (name == null) {
+      name = file.getName() - ".txt"
+    }
+
+    def filelist = []
+    file.eachLine {
+      line ->
+        filelist += line
+    }
+    def list = fileTree(dir: j2sDir, includes: filelist)
+
+    def jsfile = "${outputDir}/core${name}.js"
+    def zjsfile = "${outputDir}/core${name}.z.js"
+
+    classlists += [
+    'jsfile': jsfile,
+    'zjsfile': zjsfile,
+    'list': list
+    ]
+
+    inputs.file(file)
+    inputs.files(list)
+    outputs.file(jsfile)
+    outputs.file(zjsfile)
+  }
+  
+  // _stevesoft core. add any cores without a classlist here (and the inputs and outputs)
+  def stevesoftClasslist = [
+    'jsfile': "${outputDir}/core_stevesoft.js",
+    'zjsfile': "${outputDir}/core_stevesoft.z.js",
+    'list': fileTree(dir: j2sDir, include: "com/stevesoft/pat/**/*.js")
+  ]
+  classlists += stevesoftClasslist
+  inputs.files(stevesoftClasslist['list'])
+  outputs.file(stevesoftClasslist['jsfile'])
+  outputs.file(stevesoftClasslist['zjsfile'])
+
+  doFirst {
+    def logOutFile = file("${jalviewDirAbsolutePath}/${jalviewjsBuildDir}/${jalviewjs_j2s_closure_stdout}")
+    logOutFile.getParentFile().mkdirs()
+    logOutFile.createNewFile()
+    logOutFile.write(getDate("yyyy-MM-dd HH:mm:ss")+" jalviewjsNoTranspileBuildAllCores\n----\n")
+
+    classlists.each {
+      jalviewjsCallCore(it.list, prefixFile, suffixFile, it.jsfile, it.zjsfile, logOutFile, jalviewjs_j2s_to_console.equals("true"))
+    }
+  }
+
+}
+
+
+jalviewjsNoTranspileBuildAllCores.mustRunAfter jalviewjsTranspile
+
+
+task jalviewjsBuildAllCores {
+  group "JalviewJS"
+  description "Build the core js lib closures listed in the classlists dir"
+  dependsOn jalviewjsTranspile
+  dependsOn jalviewjsNoTranspileBuildAllCores
+}
+
+
+def jalviewjsJalviewCoreHtmlFile
+task jalviewjsPublishCoreTemplate(type: Sync) {
+  dependsOn jalviewjsSitePath
+  dependsOn jalviewjsBuildAllCores
+
+  def inputFile = file("${jalviewDir}/${j2s_template_html}")
+  def outputDir = "${jalviewDir}/${jalviewjsTransferSiteCoreDir}"
+
+  from inputFile
+  into outputDir
+  def outputFiles = []
+  jalviewjsJalviewCoreHtmlFile = "${jalviewjsJalviewTemplateName}_${jalviewjsJalviewCoreName}.html"
+  rename { filename ->
+    outputFiles += "${outputDir}/${filename}"
+    if (filename.equals(inputFile.getName())) {
+      return jalviewjsJalviewCoreHtmlFile 
+    }
+    return null
+  }
+  filter(ReplaceTokens, beginToken: '_', endToken: '_', tokens: ['MAIN': '"'+mainClass+'"', 'CODE': "null", 'NAME': jalviewjsJalviewTemplateName])
+  filter(ReplaceTokens, beginToken: '', endToken: '', tokens: ['NONE': jalviewjsJalviewCoreName])
+  preserve {
+    include "**"
+  }
+  outputs.files outputFiles
+  inputs.files inputFile
+}
+
+
+task jalviewjsNoTranspileSyncCore (type: Sync) {
+  dependsOn jalviewjsSitePath
+  dependsOn jalviewjsNoTranspileBuildAllCores
+  dependsOn jalviewjsPublishCoreTemplate
+  def inputFiles = fileTree(dir: "${jalviewDir}/${jalviewjsTransferSiteCoreDir}")
+  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 jalviewjsSyncCore (type: Sync) {
+  dependsOn jalviewjsTranspile
+  dependsOn jalviewjsNoTranspileSyncCore
+  dependsOn "jalviewjsBuildAllCores"
+}
+
+
 // this Copy version of TransferSiteJs will delete anything else in the target dir
 task jalviewjsCopyTransferSiteJs(type: Copy) {
   dependsOn jalviewjsTranspile
@@ -1711,8 +1975,9 @@ task jalviewjsCopyTransferSiteJs(type: Copy) {
   into "${jalviewDir}/${jalviewjsSiteDir}"
 }
 
+
 // this Sync version of TransferSite is used by buildship to keep the website automatically up to date when a file changes
-task jalviewjsSyncTransferSiteJs(type: Sync) {
+task jalviewjsNoTranspileSyncTransferSiteJs(type: Sync) {
   from "${jalviewDir}/${jalviewjsTransferSiteJsDir}"
   include "**/*.*"
   into "${jalviewDir}/${jalviewjsSiteDir}"
@@ -1721,26 +1986,37 @@ task jalviewjsSyncTransferSiteJs(type: Sync) {
   }
 }
 
-jalviewjsSyncLib.mustRunAfter jalviewjsCopyTransferSiteJs
+jalviewjsSyncAllLibs.mustRunAfter jalviewjsCopyTransferSiteJs
 jalviewjsSyncResources.mustRunAfter jalviewjsCopyTransferSiteJs
 jalviewjsSyncSiteResources.mustRunAfter jalviewjsCopyTransferSiteJs
 jalviewjsSyncBuildProperties.mustRunAfter jalviewjsCopyTransferSiteJs
 
-jalviewjsSyncLib.mustRunAfter jalviewjsSyncTransferSiteJs
-jalviewjsSyncResources.mustRunAfter jalviewjsSyncTransferSiteJs
-jalviewjsSyncSiteResources.mustRunAfter jalviewjsSyncTransferSiteJs
-jalviewjsSyncBuildProperties.mustRunAfter jalviewjsSyncTransferSiteJs
+jalviewjsSyncAllLibs.mustRunAfter jalviewjsNoTranspileSyncTransferSiteJs
+jalviewjsSyncResources.mustRunAfter jalviewjsNoTranspileSyncTransferSiteJs
+jalviewjsSyncSiteResources.mustRunAfter jalviewjsNoTranspileSyncTransferSiteJs
+jalviewjsSyncBuildProperties.mustRunAfter jalviewjsNoTranspileSyncTransferSiteJs
+
+
+task jalviewjsNoTranspilePrepareSite {
+  dependsOn jalviewjsSyncAllLibs
+  dependsOn jalviewjsSyncResources
+  dependsOn jalviewjsSyncSiteResources
+  dependsOn jalviewjsSyncBuildProperties
+  dependsOn jalviewjsNoTranspileSyncCore
+}
+
 
 task jalviewjsPrepareSite {
   group "JalviewJS"
   description "Prepares the website folder including unzipping files and copying resources"
-  dependsOn jalviewjsSyncLib
+  dependsOn jalviewjsSyncAllLibs
   dependsOn jalviewjsSyncResources
   dependsOn jalviewjsSyncSiteResources
   dependsOn jalviewjsSyncBuildProperties
   dependsOn jalviewjsSyncCore
 }
 
+
 task jalviewjsBuildSite {
   group "JalviewJS"
   description "Builds the whole website including transpiled code"
@@ -1748,15 +2024,18 @@ task jalviewjsBuildSite {
   dependsOn jalviewjsPrepareSite
 }
 
+
 task cleanJalviewjsSite {
   doFirst {
     delete "${jalviewDir}/${jalviewjsTransferSiteJsDir}"
     delete "${jalviewDir}/${jalviewjsTransferSiteLibDir}"
+    delete "${jalviewDir}/${jalviewjsTransferSiteSwingJsDir}"
     delete "${jalviewDir}/${jalviewjsTransferSiteCoreDir}"
     delete "${jalviewDir}/${jalviewjsSiteDir}"
   }
 }
 
+
 task jalviewjsSiteTar(type: Tar) {
   group "JalviewJS"
   description "Creates a tar.gz file for the website"
@@ -1776,6 +2055,7 @@ task jalviewjsSiteTar(type: Tar) {
   inputs.dir("${jalviewDir}/${jalviewjsSiteDir}")
 }
 
+
 task jalviewjsServer {
   group "JalviewJS"
   def filename = "jalviewjsTest.html"
@@ -1789,19 +2069,23 @@ task jalviewjsServer {
     def start = port
     def running = false
     def url
+    def urlcore
     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)
+        urlcore = jalviewjsServer.getResourceUrl(jalviewjsJalviewCoreHtmlFile)
         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")
+        println("For core: "+urlcore)
 
         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>
+        <p><a href="${url}">JalviewJS Test. &lt;${url}&gt;</a></p>
+        <p><a href="${url}?j2sdebug">JalviewJS Test with debug. &lt;${url}?j2sdebug&lt;</a></p>
+        <p><a href="${urlcore}">${jalviewjsJalviewTemplateName} Core Test. &lt;${urlcore}&gt;</a></p>
         """
 
       } catch (Exception e) {
@@ -1815,6 +2099,7 @@ task jalviewjsServer {
   outputs.upToDateWhen({false})
 }
 
+
 task cleanJalviewjsAll {
   group "JalviewJS"
   description "Delete all configuration and build artifacts to do with JalviewJS build"
@@ -1833,11 +2118,6 @@ task cleanJalviewjsAll {
   outputs.upToDateWhen( { false } )
 }
 
-task jalviewjs {
-  group "JalviewJS"
-  description "Build the site"
-  dependsOn jalviewjsBuildSite
-}
 
 
 task jalviewjsIDE_CopyTransferSiteJs(type: Copy) {
@@ -1845,41 +2125,54 @@ task jalviewjsIDE_CopyTransferSiteJs(type: Copy) {
   into "${jalviewDir}/${jalviewjsSiteDir}"
 }
 
+
 task jalviewjsIDE_j2sFile {
   group "00 JalviewJS in Eclipse"
   description "Creates the .j2s file"
   dependsOn jalviewjsCreateJ2sSettings
 }
 
+
+task jalviewjsIDE_BuildAllCores {
+  group "00 JalviewJS in Eclipse"
+  description "Build the core js lib closures listed in the classlists dir"
+  dependsOn jalviewjsNoTranspileBuildAllCores
+}
+
+
 task jalviewjsIDE_AssembleSite {
   group "00 JalviewJS in Eclipse"
   description "Assembles the Eclipse transpiled site and unzips supporting zipfiles"
   dependsOn jalviewjsIDE_CopyTransferSiteJs
-  dependsOn jalviewjsPrepareSite
+  dependsOn jalviewjsNoTranspilePrepareSite
 }
 
+
 task jalviewjsIDE_SiteClean {
   group "00 JalviewJS in Eclipse"
   description "Deletes the Eclipse transpiled site"
   dependsOn cleanJalviewjsSite
 }
 
+
 task jalviewjsIDE_Server {
   group "00 JalviewJS in Eclipse"
   description "Starts a webserver on localhost to test the website"
   dependsOn jalviewjsServer
 }
 
+
 // buildship runs this at import
 task eclipseSynchronizationTask {
   dependsOn eclipseSetup
   dependsOn jalviewjsIDE_j2sFile
 }
 
+
 // buildship runs this at build time
 task eclipseAutoBuildTask {
-  dependsOn jalviewjsSyncTransferSiteJs
-  dependsOn jalviewjsPrepareSite
+  dependsOn jalviewjsNoTranspileSyncTransferSiteJs
+  dependsOn jalviewjsNoTranspilePrepareSite
 }
 
 
@@ -1889,137 +2182,8 @@ task eclipseAutoBuildTask {
 
 
 
-// closure
-
-def jalviewjsCallCore(FileCollection list, String prefixFile, String suffixFile, String jsfile, String zjsfile, File logOutFile, Boolean logOutConsole) {
-
-  def stdout = new ByteArrayOutputStream()
-  def stderr = new ByteArrayOutputStream()
-
-  def coreFile = file(jsfile)
-  def msg = ""
-  msg = "Generating ${jsfile}"
-  println(msg)
-  logOutFile.createNewFile()
-  logOutFile.append(msg+"\n")
-
-  def coreTop = file(prefixFile)
-  def coreBottom = file(suffixFile)
-  coreFile.getParentFile().mkdirs()
-  coreFile.createNewFile()
-  coreFile.write( coreTop.text )
-  list.each {
-    f ->
-    if (f.exists()) {
-      def t = f.text
-      t.replaceAll("Clazz\\.","Clazz_")
-      t.replaceAll("Class__","Clazz._")
-      coreFile.append( t )
-    } else {
-      msg = "...file "+f.getPath()+" does not exist, skipping"
-      println(msg)
-      logOutFile.append(msg+"\n")
-    }
-  }
-  coreFile.append( coreBottom.text )
-
-  msg = "Generating ${zjsfile}"
-  println(msg)
-  logOutFile.append(msg+"\n")
-  def logOutFOS = new FileOutputStream(logOutFile, true) // true == append
-  def logErrFOS = logOutFOS
-
-  javaexec {
-    classpath = files(["${jalviewDir}/tools/closure_compiler.jar"])
-    args = [ "--js", jsfile, "--js_output_file", zjsfile ]
-
-    msg = "\nRunning '"+commandLine.join(' ')+"'\n"
-    println(msg)
-    logOutFile.append(msg+"\n")
-
-    if (logOutConsole) {
-      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)
-    }
-  }
-  msg = "--"
-  println(msg)
-  logOutFile.append(msg+"\n")
-}
-
-
-
-task jalviewjsBuildAllCores {
+task jalviewjs {
   group "JalviewJS"
-  description "Build the core js lib closures"
-
-  dependsOn jalviewjsSitePath
-  dependsOn jalviewjsTransferUnzipLib
-  dependsOn jalviewjsTranspile
-
-  def j2sDir = "${jalviewDir}/${jalviewjsTransferSiteJsDir}/${jalviewjs_j2s_subdir}"
-  def jsDir = "${jalviewDir}/${jalviewjsTransferSiteLibDir}/${jalviewjs_js_subdir}"
-  def outputDir = "${jalviewDir}/${jalviewjsTransferSiteCoreDir}/${jalviewjs_j2s_subdir}/core"
-  def prefixFile = "${jsDir}/core/coretop2.js"
-  def suffixFile = "${jsDir}/core/corebottom2.js"
-
-  inputs.file prefixFile
-  inputs.file suffixFile
-
-  def classlists = []
-  fileTree(dir: "${jalviewDir}/${jalviewjs_classlists_dir}", include: "*.txt").each {
-    file ->
-    def name = file.getName() - ".txt"
-
-    def filelist = []
-    file.eachLine {
-      line ->
-      filelist += line
-    }
-    def list = fileTree(dir: j2sDir, includes: filelist)
-
-    def coreFileName = "core${name}.js"
-    def jsfile = "${outputDir}/${coreFileName}"
-    def coreZFileName = "core${name}.z.js"
-    def zjsfile = "${outputDir}/${coreZFileName}"
-
-    classlists += [
-      'jsfile': jsfile,
-      'zjsfile': zjsfile,
-      'list': list
-    ]
-
-    inputs.file(file)
-    inputs.files(list)
-    outputs.file(jsfile)
-    outputs.file(zjsfile)
-  } 
-
-
-  doFirst {
-    def logOutFile = file("${jalviewDirAbsolutePath}/${jalviewjsBuildDir}/${jalviewjs_j2s_closure_stdout}")
-    logOutFile.getParentFile().mkdirs()
-    logOutFile.createNewFile()
-    logOutFile.write(getDate("yyyy-MM-dd HH:mm:ss")+" jalviewjsBuildAllCores\n----\n")
-
-    classlists.each {
-      jalviewjsCallCore(it.list, prefixFile, suffixFile, it.jsfile, it.zjsfile, logOutFile, jalviewjs_j2s_to_console.equals("true"))
-    }
-  }
-
+  description "Build the site"
+  dependsOn jalviewjsBuildSite
 }