Merge branch 'JAL-3322_getdown_speed_improvement' of https://source.jalview.org/git...
authorBen Soares <bsoares@dundee.ac.uk>
Fri, 28 Jun 2019 07:59:34 +0000 (08:59 +0100)
committerBen Soares <bsoares@dundee.ac.uk>
Fri, 28 Jun 2019 07:59:34 +0000 (08:59 +0100)
parallel dev

1  2 
build.gradle

diff --combined build.gradle
@@@ -594,10 -594,13 +594,13 @@@ task convertBuildingMD(type: Exec) 
      pandoc = System.getProperty("user.home")+"/buildtools/pandoc/bin/pandoc"
    }
  
-   if (pandoc != null && file(pandoc).exists()) {
-     commandLine pandoc, '-s', '-o', buildingHTML, '--metadata', 'pagetitle="Building Jalview from Source"', '--toc', '-H', css, buildingMD
-   } else {
-     commandLine "true"
+   doFirst {
+     if (false && pandoc != null && file(pandoc).exists()) {
+         commandLine pandoc, '-s', '-o', buildingHTML, '--metadata', 'pagetitle="Building Jalview from Source"', '--toc', '-H', css, buildingMD
+     } else {
+         println("Cannot find pandoc. Skipping convert building.md to HTML")
+         throw new StopExecutionException()
+     }
    }
  
    ignoreExitValue true
@@@ -721,7 -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")
    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) {