Merge branch 'fix-signer'

[gigi.git] / build.xml

diff --git a/build.xml b/build.xml
index 71a2d37107807b8be6a47584caf22cfb25a79aab..7290ab69cd5023e1a7674972fa0d2fef572ffcc3 100644 (file)
--- a/build.xml
+++ b/build.xml
@@ -41,20 +41,14 @@
                                <exclude name="**/*.launch" />
                                <exclude name="**/*.java" />
                        </fileset>
-               </copy>
-               <copy includeemptydirs="false" todir="bin">
                        <fileset dir="lib/jetty">
                                <exclude name="**/*.launch" />
                                <exclude name="**/*.java" />
                        </fileset>
-               </copy>
-               <copy includeemptydirs="false" todir="bin">
                        <fileset dir="src">
                                <exclude name="**/*.launch" />
                                <exclude name="**/*.java" />
                        </fileset>
-               </copy>
-               <copy includeemptydirs="false" todir="bin">
                        <fileset dir="util">
                                <exclude name="**/*.launch" />
                                <exclude name="**/*.java" />
@@ -85,16 +79,17 @@
        <target depends="build-project, build-testing, native" name="build" />
        <target depends="init" name="build-project">
                <echo message="${ant.project.name}: ${ant.file}" />
-               <javac debug="true" debuglevel="${debuglevel}" destdir="bin"
+               <javac encoding="UTF-8" debug="true" debuglevel="${debuglevel}" destdir="bin"
                        includeantruntime="false" source="${source}" target="${target}">
                        <compilerarg value="-XDignore.symbol.file"/>
                        <src path="lib/servlet-api" />
                        <src path="lib/jetty" />
                        <src path="lib/jtar" />
+                       <src path="lib/scrypt" />
                        <src path="src" />
                        <classpath refid="cacert-gigi.classpath" />
                </javac>
-               <javac debug="true" debuglevel="${debuglevel}" destdir="binutil"
+               <javac encoding="UTF-8" debug="true" debuglevel="${debuglevel}" destdir="binutil"
                        includeantruntime="false" source="${source}" target="${target}">
                        <compilerarg value="-XDignore.symbol.file"/>
                        <src path="util" />
@@ -102,7 +97,7 @@
                </javac>
        </target>
        <target depends="init, build-project" name="build-testing">
-               <javac debug="true" debuglevel="${debuglevel}" destdir="binutil-testing"
+               <javac encoding="UTF-8" debug="true" debuglevel="${debuglevel}" destdir="binutil-testing"
                        includeantruntime="false" source="${source}" target="${target}">
                        <src path="util-testing" />
                        <classpath refid="cacert-gigi.classpath" />
@@ -126,7 +121,7 @@
 
        <target depends="test,native" name="bundle">
                <zip destfile="gigi-linux_amd64.zip" basedir="."
-                       includes="gigi.jar,native/*.so,doc/tableStructure.sql,static/**,templates/**" />
+                       includes="gigi.jar,native/*.so,src/org/cacert/gigi/database/tableStructure.sql,static/**,templates/**" />
        </target>
        <target name="static-bundle">
                <mkdir dir="work"/>
@@ -137,7 +132,7 @@
                <move file="work/static/static/images/cacert4-test.png" tofile="work/static/static/images/cacert4.png"/>
                <delete file="work/static/static/image/cacert4-test.png"/>
                <tar destfile="static.tar.gz" compression="gzip" basedir="work"
-                       includes="../doc/tableStructure.sql,**,templates/**" />
+                       includes="../src/org/cacert/gigi/database/tableStructure.sql,**,templates/**" />
        </target>
 
        <target name="static-bundle-release">
@@ -148,7 +143,7 @@
                </copy>
                <delete file="work/static/static/image/cacert4-test.png"/>
                <tar destfile="static.tar.gz" compression="gzip" basedir="work"
-                       includes="../doc/tableStructure.sql,**,templates/**" />
+                       includes="../src/org/cacert/gigi/database/tableStructure.sql,**,templates/**" />
        </target>
 
        <target name="develop" depends="bundle,static-bundle" />
@@ -157,7 +152,7 @@
 
        <target depends="init,build-testing,update-effective-tlds" name="build-project-test">
                <echo message="${ant.project.name}: ${ant.file}" />
-               <javac debug="true" debuglevel="${debuglevel}" destdir="bintest"
+               <javac encoding="UTF-8" debug="true" debuglevel="${debuglevel}" destdir="bintest"
                        includeantruntime="false" source="${source}" target="${target}">
                        <compilerarg value="-XDignore.symbol.file"/>
                        <src path="tests" />
@@ -193,7 +188,7 @@
                        <classpath refid="cacert-gigi.test.classpath" />
                </java>
        </target>
-       <target name="test" depends="build-project-test,generateKeys,FetchLocales,pack-testing,pack,reset-db">
+       <target name="test" depends="build-project-test,FetchLocales,pack-testing,pack,reset-db">
                <delete failonerror="false">
                        <fileset dir=".">
                                <include name="jacoco.exec"/>
@@ -201,13 +196,14 @@
                        </fileset>
                </delete>
                <mkdir dir="${junit.output.dir}" />
-               <junit fork="yes" printsummary="withOutAndErr">
+               <junit maxmemory="2g" fork="yes" printsummary="withOutAndErr">
                        <jvmarg value="-javaagent:/usr/share/java/jacocoagent.jar=destfile=tester.exec"/>
                        <formatter type="xml" />
                        <batchtest fork="yes" todir="${junit.output.dir}">
                                <fileset dir="tests">
                                        <include name="**/*.java" />
                                        <exclude name="**/testUtils/**" />
+                                       <exclude name="**/com/lambdaworks/crypto/test/CryptoTestUtil.java"/>
                                </fileset>
                        </batchtest>
                        <classpath refid="cacert-gigi.test.classpath" />
@@ -291,7 +287,7 @@
 
                <chmod file="${env.DESTDIR}/usr/bin/gigi" perm="+x"/>
                <mkdir dir="${env.DESTDIR}/usr/share/dbconfig-common/data/${PACKAGE}/install/"/>
-               <copy file="doc/tableStructure.sql" tofile="${env.DESTDIR}/usr/share/dbconfig-common/data/${PACKAGE}/install/mysql.sql"/>
+               <copy file="src/org/cacert/gigi/database/tableStructure.sql" tofile="${env.DESTDIR}/usr/share/dbconfig-common/data/${PACKAGE}/install/mysql.sql"/>
 
                <mkdir dir="${env.DESTDIR}/var/lib/cacert-gigi/doc"/>
                <exec executable="ln">