JAL-3224 JAL-3225 Some fixes in install4j template and build.gradle, and a correction...

[jalview.git] / build.gradle

diff --git a/build.gradle b/build.gradle
index 3f444be..ed3ace3 100644 (file)
--- a/build.gradle
+++ b/build.gradle
@@ -39,6 +39,7 @@ if (clover.equals("true")) {
 
 // configure classpath/args for j8/j11 compilation
 
+def jalviewDirAbsolutePath = file(jalviewDir).getAbsolutePath()
 def libDir
 def libDistDir
 def compile_source_compatibility
@@ -52,7 +53,7 @@ ext {
   getdownJ11libDir = getdownWebsiteDir + '/' + getdown_j11lib_dir
   getdownResourceDir = getdownWebsiteDir + '/' + getdown_resource_dir
   getdownLauncher = jalviewDir + '/' + getdown_launcher
-  getdownFilesDir = jalviewDir + '/' + getdown_files_dir
+  getdownFilesDir = jalviewDir + '/' + getdown_files_dir + '/' + JAVA_VERSION + '/'
   getdownLib1 = jalviewDir + '/' + getdown_lib1
   def getdownChannel = getdown_channel_name
   if (getdown_channel_name.equals("COMMIT")) {
@@ -63,12 +64,14 @@ ext {
   modules_runtimeClasspath = modules_compileClasspath
 }
 
+def JAVA_INTEGER_VERSION
 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")) {
+  JAVA_INTEGER_VERSION = "8"
   libDir = j11libDir
   libDistDir = j8libDir
   compile_source_compatibility = 1.8
@@ -76,6 +79,7 @@ if (JAVA_VERSION.equals("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")) {
+  JAVA_INTEGER_VERSION = "11"
   libDir = j11libDir
   libDistDir = j11libDir
   compile_source_compatibility = 11
@@ -699,6 +703,8 @@ task getdownWebsite() {
       }
     }
 
+    // NOT USING MODULES YET, EVERYTHING SHOULD BE IN dist
+    /*
     if (JAVA_VERSION.equals("11")) {
       def j11libFiles = fileTree(dir: "$jalviewDir/$j11libDir", include: ["*.jar"]).getFiles()
       j11libFiles.sort().each{f ->
@@ -710,6 +716,7 @@ task getdownWebsite() {
         }
       }
     }
+    */
 
     getdownTextString += "code = " + file(getdownLauncher).getName() + "\n"
     getdownTextString += "class = " + mainClass + "\n"
@@ -724,22 +731,17 @@ task getdownWebsite() {
 
     copy {
       from getdownLauncher
-      into project.ext.getdownWebsiteDir
-    }
-
-    copy {
-      from getdownLauncher
       into project.ext.getdownFilesDir
     }
 
     copy {
-      from getdownLib1
-      into project.ext.getdownFilesDir
+      from getdownLauncher
+      into project.ext.getdownWebsiteDir
     }
 
     copy {
       from getdownLib1
-      into project.ext.getdownWebsiteDir
+      into project.ext.getdownFilesDir + '/' + packageDir
     }
 
     copy {
@@ -798,19 +800,23 @@ install4j {
 
 def install4jConf
 def macosJavaVMDir
+def macosJavaVMTgz
 def windowsJavaVMDir
+def windowsJavaVMTgz
 def install4jDir = "$jalviewDir/$install4jResourceDir"
 def install4jConfFile = "jalview-installers-java"+JAVA_VERSION+".install4j"
 install4jConf = "$install4jDir/$install4jConfFile"
   
 task copyInstall4jTemplate(type: Copy) {
-  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"
+  macosJavaVMDir = System.env.HOME+"/buildtools/jre/openjdk-java_vm/getdown/macos-jre"+JAVA_VERSION+"/jre"
+  macosJavaVMTgz = System.env.HOME+"/buildtools/jre/openjdk-java_vm/install4j/tgz/macos-jre"+JAVA_VERSION+".tar.gz"
+  windowsJavaVMDir = System.env.HOME+"/buildtools/jre/openjdk-java_vm/getdown/windows-jre"+JAVA_VERSION+"/jre"
+  windowsJavaVMTgz = System.env.HOME+"/buildtools/jre/openjdk-java_vm/install4j/tgz/windows-jre"+JAVA_VERSION+".tar.gz"
   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])
+    filter(ReplaceTokens, beginToken: '$$', endToken: '$$', tokens: ['JAVA_VERSION': JAVA_VERSION, 'JAVA_INTEGER_VERSION': JAVA_INTEGER_VERSION, 'VERSION': JALVIEW_VERSION, 'MACOS_JAVA_VM_DIR': macosJavaVMDir, 'MACOS_JAVA_VM_TGZ': macosJavaVMTgz, 'WINDOWS_JAVA_VM_DIR': windowsJavaVMDir, 'WINDOWS_JAVA_VM_TGZ': windowsJavaVMTgz])
   }
   into install4jDir
   inputs.files("$install4jDir/$install4jTemplate")