FIX: fix some date patterns.... What is a weak year anyway....

[gigi.git] / build.xml

diff --git a/build.xml b/build.xml
index fa99b2ad50e9066cdd48a517c25a23b0e9982c7f..fd15e1346ff6aa8f0d7fd8bd8b8a6bbb2855c4b3 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">
@@ -151,7 +160,14 @@
                        <arg value="-noprompt" />
                </exec>
        </target>
-       <target name="test" depends="build-project-test,generateKeys,FetchLocales,pack">
+       <target name="reset-db">
+               <copy file="config/test.properties" tofile="config/gigi.properties"/>
+               <java classname="org.cacert.gigi.util.DatabaseManager">
+                       <arg value="--test"/>
+                       <classpath refid="cacert-gigi.classpath" />
+               </java>
+       </target>
+       <target name="test" depends="build-project-test,generateKeys,FetchLocales,pack,reset-db">
                <delete failonerror="false">
                        <fileset dir=".">
                                <include name="jacoco.exec"/>