FIX: correct paths help the jacoco report generator.

[gigi.git] / build.xml

diff --git a/build.xml b/build.xml
index fd15e1346ff6aa8f0d7fd8bd8b8a6bbb2855c4b3..7c5e3bc55955ee7c1e2c2443e2f15dde36dabcb4 100644 (file)
--- 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>