Merge branch 'fix-signer'

[gigi.git] / build.xml

diff --git a/build.xml b/build.xml
index f4876becef126fe58b6bae30c73a2ffd78bcc6eb..7290ab69cd5023e1a7674972fa0d2fef572ffcc3 100644 (file)
--- a/build.xml
+++ b/build.xml
@@ -79,7 +79,7 @@
        <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" />
@@ -89,7 +89,7 @@
                        <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" />
@@ -97,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" />
@@ -152,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" />
@@ -188,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"/>
@@ -196,7 +196,7 @@
                        </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}">