JAL-3130 JAL-3007 improvements to gradle build

diff --git a/build.gradle b/build.gradle
index ec8267a..7b6cd6b 100644 (file)
--- a/build.gradle
+++ b/build.gradle
@@ -42,7 +42,10 @@ sourceSets {
 
     compileClasspath = files(sourceSets.main.java.outputDir)
     compileClasspath += fileTree(dir: "$jalviewDir/$libDir", include: ["*.jar"])
-    //compileClasspath += fileTree(dir: "$jalviewDir/$j11libDir", include: ["*.jar"])
+    if (JAVA_VERSION.equals("1.8")) {
+      print("ADDING J11LIBS TO CLASSPATH")
+      compileClasspath += fileTree(dir: "$jalviewDir/$j11libDir", include: ["*.jar"])
+    }
 
     runtimeClasspath = compileClasspath
   }
@@ -87,6 +90,7 @@ compileJava {
         '--add-modules', j11modules
       ]
     }
+    print ("Setting target compatibility to "+targetCompatibility+"\n")
   }
 
 }
@@ -340,24 +344,32 @@ task getdownWebsite() {
     }
     props.each{ prop, val ->
       if (prop.startsWith("getdown_txt_") && val != null) {
-        // file values rationalised
-        if (val.indexOf('/') > -1) {
-          def r = null
-          if (val.indexOf('/') == 0) {
-            // absolute path
-            r = file(val)
-          } else if (val.indexOf('/') > 0) {
-            // relative path (relative to jalviewDir)
-            r = file( jalviewDir + '/' + val )
+        if (prop.startsWith("getdown_txt_multi_")) {
+          def key = prop.substring(18)
+          val.split(",").each{ v ->
+            def line = key + " = " + v + "\n"
+            getdownTextString += line
           }
-          if (r.exists()) {
-            val = getdown_resource_dir + '/' + r.getName()
-            getdownWebsiteResourceFilenames += val
-            getdownResourceFilenames += r.getPath()
+        } else {
+          // file values rationalised
+          if (val.indexOf('/') > -1) {
+            def r = null
+            if (val.indexOf('/') == 0) {
+              // absolute path
+              r = file(val)
+            } else if (val.indexOf('/') > 0) {
+              // relative path (relative to jalviewDir)
+              r = file( jalviewDir + '/' + val )
+            }
+            if (r.exists()) {
+              val = getdown_resource_dir + '/' + r.getName()
+              getdownWebsiteResourceFilenames += val
+              getdownResourceFilenames += r.getPath()
+            }
           }
+          def line = prop.substring(12) + " = " + val + "\n"
+          getdownTextString += line
         }
-        def line = prop.substring(12) + " = " + val + "\n"
-        getdownTextString += line
       }
     }
 

diff --git a/getdown/lib/getdown-core-1.8.3-SNAPSHOT.jar b/getdown/lib/getdown-core-1.8.3-SNAPSHOT.jar
index ed61abf..e8eef5f 100644 (file)
Binary files a/getdown/lib/getdown-core-1.8.3-SNAPSHOT.jar and b/getdown/lib/getdown-core-1.8.3-SNAPSHOT.jar differ

diff --git a/getdown/lib/getdown-launcher.jar b/getdown/lib/getdown-launcher.jar
index f39be5b..3439ea4 100644 (file)
Binary files a/getdown/lib/getdown-launcher.jar and b/getdown/lib/getdown-launcher.jar differ

diff --git a/gradle.properties b/gradle.properties
index 867449f..cb335d6 100644 (file)
--- a/gradle.properties
+++ b/gradle.properties
@@ -51,7 +51,7 @@ getdown_launcher = getdown/lib/getdown-launcher.jar
 getdown_core = getdown/lib/getdown-core-1.8.3-SNAPSHOT.jar
 getdown_base_txt = getdown/files/getdown.txt
 getdown_txt_title = Jalview
-getdown_txt_appbase = http://www.compbio.dundee.ac.uk/user/bsoares/getdown/jalview/DEMO
+getdown_txt_appbase = http://www.compbio.dundee.ac.uk/user/bsoares/getdown/jalview/DEV
 getdown_txt_allow_offline = true
 getdown_txt_jvmmempc = 95
 getdown_txt_strict_comments = true
@@ -70,9 +70,11 @@ getdown_txt_ui.status_text = 000066
 getdown_txt_ui.text_shadow = EEEEFF
 getdown_txt_ui.install_error = http://www.jalview.org/download/error
 getdown_txt_ui.mac_dock_icon = resources/images/jalview_logos.ico
-getdown_alt_java8_min_version = 1080202
-getdown_alt_java11_min_version = 11000028
-
+#getdown_alt_java8_min_version  = 01080000
+getdown_alt_java8_min_version  = 11000000
+getdown_alt_java11_min_version = 11000000
+getdown_txt_multi_java_location = [windows] /user/bsoares/getdown/jre/jre-11.0.2-windows-amd64.jar,[mac os x] /user/bsoares/getdown/jre/jre-11.0.2-macos-amd64.jar
+getdown_txt_multi_java_location = [windows-amd64] /user/bsoares/getdown/jre/jre-11.0.2-windows-amd64.jar,[linux-amd64] /user/bsoares/getdown/jre/jre-11.0.2-linux-amd64.jar,[windows-x86] /user/bsoares/getdown/jre/jre-11.0.2-windows-x86.jar,[mac os x] /user/bsoares/getdown/jre/jre-11.0.2-macos-amd64.jar,[linux-x86] /user/bsoares/getdown/jre/jre-11.0.2-linux-x86.jar,
 
 JRE_installs = /Users/bsoares/Java/installs
 Windows_JRE8 = OpenJDK8U-jdk_x64_windows_hotspot_8u202b08/jdk8u202-b08

diff --git a/resources/install4j/jalview_getdown.install4j b/resources/install4j/jalview_getdown.install4j
index 1cdd1c5..16aad1d 100644 (file)
--- a/resources/install4j/jalview_getdown.install4j
+++ b/resources/install4j/jalview_getdown.install4j
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <install4j version="7.0.9" transformSequenceNumber="7">
   <directoryPresets config="../../resources/install4j" />
-  <application name="Jalview" distributionSourceDir="" applicationId="6595-2347-1923-0725" mediaDir="../../build/install4j" mediaFilePattern="${compiler:sys.shortName}_${compiler:sys.platform}_${compiler:sys.version}" compression="6" lzmaCompression="true" pack200Compression="false" excludeSignedFromPacking="true" commonExternalFiles="false" createMd5Sums="true" shrinkRuntime="true" shortName="Jalview" publisher="University of Dundee" publisherWeb="http://www.jalview.org/" version="DEVELOPMENT" allPathsRelative="true" backupOnSave="false" autoSave="false" convertDotsToUnderscores="true" macSignature="????" macVolumeId="5aac4968c304f65" javaMinVersion="11" javaMaxVersion="11" allowBetaVM="false" jdkMode="jdk" jdkName="JDK 1.8">
+  <application name="Jalview" distributionSourceDir="" applicationId="6595-2347-1923-0725" mediaDir="../../build/install4j" mediaFilePattern="${compiler:sys.shortName}_${compiler:sys.platform}_${compiler:sys.version}" compression="6" lzmaCompression="true" pack200Compression="false" excludeSignedFromPacking="true" commonExternalFiles="false" createMd5Sums="true" shrinkRuntime="true" shortName="Jalview" publisher="University of Dundee" publisherWeb="http://www.jalview.org/" version="DEVELOPMENT" allPathsRelative="true" backupOnSave="false" autoSave="false" convertDotsToUnderscores="true" macSignature="????" macVolumeId="5aac4968c304f65" javaMinVersion="11" javaMaxVersion="11" allowBetaVM="false" jdkMode="jdk" jdkName="JDK 11.0">
     <languages skipLanguageSelection="false" languageSelectionInPrincipalLanguage="false">
       <principalLanguage id="en" customLocalizationFile="" />
       <additionalLanguages />
@@ -1521,7 +1521,7 @@ return console.askYesNo(message, true);
         <content />
       </installerScript>
     </unixInstaller>
-    <macosArchive name="macOS Single Bundle Archive" id="152" customizedId="" mediaFileName="${compiler:sys.shortName}_${compiler:sys.platform}-app_${compiler:sys.version}" installDir="${compiler:sys.shortName}" overridePrincipalLanguage="false" jreBitType="all" runPostProcessor="false" postProcessor="" failOnPostProcessorError="false" useLegacyMediaFileIds="false" legacyMediaFileIds="" downloadURL="" includeAllDownloadableComponents="true" includedJRE="macosx-amd64-1.8.0_202_unpacked" manualJREEntry="false" archiveType="dmg" volumeName="${compiler:sys.shortName}" launcherId="121">
+    <macosArchive name="macOS Single Bundle Archive" id="152" customizedId="" mediaFileName="${compiler:sys.shortName}_${compiler:sys.platform}-app_${compiler:sys.version}" installDir="${compiler:sys.shortName}" overridePrincipalLanguage="false" jreBitType="all" runPostProcessor="false" postProcessor="" failOnPostProcessorError="false" useLegacyMediaFileIds="false" legacyMediaFileIds="" downloadURL="" includeAllDownloadableComponents="true" includedJRE="macosx-amd64-11.0.2" manualJREEntry="false" archiveType="dmg" volumeName="${compiler:sys.shortName}" launcherId="121">
       <excludedComponents />
       <includedDownloadableComponents />
       <excludedBeans />
@@ -1598,7 +1598,7 @@ return console.askYesNo(message, true);
         <content />
       </postUninstallScript>
     </linuxRPM>
-    <macosArchive name="Offline macOS Single Bundle Archive" id="739" customizedId="" mediaFileName="${compiler:sys.shortName}-OFFLINE_${compiler:sys.platform}-app_${compiler:sys.version}" installDir="${compiler:sys.shortName}" overridePrincipalLanguage="false" jreBitType="all" runPostProcessor="false" postProcessor="" failOnPostProcessorError="false" useLegacyMediaFileIds="false" legacyMediaFileIds="" downloadURL="" includeAllDownloadableComponents="true" includedJRE="macosx-amd64-1.8.0_202_unpacked" manualJREEntry="false" archiveType="dmg" volumeName="${compiler:sys.shortName} Offline Installer" launcherId="737">
+    <macosArchive name="Offline macOS Single Bundle Archive" id="739" customizedId="" mediaFileName="${compiler:sys.shortName}-OFFLINE_${compiler:sys.platform}-app_${compiler:sys.version}" installDir="${compiler:sys.shortName}" overridePrincipalLanguage="false" jreBitType="all" runPostProcessor="false" postProcessor="" failOnPostProcessorError="false" useLegacyMediaFileIds="false" legacyMediaFileIds="" downloadURL="" includeAllDownloadableComponents="true" includedJRE="macosx-amd64-11.0.2" manualJREEntry="false" archiveType="dmg" volumeName="${compiler:sys.shortName} Offline Installer" launcherId="737">
       <excludedComponents />
       <includedDownloadableComponents />
       <excludedBeans />