Trying to create zip & coverage report

e4401673 · Eric Duminil · 742a7890 · e4401673
Commit e4401673 authored Nov 06, 2019 by Eric Duminil
--- a/deploy.xml
+++ b/deploy.xml
@@ -5,13 +5,14 @@ to the directory specified in property "deploy.dir.path". It can be used to perf
 Before executing check that all required modules/projects are enumerated in  property "projects".
 -->

-<project default="deploy" name="RegionChooser" basedir=".">
+<project default="deploy" name="RegionChooser" basedir="." xmlns:jacoco="antlib:org.jacoco.ant">
 	<description>
 		Create a Jar file with RegionChooser libraries and executables
 	</description>
 	<property name="target.path" value="lib/region-chooser" />
 	<property name="projects" value="." />
 	<import file="deploy-common.xml" />
+	<target name="all" depends="deploy, zip, coverage-report" />
 	<target name="deploy" depends="unit-test">
 		<echo file="${deploy.dir}/RegionChooser.bat">
 java -classpath lib/* -Xms512m -Xmx2g -Djava.util.logging.config.file=logging.properties eu.simstadt.regionchooser.RegionChooserFX&#13;
@@ -42,4 +43,50 @@ java -classpath lib/* -Xms512m -Xmx2g -Djava.util.logging.config.file=logging.pr
 			    <test name="eu.simstadt.regionchooser.RegionExtractorWithDifferentInputTests" haltonfailure="yes" todir="${reports.dir}" />
 		    </junit>
 	</target>
+	<target name="zip" depends="git.revision">
+		<zip destfile="${deploy.dir}/../SimStadt_${simstadt.version}_${git.branch}_${git.YYYYMMDD}_${git.revision}.zip">
+			<fileset dir="${deploy.dir}" excludes="*.sh,*.command" />
+			<zipfileset dir="${deploy.dir}" includes="*.sh,*.command" filemode="755" />
+		</zip>
+		<!--<delete dir="${stage.dir}" /> Leave classes in tmpdeploy for Jenkins JaCoCo --> 
+	</target>
+	<target name="delete-reports">
+		<delete dir="${report.dir}" />
+	</target>
+
+	<target name="coverage-merge" unless="doNotTest">
+		<jacoco:merge destfile="${report.dir}/simstadt_all.exec">
+			<fileset dir="${report.dir}" includes="**/*.exec" />
+		</jacoco:merge>
+	</target>
+
+	<target name="coverage-report" depends="coverage-merge" unless="doNotTest">
+		<jacoco:report>
+			<executiondata>
+				<file file="${report.dir}/simstadt_all.exec" />
+			</executiondata>
+
+			<structure name="SimStadt">
+				<classfiles>
+					<fileset dir="${workflows.dir}">
+						<include name="**/*.jar" />
+					</fileset>
+					<file file="${deploy.dir}/lib/simstadt-${simstadt.version}.jar" />
+					<file file="${deploy.dir}/lib/region-chooser-${simstadt.version}.jar" />
+					<!-- For every library.
+					<fileset dir="${lib.dir}">
+						<include name="*.jar" />
+						<exclude name="jaxb-xjc.jar" />
+					</fileset>
+					-->
+				</classfiles>
+				<sourcefiles encoding="UTF-8">
+					<dirset dir="${simstadt.src.dir}/../">
+						<include name="**/src/" />
+					</dirset>
+				</sourcefiles>
+			</structure>
+			<html destdir="${report.dir}/coverage" />
+		</jacoco:report>
+	</target>
 </project>