From: Ben Soares Date: Thu, 4 Apr 2019 10:08:07 +0000 (+0100) Subject: JAL-3130 JAL-3007 improvements to gradle build X-Git-Tag: Release_2_11_0~17^2~7^2~50 X-Git-Url: http://source.jalview.org/gitweb/?p=jalview.git;a=commitdiff_plain;h=28d68164d2df70c3166f11737516e28d0d37d58b JAL-3130 JAL-3007 improvements to gradle build --- diff --git a/build.gradle b/build.gradle index ec8267a..7b6cd6b 100644 --- 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 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 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 --- 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 --- a/resources/install4j/jalview_getdown.install4j +++ b/resources/install4j/jalview_getdown.install4j @@ -1,7 +1,7 @@ - + @@ -1521,7 +1521,7 @@ return console.askYesNo(message, true); - + @@ -1598,7 +1598,7 @@ return console.askYesNo(message, true); - +