FIX: correct paths help the jacoco report generator.

[gigi.git] / build.xml

diff --git a/build.xml b/build.xml
index 83c95e10328deb6e9675ae3e31bafad7711278ba..7c5e3bc55955ee7c1e2c2443e2f15dde36dabcb4 100644 (file)
--- a/build.xml
+++ b/build.xml
@@ -18,16 +18,19 @@
        </path>
        <path id="cacert-gigi.classpath">
                <pathelement location="bin" />
+               <pathelement location="binutil" />
                <pathelement location="${mysqlconnector}" />
        </path>
        <path id="cacert-gigi.test.classpath">
                <pathelement location="bin" />
+               <pathelement location="binutil" />
                <pathelement location="bintest" />
                <path refid="JUnit 4.libraryclasspath" />
                <pathelement location="${mysqlconnector}" />
        </path>
        <target name="init">
                <mkdir dir="bin" />
+               <mkdir dir="binutil" />
                <mkdir dir="bintest" />
 
                <copy includeemptydirs="false" todir="bin">
@@ -80,6 +83,11 @@
                        <src path="lib/jetty" />
                        <src path="lib/jtar" />
                        <src path="src" />
+                       <classpath refid="cacert-gigi.classpath" />
+               </javac>
+               <javac debug="true" debuglevel="${debuglevel}" destdir="binutil"
+                       includeantruntime="false" source="${source}" target="${target}">
+                       <compilerarg value="-XDignore.symbol.file"/>
                        <src path="util" />
                        <classpath refid="cacert-gigi.classpath" />
                </javac>
@@ -90,7 +98,8 @@
        </target>
 
        <target depends="build" name="pack">
-               <jar destfile="gigi.jar" basedir="bin" manifest="Gigi.MF" />
+               <jar destfile="gigi.jar" basedir="bin" manifest="Gigi.MF" update="false"/>
+               <jar destfile="gigi.jar" basedir="binutil" update="on"/>
        </target>
 
        <target depends="test,native" name="bundle">
@@ -192,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>