X-Git-Url: http://source.jalview.org/gitweb/?p=jalview.git;a=blobdiff_plain;f=build.gradle;h=45a757ea135387271d3b43bb64d1a3e047f09a7d;hp=41a09ac230f17622ee6445bb19f317d59566e29c;hb=fd9619a4034e5e2e4d2f1ed2ecb75e677c578308;hpb=f7ddd8a333c145dfdcf5f525a094f15ca3761bc2

diff --git a/build.gradle b/build.gradle
index 41a09ac..45a757e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,7 +1,6 @@
 import org.apache.tools.ant.filters.ReplaceTokens
 import org.gradle.internal.os.OperatingSystem
 
-
 buildscript {
   dependencies {
         classpath 'org.openclover:clover:4.3.1'
@@ -36,6 +35,32 @@ if (clover.equals("true")) {
   classes = "$jalviewDir/$classesDir"
 }
 
+def libDir
+def libDistDir
+def compile_source_compatibility
+def compile_target_compatibility
+def additional_compiler_args = []
+def getdown_alt_java_min_version
+if (JAVA_VERSION.equals("1.8")) {
+  libDir = j11libDir
+  libDistDir = j8libDir
+  compile_source_compatibility = 1.8
+  compile_target_compatibility = 1.8
+  getdown_alt_java_min_version = getdown_alt_java8_min_version
+} else if (JAVA_VERSION.equals("11")) {
+  libDir = j11libDir
+  libDistDir = j11libDir
+  compile_source_compatibility = 11
+  compile_target_compatibility = 11
+  getdown_alt_java_min_version = getdown_alt_java11_min_version
+  additional_compiler_args += [
+    '--module-path', sourceSets.modules.compileClasspath.asPath,
+    '--add-modules', j11modules
+  ]
+} else {
+  throw new GradleException("JAVA_VERSION=$JAVA_VERSION not currently supported by Jalview")
+}
+
 sourceSets {
 
   main {
@@ -53,16 +78,12 @@ sourceSets {
 
     compileClasspath = files(sourceSets.main.java.outputDir)
     compileClasspath += fileTree(dir: "$jalviewDir/$libDir", include: ["*.jar"])
-    if (JAVA_VERSION.equals("1.8")) {
-      print("ADDING J11LIBS TO CLASSPATH\n")
-      compileClasspath += fileTree(dir: "$jalviewDir/$j11libDir", include: ["*.jar"])
-    }
 
     runtimeClasspath = compileClasspath
   }
 
   modules {
-    compileClasspath = fileTree(dir: "$jalviewDir/$j11libDir", include: ["*.jar"])
+    compileClasspath = fileTree(dir: "$jalviewDir/$j11modDir", include: ["*.jar"])
 
     runtimeClasspath = compileClasspath
   }
@@ -79,10 +100,6 @@ sourceSets {
     compileClasspath = configurations.cloverRuntime + files( sourceSets.clover.java.outputDir )
     compileClasspath += fileTree(dir: "$jalviewDir/$utilsDir", include: ["**/*.jar"])
     compileClasspath += fileTree(dir: "$jalviewDir/$libDir", include: ["*.jar"])
-    if (JAVA_VERSION.equals("1.8")) {
-      print("ADDING J11LIBS TO CLASSPATH\n")
-      compileClasspath += fileTree(dir: "$jalviewDir/$j11libDir", include: ["*.jar"])
-    }
 
     runtimeClasspath = compileClasspath
   }
@@ -106,10 +123,6 @@ sourceSets {
     compileClasspath += files( sourceSets.main.resources.srcDirs)
     compileClasspath += fileTree(dir: "$jalviewDir/$utilsDir", include: ["**/*.jar"])
     compileClasspath += fileTree(dir: "$jalviewDir/$libDir", include: ["*.jar"])
-    if (JAVA_VERSION.equals("1.8")) {
-      print("ADDING J11LIBS TO CLASSPATH\n")
-      compileClasspath += fileTree(dir: "$jalviewDir/$j11libDir", include: ["*.jar"])
-    }
 
     runtimeClasspath = compileClasspath
   }
@@ -172,18 +185,9 @@ task cloverReport {
 compileJava {
 
   doFirst {
-    if (JAVA_VERSION.equals("1.8")) {
-      sourceCompatibility = 1.8
-      targetCompatibility = 1.8
-    } else if (JAVA_VERSION.equals("11")) {
-      sourceCompatibility = 11
-      targetCompatibility = 11
-
-      options.compilerArgs = [
-        '--module-path', sourceSets.modules.compileClasspath.asPath,
-        '--add-modules', j11modules
-      ]
-    }
+    sourceCompatibility = compile_source_compatibility
+    targetCompatibility = compile_target_compatibility
+    options.compilerArgs = additional_compiler_args
     print ("Setting target compatibility to "+targetCompatibility+"\n")
   }
 
@@ -195,18 +199,9 @@ compileTestJava {
     classpath += configurations.cloverRuntime
   }
   doFirst {
-    if (JAVA_VERSION.equals("1.8")) {
-      sourceCompatibility = 1.8
-      targetCompatibility = 1.8
-    } else if (JAVA_VERSION.equals("11")) {
-      sourceCompatibility = 11
-      targetCompatibility = 11
-
-      options.compilerArgs = [
-        '--module-path', sourceSets.modules.compileClasspath.asPath,
-        '--add-modules', j11modules
-      ]
-    }
+    sourceCompatibility = compile_source_compatibility
+    targetCompatibility = compile_target_compatibility
+    options.compilerArgs = additional_compiler_args
     print ("Setting target compatibility to "+targetCompatibility+"\n")
   }
 }
@@ -215,18 +210,9 @@ compileTestJava {
 compileCloverJava {
 
   doFirst {
-    if (JAVA_VERSION.equals("1.8")) {
-      sourceCompatibility = 1.8
-      targetCompatibility = 1.8
-    } else if (JAVA_VERSION.equals("11")) {
-      sourceCompatibility = 11
-      targetCompatibility = 11
-
-      options.compilerArgs += [
-        '--module-path', sourceSets.modules.compileClasspath.asPath,
-        '--add-modules', j11modules
-      ]
-    }
+    sourceCompatibility = compile_source_compatibility
+    targetCompatibility = compile_target_compatibility
+    options.compilerArgs += additional_compiler_args
     print ("Setting target compatibility to "+targetCompatibility+"\n")
   }
   classpath += configurations.cloverRuntime
@@ -348,20 +334,9 @@ test {
   
   workingDir = jalviewDir
   //systemProperties 'clover.jar' System.properties.clover.jar
-  if (JAVA_VERSION.equals("1.8")) {
-    sourceCompatibility = 1.8
-    targetCompatibility = 1.8
-  } else if (JAVA_VERSION.equals("11")) {
-    sourceCompatibility = 11
-    targetCompatibility = 11
-
-    jvmArgs += [
-      '--module-path',
-      sourceSets.modules.compileClasspath.asPath,
-      '--add-modules',
-      j11modules
-    ]
-  }
+  sourceCompatibility = compile_source_compatibility
+  targetCompatibility = compile_target_compatibility
+  jvmArgs += additional_compiler_args
   print ("Setting target compatibility to "+targetCompatibility+"\n")
 }
 
@@ -490,6 +465,11 @@ ext {
   getdownLauncher = jalviewDir + '/' + getdown_launcher
   getdownFilesDir = jalviewDir + '/' + getdown_files_dir
   getdownLib1 = jalviewDir + '/' + getdown_lib1
+  def getdownChannel = getdown_channel_name
+  if (getdown_channel_name.equals("COMMIT")) {
+    getdownChannel = getGitHash()
+  }
+  getdown_app_base = getdown_channel_base+"/"+JAVA_VERSION+"/"+getdownChannel+"/"
 }
 
 task getdownWebsite() {
@@ -502,11 +482,8 @@ task getdownWebsite() {
   doFirst {
     // go through properties looking for getdown_txt_...
     def props = project.properties.sort { it.key }
-    if (JAVA_VERSION.equals("11")) {
-      props.put("getdown_txt_java_min_version", getdown_alt_java11_min_version)
-    } else {
-      props.put("getdown_txt_java_min_version", getdown_alt_java8_min_version)
-    }
+    props.put("getdown_txt_java_min_version", getdown_alt_java_min_version)
+    props.put("getdown_txt_appbase", getdown_app_base)
     props.each{ prop, val ->
       if (prop.startsWith("getdown_txt_") && val != null) {
         if (prop.startsWith("getdown_txt_multi_")) {
@@ -656,15 +633,43 @@ install4j {
     install4jHomeDir = System.getProperty("user.home")+"/buildtools/install4j"
   }
   installDir = file(install4jHomeDir)
+  mediaTypes = Arrays.asList(install4jMediaTypes.split(","))
+}
+
+def install4jConf
+def macosJavaVMDir
+def windowsJavaVMDir
+task copyInstall4jTemplate(type: Copy) {
+  def install4jDir = "$jalviewDir/$install4jResourceDir"
+  def install4jConfFile = "jalview-installers-java"+JAVA_VERSION+".install4j"
+  macosJavaVMDir = System.env.HOME+"/buildtools/jre/openjdk-java_vm/macos-jre"+JAVA_VERSION+"/java_vm"
+  windowsJavaVMDir = System.env.HOME+"/buildtools/jre/openjdk-java_vm/windows-jre"+JAVA_VERSION+"/java_vm"
+  from (install4jDir) {
+    include install4jTemplate
+    rename (install4jTemplate, install4jConfFile)
+    filter(ReplaceTokens, beginToken: '', endToken: '', tokens: ['9999999999': JAVA_VERSION])
+    filter(ReplaceTokens, beginToken: '$$', endToken: '$$', tokens: ['VERSION': JALVIEW_VERSION, 'MACOS_JAVA_VM_DIR': macosJavaVMDir, 'WINDOWS_JAVA_VM_DIR': windowsJavaVMDir])
+  }
+  into install4jDir
+  install4jConf = "$install4jDir/$install4jConfFile"
+  inputs.files("$install4jDir/$install4jTemplate")
+  outputs.files(install4jConf)
 }
 
 task installers(type: com.install4j.gradle.Install4jTask) {
   dependsOn getdown
-  projectFile = "$jalviewDir/$install4jResourceDir/$install4jConf"
+  dependsOn copyInstall4jTemplate
+  projectFile = install4jConf
   variables = [majorVersion: version.substring(2, 11), build: 001]
   destination = "$jalviewDir/$install4jBuildDir"
   buildSelected = true
   inputs.dir(project.ext.getdownWebsiteDir)
+  inputs.file(install4jConf)
+  inputs.dir(macosJavaVMDir)
+  inputs.dir(windowsJavaVMDir)
   outputs.dir("$jalviewDir/$install4jBuildDir")
 }
 
+clean {
+  delete install4jConf
+}