JAL-3322 Adding a configurable getdown version number display (above appbase) to...

[jalview.git] / build.gradle

diff --git a/build.gradle b/build.gradle
index f5149da..21ecde6 100644 (file)
--- 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")
 }
@@ -708,11 +721,20 @@ task getdownWebsite() {
   def getdownResourceDir = project.ext.getdownResourceDir
   def getdownAppDir = project.ext.getdownAppDir
   def getdownResourceFilenames = []
+  
+  copy {
+               from "$classes/$buildPropertiesFile"
+               rename(buildPropertiesFile, getdown_install_build_properties)
+               into project.ext.getdownWebsiteDir
+  }
+  getdownResourceFilenames += getdown_current_build_properties
+  
   doFirst {
     // go through properties looking for getdown_txt_...
     def props = project.properties.sort { it.key }
     props.put("getdown_txt_java_min_version", getdown_alt_java_min_version)
     props.put("getdown_txt_multi_java_location", getdown_alt_multi_java_location)
+       props.put("getdown_txt_resource", "$classes/$buildPropertiesFile")
 
     if (getdown_local == "true") {
       getdown_app_base = file(getdownWebsiteDir).toURI().toString()
@@ -728,7 +750,7 @@ task getdownWebsite() {
           }
         } else {
           // file values rationalised
-          if (val.indexOf('/') > -1) {
+          if (val.indexOf('/') > -1 || prop.startsWith("getdown_txt_resource")) {
             def r = null
             if (val.indexOf('/') == 0) {
               // absolute path
@@ -743,8 +765,10 @@ task getdownWebsite() {
               getdownResourceFilenames += r.getPath()
             }
           }
-          def line = prop.substring(12) + " = " + val + "\n"
-          getdownTextString += line
+                 if (! prop.startsWith("getdown_txt_resource")) {
+                         def line = prop.substring(12) + " = " + val + "\n"
+                         getdownTextString += line
+                 }
         }
       }
     }
@@ -794,19 +818,31 @@ 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")
     getdown_txt.write(getdownTextString)
+       
+       def launch_jvl = file(project.ext.getdownWebsiteDir + "/" + getdown_launch_jvl)
+       launch_jvl.write("appbase="+props.get("getdown_txt_appbase"))
 
     copy {
       from getdown_txt
+         from launch_jvl
+         from project.ext.getdownWebsiteDir+"/"+getdown_current_build_properties
+         from project.ext.getdownWebsiteDir+"/"+getdown_install_build_properties
       into project.ext.getdownFilesDir
     }
 
     copy {
       from getdownLauncher
+      into project.ext.getdownWebsiteDir
+      rename(file(getdownLauncher).getName(), getdown_launcher_new)
+    }
+
+    copy {
+      from getdownLauncher
       into project.ext.getdownFilesDir
     }