From: Jim Procter <jprocter@issues.jalview.org>
Date: Wed, 26 Feb 2020 10:10:31 +0000 (+0000)
Subject: JAL-3541 configurables for clover report generation (JVM heap, JVM args, and -v or... 
X-Git-Tag: Develop-2_11_2_0-d20201215~93
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;ds=sidebyside;h=0d12fdd79a8a69440c31dc6f72edddf2e5621d5e;p=jalview.git

JAL-3541 configurables for clover report generation (JVM heap, JVM args, and -v or -d for debugging)
---

diff --git a/build.gradle b/build.gradle
index 7e65586..db80bf4 100644
--- a/build.gradle
+++ b/build.gradle
@@ -474,19 +474,27 @@ task cloverReportHTML (type: JavaExec) {
     outputs.dir "${reportsDir}/clover"
 
     classpath configurations.cloverRuntime
-    maxHeapSize "2g"
+    maxHeapSize "${cloverReportJVMHeap}"
+    jvmArgs += "${cloverReportJVMArgs}"
     main = "com.atlassian.clover.reporters.html.HtmlReporter"
-    args "-v", "--initstring", "${buildDir}/clover/clover.db",
-    "-o", "${reportsDir}/clover"
+    args  "--initstring", "${buildDir}/clover/clover.db", "-o", "${reportsDir}/clover"
+    "${cloverReportHTMLOptions}".split(",").each {
+      args+= it.trim()
+      }
 }
 
 task cloverReportXML (type: JavaExec) {
     inputs.dir "${buildDir}/clover"
     outputs.dir "${reportsDir}/clover"
-    maxHeapSize "2g"
+    maxHeapSize "${cloverReportJVMHeap}"
+    jvmArgs "${cloverReportJVMArgs}"
     classpath configurations.cloverRuntime
     main = "com.atlassian.clover.reporters.xml.XMLReporter"
-    args "--initstring", "${buildDir}/clover/clover.db", "-o", "${reportsDir}/clover/clover.xml"
+    args  "--initstring", "${buildDir}/clover/clover.db", "-o", "${reportsDir}/clover/clover.xml"
+    
+    "${cloverReportXMLOptions}".split(",").each {
+      args+= it.trim()
+      }
 }
 task cloverReport {
   group = "Verification"
diff --git a/gradle.properties b/gradle.properties
index 2dbdad3..3430f95 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -29,6 +29,10 @@ classesDir = classes
 examplesDir = examples
 clover = false
 use_clover = false
+cloverReportJVMHeap = 2g
+cloverReportJVMArgs = -Dfile.encoding=UTF-8
+cloverReportHTMLOptions = -d
+cloverReportXMLOptions =
 cloverClassesDir = clover-classes
 cloverSourcesInstrDir = sources-instr
 packageDir = dist