From: Jim Procter <jprocter@issues.jalview.org>
Date: Wed, 18 Jul 2018 14:40:55 +0000 (+0100)
Subject: Merge branch 'develop' into Jalview-BH/JAL-3026
X-Git-Tag: Develop-2_11_2_0-d20201215~24^2~68^2~536
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=6402cfbecd10653f94f6dbf2e26c718717503925;hp=0949e2572f4a1263c7bfbc08259823be7513c75b;p=jalview.git

Merge branch 'develop' into Jalview-BH/JAL-3026
clover artefacts added to gitignore. nb - .classpath is now ignored - may need to be redacted
---

diff --git a/.gitignore b/.gitignore
index aab4480..0567460 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,6 @@
 .project
 /dist
+/clover
 /classes
 /tests
 /test-reports
@@ -18,3 +19,4 @@ TESTNG
 /site0/
 /sitev/
 /.classpath
+*.class
diff --git a/build.xml b/build.xml
index 5dafe48..e92885a 100755
--- a/build.xml
+++ b/build.xml
@@ -20,6 +20,9 @@
 <project name="jalviewX" default="usage" basedir="."
  xmlns:if="ant:if"
     xmlns:unless="ant:unless">
+  <taskdef classpath="${clover.jar}" resource="cloverlib.xml" if:set="clover.jar"/>
+  <clover-env if:set="clover.jar"/>
+
   <target name="help" depends="usage" />
   <target name="usage" depends="init">
     <echo message="~~~Jalview Ant build.xml Usage~~~~" />
@@ -40,6 +43,7 @@
     <echo message="See docs/building.html and the comments in build file for other targets." />
     <echo message="note: compile and makeApplet optionally compile/obfuscate applet against a different Java version by specifying -Djava118.home=PathtoJDK/lib which is the lib directory in the JDK install that contains rt.jar " />
     <echo message="Useful -D flags: -Ddonotobfuscate will prevent applet obfuscation" />
+    <echo message="Useful -D flags: -Dclover.jar to specify path to openclover for testng coverage report" />
   </target>
 
 
@@ -130,6 +134,8 @@
     <property name="docDir" value="doc" />
     <property name="sourceDir" value="src" />
     <property name="schemaDir" value="schemas" />
+    <property name="outputDir" value="classes" unless:set="clover.jar"/>
+    <property name="outputDir" value="cloverclasses" if:set="clover.jar"/>
     <property name="outputDir" value="classes" />
     <property name="packageDir" value="dist" />
     <property name="outputJar" value="jalview.jar" />
@@ -299,6 +305,7 @@
       verbose="2">
       <classpath>
         <pathelement location="${testOutputDir}" />
+        <pathelement location="${clover.jar}" if:set="clover.jar"/>
         <path refid="test.classpath" />
       </classpath>
       <jvmarg value="--add-modules=java.se.ee" if:set="java9"/>
@@ -540,6 +547,9 @@
 </target>
 
 <target name="makedist" depends="build, buildPropertiesFile, linkcheck, buildindices">
+  <fail if="clover.jar">
+    Ignoring request to build jalview distribution with clover-instrumented classes
+  </fail>
   <!-- make the package jar if not already existing -->
   <mkdir dir="${packageDir}" />
   <!-- clean dir if it already existed -->