]> WPIA git - gigi.git/commitdiff
projects / gigi.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 8b8d9ae)
FIX: Some paths in report generation.
authorFelix Dörre <felix@dogcraft.de>
Sat, 13 Sep 2014 16:42:50 +0000 (18:42 +0200)
committerFelix Dörre <felix@dogcraft.de>
Sat, 13 Sep 2014 16:46:49 +0000 (18:46 +0200)
build.xml patch | blob | history

diff --git a/build.xml b/build.xml
index 0515ddcff94fffc853891e18c786774db0b22e90..fa99b2ad50e9066cdd48a517c25a23b0e9982c7f 100644 (file)
--- a/build.xml
+++ b/build.xml
@@ -66,6 +66,8 @@
        </target>
        <target name="clean-test">
                <delete dir="bintest" />
+               <delete dir="cocoReport" failonerror="false"/>
+
        </target>
        <target depends="clean,clean-test" name="cleanall" />
        <target depends="build-project, native" name="build" />
@@ -152,8 +154,8 @@
        <target name="test" depends="build-project-test,generateKeys,FetchLocales,pack">
                <delete failonerror="false">
                        <fileset dir=".">
-                       <include name="jacoco.exec"/>
-                       <include name="tester.exec"/>
+                               <include name="jacoco.exec"/>
+                               <include name="tester.exec"/>
                        </fileset>
                </delete>
                <mkdir dir="${junit.output.dir}" />
@@ -188,20 +190,22 @@
                        </executiondata>
 
                        <structure name="CAcert gigi">
-                               <classfiles>
-                                       <fileset dir="bin/org/cacert/gigi"/>
-                               </classfiles>
-                               <sourcefiles encoding="UTF-8">
-                                       <fileset dir="src/org/cacert/gigi"/>
-                               </sourcefiles>
-                       </structure>
-                       <structure name="CAcert testcases">
-                               <classfiles>
-                                       <fileset dir="bintest/org/cacert/gigi"/>
-                               </classfiles>
-                               <sourcefiles encoding="UTF-8">
-                                       <fileset dir="tests/org/cacert/gigi"/>
-                               </sourcefiles>
+                               <group name="Server">
+                                       <classfiles>
+                                               <fileset dir="bin/org/cacert/gigi" />
+                                       </classfiles>
+                                       <sourcefiles encoding="UTF-8">
+                                               <fileset dir="src/org/cacert/gigi" />
+                                       </sourcefiles>
+                               </group>
+                               <group name="Testcases">
+                                       <classfiles>
+                                               <fileset dir="bintest/org/cacert/gigi" />
+                                       </classfiles>
+                                       <sourcefiles encoding="UTF-8">
+                                               <fileset dir="tests/org/cacert/gigi" />
+                                       </sourcefiles>
+                               </group>
                        </structure>
 
                        <html destdir="cocoReport"/>
WPIA Certificate Web Issuance Platform