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-3130 make sure only libDistDir/*.jar are added to the runtime classpath in shadow...
[jalview.git]
/
build.gradle
diff --git
a/build.gradle
b/build.gradle
index
3495877
..
54aed95
100644
(file)
--- a/
build.gradle
+++ b/
build.gradle
@@
-73,7
+73,7
@@
sourceSets {
resources {
srcDirs "$jalviewDir/$resourceDir"
resources {
srcDirs "$jalviewDir/$resourceDir"
- srcDirs "$jalviewDir/$libDir"
+ srcDirs "$jalviewDir/$libDistDir"
}
jar.destinationDir = file("$jalviewDir/$packageDir")
}
jar.destinationDir = file("$jalviewDir/$packageDir")
@@
-296,8
+296,8
@@
task copyHelp(type: Copy) {
}
task syncLib(type: Sync) {
}
task syncLib(type: Sync) {
- def syncDir = "$classes/$libDir"
- from fileTree("$jalviewDir/$libDir")
+ def syncDir = "$classes/$libDistDir"
+ from fileTree("$jalviewDir/$libDistDir")
into syncDir
}
into syncDir
}
@@
-422,7
+422,7
@@
task copyJars(type: Copy) {
// doing a Sync instead of Copy as Copy doesn't deal with "outputs" very well
task syncJars(type: Sync) {
// 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
into "$jalviewDir/$packageDir"
preserve {
include jar.archiveName
@@
-447,10
+447,8
@@
task cleanDist {
shadowJar {
dependsOn makeDist
shadowJar {
dependsOn makeDist
- if (JAVA_VERSION.equals("11")) {
- from ("$jalviewDir/$j11libDir") {
+ from ("$jalviewDir/$libDistDir") {
include("*.jar")
include("*.jar")
- }
}
mainClassName = shadowJarMainClass
mergeServiceFiles()
}
mainClassName = shadowJarMainClass
mergeServiceFiles()
@@
-459,7
+457,9
@@
shadowJar {
}
ext {
}
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
getdownAppDir = getdownWebsiteDir + '/' + getdown_app_dir
getdownJ11libDir = getdownWebsiteDir + '/' + getdown_j11lib_dir
getdownResourceDir = getdownWebsiteDir + '/' + getdown_resource_dir
@@
-470,7
+470,7
@@
ext {
if (getdown_channel_name.equals("COMMIT")) {
getdownChannel = getGitHash()
}
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() {
}
task getdownWebsite() {
@@
-661,7
+661,8
@@
task copyInstall4jTemplate(type: Copy) {
task installers(type: com.install4j.gradle.Install4jTask) {
dependsOn getdown
dependsOn copyInstall4jTemplate
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
variables = [majorVersion: version.substring(2, 11), build: 001]
destination = "$jalviewDir/$install4jBuildDir"
buildSelected = true