X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=build.gradle;h=577d616f4b6c0fe6d87de9d5a6d4dae7ac254b44;hb=11a678ebefffbce96e1373574ac912c4a7bd5785;hp=8b77be8ef3367a1e3436eed2e79022238fc40f9b;hpb=df74daf9d2a0f8e5911311589002774c73fb6d1a;p=jalview.git

diff --git a/build.gradle b/build.gradle
index 8b77be8..577d616 100644
--- a/build.gradle
+++ b/build.gradle
@@ -42,19 +42,24 @@ def libDistDir
 def compile_source_compatibility
 def compile_target_compatibility
 def additional_compiler_args = []
+// these are getdown.txt properties defined dependent on the JAVA_VERSION 
 def getdown_alt_java_min_version
+// this property is assigned below and expanded to multiple lines in the getdown task
+def getdown_alt_multi_java_location
 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
+  getdown_alt_multi_java_location = getdown_alt_java8_txt_multi_java_location
 } 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
+  getdown_alt_multi_java_location = getdown_alt_java11_txt_multi_java_location
   additional_compiler_args += [
     '--module-path', file("$jalviewDir/$j11modDir").getAbsolutePath(),
     '--add-modules', j11modules
@@ -73,7 +78,7 @@ sourceSets {
 
     resources {
       srcDirs "$jalviewDir/$resourceDir"
-      srcDirs "$jalviewDir/$libDir"
+      srcDirs "$jalviewDir/$libDistDir"
     }
 
     jar.destinationDir = file("$jalviewDir/$packageDir")
@@ -296,8 +301,8 @@ task copyHelp(type: Copy) {
 }
 
 task syncLib(type: Sync) {
-  def syncDir = "$classes/$libDir"
-  from fileTree("$jalviewDir/$libDir")
+  def syncDir = "$classes/$libDistDir"
+  from fileTree("$jalviewDir/$libDistDir")
   into syncDir
 }
 
@@ -422,7 +427,7 @@ task copyJars(type: Copy) {
 
 // doing a Sync instead of Copy as Copy doesn't deal with "outputs" very well
 task syncJars(type: Sync) {
-  from fileTree("$jalviewDir/$libDir").include("**/*.jar").include("*.jar").files
+  from fileTree("$jalviewDir/$libDistDir").include("**/*.jar").include("*.jar").files
   into "$jalviewDir/$packageDir"
   preserve {
     include jar.archiveName
@@ -447,19 +452,19 @@ task cleanDist {
 
 shadowJar {
   dependsOn makeDist
-  if (JAVA_VERSION.equals("11")) {
-    from ("$jalviewDir/$j11libDir") {
+  from ("$jalviewDir/$libDistDir") {
       include("*.jar")
-    }
   }
   mainClassName = shadowJarMainClass
   mergeServiceFiles()
-  classifier = "all"
+  classifier = "all-"+JAVA_VERSION
   minimize()
 }
 
 ext {
-  getdownWebsiteDir = jalviewDir + '/' + getdown_website_dir
+  // where the getdown channel will be built. 
+  // TODO: consider allowing this expression to  be overrriden by -P arg
+  getdownWebsiteDir = jalviewDir + '/' + getdown_website_dir + '/' + JAVA_VERSION + '/'
   getdownAppDir = getdownWebsiteDir + '/' + getdown_app_dir
   getdownJ11libDir = getdownWebsiteDir + '/' + getdown_j11lib_dir
   getdownResourceDir = getdownWebsiteDir + '/' + getdown_resource_dir
@@ -470,7 +475,7 @@ ext {
   if (getdown_channel_name.equals("COMMIT")) {
     getdownChannel = getGitHash()
   }
-  getdown_app_base = getdown_channel_base+"/"+JAVA_VERSION+"/"+getdownChannel+"/"
+  getdown_app_base = getdown_channel_base+"/"+getdownChannel+"/"+JAVA_VERSION+"/"
 }
 
 task getdownWebsite() {
@@ -484,6 +489,8 @@ task getdownWebsite() {
     // 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_appbase", getdown_app_base)
     props.each{ prop, val ->
       if (prop.startsWith("getdown_txt_") && val != null) {
@@ -664,13 +671,13 @@ task installers(type: com.install4j.gradle.Install4jTask) {
   projectFile = file(install4jConf)
   println("Using projectFile "+projectFile)
   variables = [majorVersion: version.substring(2, 11), build: 001]
-  destination = "$jalviewDir/$install4jBuildDir"
+  destination = "$jalviewDir/$install4jBuildDir/$JAVA_VERSION"
   buildSelected = true
   inputs.dir(project.ext.getdownWebsiteDir)
   inputs.file(install4jConf)
   inputs.dir(macosJavaVMDir)
   inputs.dir(windowsJavaVMDir)
-  outputs.dir("$jalviewDir/$install4jBuildDir")
+  outputs.dir("$jalviewDir/$install4jBuildDir/$JAVA_VERSION")
 }
 
 clean {