X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=build.gradle;h=af9a26f00b9169aabfef716047567c95192e8deb;hb=b36478ce646df46b638fc673ab6434f01711c04b;hp=9f00d2b4c8be8aa477cdc4bcb1047bb679f37caa;hpb=e66f94fd99bfc3aa06e6d9c8693cc9efa7b1bfe8;p=jalview.git

diff --git a/build.gradle b/build.gradle
index 9f00d2b..af9a26f 100644
--- a/build.gradle
+++ b/build.gradle
@@ -97,6 +97,19 @@ if (JAVA_VERSION.equals("1.8")) {
     '--module-path', ext.modules_compileClasspath.asPath,
     '--add-modules', j11modules
   ]
+} else if (JAVA_VERSION.equals("12") || JAVA_VERSION.equals("13")) {
+  JAVA_INTEGER_VERSION = JAVA_VERSION
+  libDir = j11libDir
+  libDistDir = j11libDir
+  compile_source_compatibility = JAVA_VERSION
+  compile_target_compatibility = JAVA_VERSION
+  getdown_alt_java_min_version = getdown_alt_java11_min_version
+  getdown_alt_multi_java_location = getdown_alt_java11_txt_multi_java_location
+  eclipse_java_runtime_name = "JavaSE-11"
+  additional_compiler_args += [
+    '--module-path', ext.modules_compileClasspath.asPath,
+    '--add-modules', j11modules
+  ]
 } else {
   throw new GradleException("JAVA_VERSION=$JAVA_VERSION not currently supported by Jalview")
 }
@@ -471,13 +484,20 @@ task convertBuildingMD(type: Exec) {
   def buildingMD = "$jalviewDir/$docDir/building.md"
   def css = "$jalviewDir/$docDir/github.css"
 
-  def pandoc = pandoc_exec
+  def pandoc = null
+  pandoc_exec.split(",").each {
+    if (file(it.trim()).exists()) {
+      pandoc = it.trim()
+      return true
+    }
+  }
+
   def hostname = "hostname".execute().text.trim()
-  if (! file(pandoc).exists() && hostname.equals("jv-bamboo")) {
+  if ((pandoc == null || ! file(pandoc).exists()) && hostname.equals("jv-bamboo")) {
     pandoc = System.getProperty("user.home")+"/buildtools/pandoc/bin/pandoc"
   }
 
-  if (file(pandoc).exists()) {
+  if (pandoc != null && file(pandoc).exists()) {
     commandLine pandoc, '-s', '-o', buildingHTML, '--metadata', 'pagetitle="Building Jalview from Source"', '--toc', '-H', css, buildingMD
   } else {
     commandLine "true"
@@ -787,7 +807,7 @@ 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 = " + file(getdownLauncher).getName() + "\n"
+    getdownTextString += "resource = " + getdown_launcher_new + "\n"
     getdownTextString += "class = " + mainClass + "\n"
 
     def getdown_txt = file(project.ext.getdownWebsiteDir + "/getdown.txt")
@@ -799,6 +819,13 @@ task getdownWebsite() {
     }
 
     copy {
+      from project.ext.getdownWebsiteDir
+      into project.ext.getdownWebsiteDir
+      include(file(getdownLauncher).getName())
+      rename(file(getdownLauncher).getName(), getdown_launcher_new)
+    }
+
+    copy {
       from getdownLauncher
       into project.ext.getdownFilesDir
     }