From: Ben Soares <bsoares@dundee.ac.uk>
Date: Thu, 14 May 2020 20:11:47 +0000 (+0100)
Subject: JAL-3541 Added mem setting and jvmArgs for cloverReporting
X-Git-Tag: Release_2_11_4_0~45^2~9^2^2~3
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=1b7f570e89db9e6f0b0604a49cf0f04f90a60629;p=jalview.git

JAL-3541 Added mem setting and jvmArgs for cloverReporting
---

diff --git a/build.gradle b/build.gradle
index 92d735d..fc1d7c2 100644
--- 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}")
-    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 {
-      packageDir = string("${ARCHIVEDIR}/${packageDir}")
+      package_dir = string("${ARCHIVEDIR}/${package_dir}")
       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()
-    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 {
-      packageDir = string("${ARCHIVEDIR}/${packageDir}")
+      package_dir = string("${ARCHIVEDIR}/${package_dir}")
       buildProperties = string("${ARCHIVEDIR}/${classes_dir}/${build_properties_file}")
       buildDist = false
     }
@@ -454,7 +454,7 @@ sourceSets {
       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"])
@@ -738,6 +738,13 @@ task cloverConsoleReport(type: JavaExec) {
   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",
@@ -764,6 +771,13 @@ task cloverHtmlReport(type: JavaExec) {
   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",
@@ -772,6 +786,10 @@ task cloverHtmlReport(type: JavaExec) {
     cloverHtmlDir
   ]
 
+  if (cloverreport_html_options.length() > 0) {
+    argsList += cloverreport_html_options.split(" ")
+  }
+
   args argsList.toArray()
 }
 
@@ -791,6 +809,13 @@ task cloverXmlReport(type: JavaExec) {
   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",
@@ -799,6 +824,10 @@ task cloverXmlReport(type: JavaExec) {
     cloverXmlFile
   ]
 
+  if (cloverreport_xml_options.length() > 0) {
+    argsList += cloverreport_xml_options.split(" ")
+  }
+
   args argsList.toArray()
 }
 
@@ -1116,7 +1145,7 @@ ant.importBuild "${utils_dir}/publishHelp.xml"
 
 task cleanPackageDir(type: Delete) {
   doFirst {
-    delete fileTree(dir: "${jalviewDir}/${packageDir}", include: "*.jar")
+    delete fileTree(dir: "${jalviewDir}/${package_dir}", include: "*.jar")
   }
 }
 
@@ -1132,7 +1161,7 @@ jar {
     "Codebase": application_codebase
   }
 
-  destinationDir = file("${jalviewDir}/${packageDir}")
+  destinationDir = file("${jalviewDir}/${package_dir}")
   archiveName = rootProject.name+".jar"
 
   exclude "cache*/**"
@@ -1142,20 +1171,20 @@ jar {
   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
-  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
-  into "${jalviewDir}/${packageDir}"
+  into "${jalviewDir}/${package_dir}"
   preserve {
     include jar.archiveName
   }
@@ -1171,7 +1200,7 @@ task makeDist {
   dependsOn cleanPackageDir
   dependsOn syncJars
   dependsOn jar
-  outputs.dir("${jalviewDir}/${packageDir}")
+  outputs.dir("${jalviewDir}/${package_dir}")
 }
 
 
@@ -1284,7 +1313,7 @@ task getdownWebsite() {
     }
 
     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
@@ -1379,7 +1408,7 @@ task getdownWebsite() {
   }
 
   if (buildDist) {
-    inputs.dir("${jalviewDir}/${packageDir}")
+    inputs.dir("${jalviewDir}/${package_dir}")
   }
   outputs.dir(getdownWebsiteDir)
   outputs.dir(getdownFilesDir)
diff --git a/gradle.properties b/gradle.properties
index 5b80dae..14ef211 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,5 +1,3 @@
-org.gradle.jvmargs=-Xmx1536m -Xms512m
-
 jalviewDir = .
 
 #JAVA_VERSION = 1.8
@@ -38,11 +36,11 @@ clover_classes_dir = clover-classes
 clover_sources_instr_dir = clover-instr
 clover_report_dir = clover-report
 clover_lib_dir = utils/clover/lib
-cloverReportJVMHeap = 2g
-cloverReportJVMArgs = -Dfile.encoding=UTF-8
-cloverReportHTMLOptions = 
-cloverReportXMLOptions =
-packageDir = dist
+cloverreport_mem = 2g
+cloverreport_jvmargs = -Dfile.encoding=UTF-8
+cloverreport_html_options = 
+cloverreport_xml_options =
+package_dir = dist
 ARCHIVEDIR =
 
 test_output_dir = tests