resources {
srcDirs "$jalviewDir/$resourceDir"
- srcDirs "$jalviewDir/$libDir"
+ srcDirs "$jalviewDir/$libDistDir"
}
jar.destinationDir = file("$jalviewDir/$packageDir")
}
task syncLib(type: Sync) {
- def syncDir = "$classes/$libDir"
- from fileTree("$jalviewDir/$libDir")
+ def syncDir = "$classes/$libDistDir"
+ from fileTree("$jalviewDir/$libDistDir")
into syncDir
}
// 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
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
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() {
def install4jConf
def macosJavaVMDir
def windowsJavaVMDir
+def install4jDir = "$jalviewDir/$install4jResourceDir"
+def install4jConfFile = "jalview-installers-java"+JAVA_VERSION+".install4j"
+install4jConf = "$install4jDir/$install4jConfFile"
+
task copyInstall4jTemplate(type: Copy) {
- def install4jDir = "$jalviewDir/$install4jResourceDir"
- def install4jConfFile = "jalview-installers-java"+JAVA_VERSION+".install4j"
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"
from (install4jDir) {
filter(ReplaceTokens, beginToken: '$$', endToken: '$$', tokens: ['VERSION': JALVIEW_VERSION, 'MACOS_JAVA_VM_DIR': macosJavaVMDir, 'WINDOWS_JAVA_VM_DIR': windowsJavaVMDir])
}
into install4jDir
- install4jConf = "$install4jDir/$install4jConfFile"
inputs.files("$install4jDir/$install4jTemplate")
outputs.files(install4jConf)
}
task installers(type: com.install4j.gradle.Install4jTask) {
dependsOn getdown
dependsOn copyInstall4jTemplate
- projectFile = file install4jConf
+ projectFile = file(install4jConf)
+ println("Using projectFile "+projectFile)
variables = [majorVersion: version.substring(2, 11), build: 001]
destination = "$jalviewDir/$install4jBuildDir"
buildSelected = true