git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
JAL-1929 JAL-3224 java 8 and java 11 specific getdown jre sets
[jalview.git]
/
build.gradle
diff --git
a/build.gradle
b/build.gradle
index
d28807b
..
577d616
100644
(file)
--- a/
build.gradle
+++ b/
build.gradle
@@
-42,19
+42,24
@@
def libDistDir
def compile_source_compatibility
def compile_target_compatibility
def additional_compiler_args = []
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
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
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
} 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
additional_compiler_args += [
'--module-path', file("$jalviewDir/$j11modDir").getAbsolutePath(),
'--add-modules', j11modules
@@
-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)
// 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) {
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]
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)
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 {
}
clean {