From: Ben Soares <bsoares@dundee.ac.uk>
Date: Wed, 27 May 2020 16:37:12 +0000 (+0100)
Subject: JAL-3541 ensure deletion of cloverReportDir
X-Git-Tag: Release_2_11_4_0~45^2~7
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=b04cbef0dac19e60f693e64fdb5855ebdc675f80;p=jalview.git

JAL-3541 ensure deletion of cloverReportDir
---

diff --git a/build.gradle b/build.gradle
index bd0ae20..51deb4c 100644
--- a/build.gradle
+++ b/build.gradle
@@ -148,7 +148,7 @@ ext {
   cloverBuildDir = "${buildDir}/clover"
   cloverInstrDir = file("${cloverBuildDir}/clover-instr")
   cloverClassesDir = file("${cloverBuildDir}/clover-classes")
-  cloverReportDir = file("${buildDir}/reports")
+  cloverReportDir = file("${buildDir}/reports/clover")
   cloverTestInstrDir = file("${cloverBuildDir}/clover-test-instr")
   cloverTestClassesDir = file("${cloverBuildDir}/clover-test-classes")
   //cloverTestClassesDir = cloverClassesDir
@@ -733,6 +733,7 @@ eclipseGroovyCorePreferences.mustRunAfter eclipseJdt
 task cleanClover {
   doFirst {
     delete cloverBuildDir
+    delete cloverReportDir
   }
 }
 
@@ -855,7 +856,7 @@ task cloverHtmlReport(type: JavaExec) {
     file(cloverDb).exists()
   }
 
-  def cloverHtmlDir = "${cloverReportDir}/clover"
+  def cloverHtmlDir = cloverReportDir
   inputs.dir cloverClassesDir
   outputs.dir cloverHtmlDir
 
@@ -893,7 +894,7 @@ task cloverXmlReport(type: JavaExec) {
     file(cloverDb).exists()
   }
 
-  def cloverXmlFile = "${cloverReportDir}/clover/clover.xml"
+  def cloverXmlFile = "${cloverReportDir}/clover.xml"
   inputs.dir cloverClassesDir
   outputs.file cloverXmlFile