From: Ben Soares <bsoares@dundee.ac.uk>
Date: Fri, 28 Jun 2019 07:59:34 +0000 (+0100)
Subject: Merge branch 'JAL-3322_getdown_speed_improvement' of https://source.jalview.org/git... 
X-Git-Tag: Release_2_11_0~2^2~34
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=91d8b8a3833e8504999dcba02533c451356439e3;hp=42685807a6a6298af4715267245460bc5f774f84;p=jalview.git

Merge branch 'JAL-3322_getdown_speed_improvement' of https://source.jalview.org/git/jalview into JAL-3322_getdown_speed_improvement

parallel dev
---

diff --git a/.gitignore b/.gitignore
index 0b21681..46cc0e5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,7 +19,7 @@ TESTNG
 /site
 /.gradle
 /build
-/utils/HelpLinksChecker.out
+/utils/HelpLinksChecker.touch
 /getdown/website
 /getdown/full_app
 /getdown/files
diff --git a/build.gradle b/build.gradle
index 81c2751..165c05e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -724,7 +724,7 @@ task compileLinkCheck(type: JavaCompile) {
   outputs.file("$jalviewDir/$utilsDir/BufferedLineReader.class")
 }
 
-def helplinkscheckeroutputfile = file("$jalviewDir/$utilsDir/HelpLinksChecker.out")
+def helplinkscheckertouchfile = file("$jalviewDir/$utilsDir/HelpLinksChecker.touch")
 task linkCheck(type: JavaExec) {
   dependsOn prepare, compileLinkCheck
   classpath = files("$jalviewDir/$utilsDir")
@@ -733,12 +733,12 @@ task linkCheck(type: JavaExec) {
   def help = "$classes/$helpDir"
   args = [ "$classes/$helpDir", "-nointernet" ]
 
-  doFirst {
-    helplinkscheckeroutputfile.createNewFile()
-    standardOutput new FileOutputStream(helplinkscheckeroutputfile, false)
+  doLast {
+    helplinkscheckertouchfile.createNewFile()
   }
 
-  outputs.file(helplinkscheckeroutputfile)
+  inputs.dir("$classes/$helpDir")
+  outputs.file(helplinkscheckertouchfile)
 }
 
 task cleanPackageDir(type: Delete) {
diff --git a/getdown/lib/getdown-core.jar b/getdown/lib/getdown-core.jar
index cef4b46..ff2d326 100644
Binary files a/getdown/lib/getdown-core.jar and b/getdown/lib/getdown-core.jar differ
diff --git a/getdown/lib/getdown-launcher.jar b/getdown/lib/getdown-launcher.jar
index 32921f5..8d8a2b3 100644
Binary files a/getdown/lib/getdown-launcher.jar and b/getdown/lib/getdown-launcher.jar differ
diff --git a/j11lib/getdown-core.jar b/j11lib/getdown-core.jar
index cef4b46..ff2d326 100644
Binary files a/j11lib/getdown-core.jar and b/j11lib/getdown-core.jar differ
diff --git a/j8lib/getdown-core.jar b/j8lib/getdown-core.jar
index cef4b46..ff2d326 100644
Binary files a/j8lib/getdown-core.jar and b/j8lib/getdown-core.jar differ