X-Git-Url: https://code.wpia.club/?p=gigi.git;a=blobdiff_plain;f=build.xml;h=5d4634d52f5e66e49033d1cc67ecc543ece020ec;hp=7a6cc5a050a94a9435c2d0f845ee36e98324d5dd;hb=ec24cf6925bb3729a644580ad4a9375d05883c62;hpb=619c91d5d17b0a467c252198d42bf53e71b6522f

diff --git a/build.xml b/build.xml
index 7a6cc5a0..5d4634d5 100644
--- 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" />
@@ -121,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"/>
@@ -132,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">
@@ -143,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" />
@@ -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" />
@@ -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}">
@@ -287,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">