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=34cceefa5b3eea9a89679f7fbcac4b103f76ceae;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/build.gradle b/build.gradle
index 5099841..165c05e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -594,10 +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