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-3541 Added mem setting and jvmArgs for cloverReporting
[jalview.git]
/
build.gradle
diff --git
a/build.gradle
b/build.gradle
index
6fa6632
..
ca8de58
100644
(file)
--- a/
build.gradle
+++ b/
build.gradle
@@
-193,10
+193,10
@@
ext {
getdownChannelName = CHANNEL.toLowerCase()+"/${JALVIEW_VERSION}"
getdownDir = string("${getdownChannelName}/${JAVA_VERSION}")
getdownAppBase = string("${getdown_channel_base}/${getdownDir}")
getdownChannelName = CHANNEL.toLowerCase()+"/${JALVIEW_VERSION}"
getdownDir = string("${getdownChannelName}/${JAVA_VERSION}")
getdownAppBase = string("${getdown_channel_base}/${getdownDir}")
- if (!file("${ARCHIVEDIR}/${packageDir}").exists()) {
+ if (!file("${ARCHIVEDIR}/${package_dir}").exists()) {
throw new GradleException("Must provide an ARCHIVEDIR value to produce an archive distribution")
} else {
throw new GradleException("Must provide an ARCHIVEDIR value to produce an archive distribution")
} else {
- packageDir = string("${ARCHIVEDIR}/${packageDir}")
+ package_dir = string("${ARCHIVEDIR}/${package_dir}")
buildProperties = string("${ARCHIVEDIR}/${classes_dir}/${build_properties_file}")
buildDist = false
}
buildProperties = string("${ARCHIVEDIR}/${classes_dir}/${build_properties_file}")
buildDist = false
}
@@
-208,10
+208,10
@@
ext {
getdownChannelName = string("archive/${JALVIEW_VERSION}")
getdownDir = string("${getdownChannelName}/${JAVA_VERSION}")
getdownAppBase = file(getdownWebsiteDir).toURI().toString()
getdownChannelName = string("archive/${JALVIEW_VERSION}")
getdownDir = string("${getdownChannelName}/${JAVA_VERSION}")
getdownAppBase = file(getdownWebsiteDir).toURI().toString()
- if (!file("${ARCHIVEDIR}/${packageDir}").exists()) {
+ if (!file("${ARCHIVEDIR}/${package_dir}").exists()) {
throw new GradleException("Must provide an ARCHIVEDIR value to produce an archive distribution")
} else {
throw new GradleException("Must provide an ARCHIVEDIR value to produce an archive distribution")
} else {
- packageDir = string("${ARCHIVEDIR}/${packageDir}")
+ package_dir = string("${ARCHIVEDIR}/${package_dir}")
buildProperties = string("${ARCHIVEDIR}/${classes_dir}/${build_properties_file}")
buildDist = false
}
buildProperties = string("${ARCHIVEDIR}/${classes_dir}/${build_properties_file}")
buildDist = false
}
@@
-454,7
+454,7
@@
sourceSets {
srcDirs += helpParentDir
}
srcDirs += helpParentDir
}
- jar.destinationDir = file("${jalviewDir}/${packageDir}")
+ jar.destinationDir = file("${jalviewDir}/${package_dir}")
compileClasspath = files(sourceSets.main.java.outputDir)
compileClasspath += fileTree(dir: "${jalviewDir}/${libDir}", include: ["*.jar"])
compileClasspath = files(sourceSets.main.java.outputDir)
compileClasspath += fileTree(dir: "${jalviewDir}/${libDir}", include: ["*.jar"])
@@
-738,6
+738,13
@@
task cloverConsoleReport(type: JavaExec) {
classpath = sourceSets.clover.runtimeClasspath
main = "com.atlassian.clover.reporters.console.ConsoleReporter"
classpath = sourceSets.clover.runtimeClasspath
main = "com.atlassian.clover.reporters.console.ConsoleReporter"
+ if (cloverreport_mem.length() > 0) {
+ maxHeapSize = cloverreport_mem
+ }
+ if (cloverreport_jvmargs.length() > 0) {
+ jvmArgs Arrays.asList(cloverreport_jvmargs.split(" "))
+ }
+
def argsList = [
"--alwaysreport",
"--initstring",
def argsList = [
"--alwaysreport",
"--initstring",
@@
-764,6
+771,13
@@
task cloverHtmlReport(type: JavaExec) {
classpath = sourceSets.clover.runtimeClasspath
main = "com.atlassian.clover.reporters.html.HtmlReporter"
classpath = sourceSets.clover.runtimeClasspath
main = "com.atlassian.clover.reporters.html.HtmlReporter"
+ if (cloverreport_mem.length() > 0) {
+ maxHeapSize = cloverreport_mem
+ }
+ if (cloverreport_jvmargs.length() > 0) {
+ jvmArgs Arrays.asList(cloverreport_jvmargs.split(" "))
+ }
+
def argsList = [
"--alwaysreport",
"--initstring",
def argsList = [
"--alwaysreport",
"--initstring",
@@
-772,6
+786,10
@@
task cloverHtmlReport(type: JavaExec) {
cloverHtmlDir
]
cloverHtmlDir
]
+ if (cloverreport_html_options.length() > 0) {
+ argsList += cloverreport_html_options.split(" ")
+ }
+
args argsList.toArray()
}
args argsList.toArray()
}
@@
-791,6
+809,13
@@
task cloverXmlReport(type: JavaExec) {
classpath = sourceSets.clover.runtimeClasspath
main = "com.atlassian.clover.reporters.xml.XMLReporter"
classpath = sourceSets.clover.runtimeClasspath
main = "com.atlassian.clover.reporters.xml.XMLReporter"
+ if (cloverreport_mem.length() > 0) {
+ maxHeapSize = cloverreport_mem
+ }
+ if (cloverreport_jvmargs.length() > 0) {
+ jvmArgs Arrays.asList(cloverreport_jvmargs.split(" "))
+ }
+
def argsList = [
"--alwaysreport",
"--initstring",
def argsList = [
"--alwaysreport",
"--initstring",
@@
-799,6
+824,10
@@
task cloverXmlReport(type: JavaExec) {
cloverXmlFile
]
cloverXmlFile
]
+ if (cloverreport_xml_options.length() > 0) {
+ argsList += cloverreport_xml_options.split(" ")
+ }
+
args argsList.toArray()
}
args argsList.toArray()
}
@@
-1126,7
+1155,7
@@
ant.importBuild "${utils_dir}/publishHelp.xml"
task cleanPackageDir(type: Delete) {
doFirst {
task cleanPackageDir(type: Delete) {
doFirst {
- delete fileTree(dir: "${jalviewDir}/${packageDir}", include: "*.jar")
+ delete fileTree(dir: "${jalviewDir}/${package_dir}", include: "*.jar")
}
}
}
}
@@
-1142,7
+1171,7
@@
jar {
"Codebase": application_codebase
}
"Codebase": application_codebase
}
- destinationDir = file("${jalviewDir}/${packageDir}")
+ destinationDir = file("${jalviewDir}/${package_dir}")
archiveName = rootProject.name+".jar"
exclude "cache*/**"
archiveName = rootProject.name+".jar"
exclude "cache*/**"
@@
-1152,20
+1181,20
@@
jar {
exclude "**/*.jar.*"
inputs.dir(classesDir)
exclude "**/*.jar.*"
inputs.dir(classesDir)
- outputs.file("${jalviewDir}/${packageDir}/${archiveName}")
+ outputs.file("${jalviewDir}/${package_dir}/${archiveName}")
}
task copyJars(type: Copy) {
from fileTree(dir: classesDir, include: "**/*.jar").files
}
task copyJars(type: Copy) {
from fileTree(dir: classesDir, include: "**/*.jar").files
- into "${jalviewDir}/${packageDir}"
+ into "${jalviewDir}/${package_dir}"
}
// doing a Sync instead of Copy as Copy doesn't deal with "outputs" very well
task syncJars(type: Sync) {
from fileTree(dir: "${jalviewDir}/${libDistDir}", include: "**/*.jar").files
}
// doing a Sync instead of Copy as Copy doesn't deal with "outputs" very well
task syncJars(type: Sync) {
from fileTree(dir: "${jalviewDir}/${libDistDir}", include: "**/*.jar").files
- into "${jalviewDir}/${packageDir}"
+ into "${jalviewDir}/${package_dir}"
preserve {
include jar.archiveName
}
preserve {
include jar.archiveName
}
@@
-1181,7
+1210,7
@@
task makeDist {
dependsOn cleanPackageDir
dependsOn syncJars
dependsOn jar
dependsOn cleanPackageDir
dependsOn syncJars
dependsOn jar
- outputs.dir("${jalviewDir}/${packageDir}")
+ outputs.dir("${jalviewDir}/${package_dir}")
}
}
@@
-1294,7
+1323,7
@@
task getdownWebsite() {
}
def codeFiles = []
}
def codeFiles = []
- fileTree(file(packageDir)).each{ f ->
+ fileTree(file(package_dir)).each{ f ->
if (f.isDirectory()) {
def files = fileTree(dir: f, include: ["*"]).getFiles()
codeFiles += files
if (f.isDirectory()) {
def files = fileTree(dir: f, include: ["*"]).getFiles()
codeFiles += files
@@
-1389,7
+1418,7
@@
task getdownWebsite() {
}
if (buildDist) {
}
if (buildDist) {
- inputs.dir("${jalviewDir}/${packageDir}")
+ inputs.dir("${jalviewDir}/${package_dir}")
}
outputs.dir(getdownWebsiteDir)
outputs.dir(getdownFilesDir)
}
outputs.dir(getdownWebsiteDir)
outputs.dir(getdownFilesDir)