From: Felix Dörre <felix@dogcraft.de>
Date: Wed, 1 Oct 2014 16:35:52 +0000 (+0200)
Subject: FIX: correct paths help the jacoco report generator.
X-Git-Url: https://code.wpia.club/?p=gigi.git;a=commitdiff_plain;h=4c2b4ee3efd792f8d02608e51f1ddc7c2f09337c;hp=b1a23f4e7daa5ccd9f8988930d97832d132b99b8

FIX: correct paths help the jacoco report generator.
---

diff --git a/build.xml b/build.xml
index fd15e134..7c5e3bc5 100644
--- a/build.xml
+++ b/build.xml
@@ -201,25 +201,32 @@
 		</jacoco:merge>
 		<jacoco:report>
 			<executiondata>
-				<file file="jacoco.exec" />
-				<file file="tester.exec" />
+				<file file="merged.exec" />
 			</executiondata>
 
 			<structure name="CAcert gigi">
 				<group name="Server">
 					<classfiles>
-						<fileset dir="bin/org/cacert/gigi" />
+						<fileset dir="bin">
+							<include name="org/cacert/gigi/**"/>
+						</fileset>
 					</classfiles>
 					<sourcefiles encoding="UTF-8">
-						<fileset dir="src/org/cacert/gigi" />
+						<fileset dir="src">
+							<include name="org/cacert/gigi/**"/>
+						</fileset>
 					</sourcefiles>
 				</group>
 				<group name="Testcases">
 					<classfiles>
-						<fileset dir="bintest/org/cacert/gigi" />
+						<fileset dir="bintest">
+							<include name="org/cacert/gigi/**"/>
+						</fileset>
 					</classfiles>
 					<sourcefiles encoding="UTF-8">
-						<fileset dir="tests/org/cacert/gigi" />
+						<fileset dir="tests">
+							<include name="org/cacert/gigi/**"/>
+						</fileset>
 					</sourcefiles>
 				</group>
 			</structure>