X-Git-Url: https://code.wpia.club/?a=blobdiff_plain;f=build.xml;h=20c6f496c25d2df87373d4c5c52104d733a49cfb;hb=06fff0058cc341b53a5fd57a0afc8b2c1d906d28;hp=f4876becef126fe58b6bae30c73a2ffd78bcc6eb;hpb=53a66914a544d38be7e626aec2e74542745d4fda;p=gigi.git

diff --git a/build.xml b/build.xml
index f4876bec..20c6f496 100644
--- a/build.xml
+++ b/build.xml
@@ -11,7 +11,7 @@
 	<property name="debuglevel" value="source,lines,vars" />
 	<property name="target" value="1.8" />
 	<property name="source" value="1.8" />
-	<property name="mysqlconnector" value="/usr/share/java/mysql-connector-java.jar" />
+	<property name="sqlconnector" value="/usr/share/java/postgresql-jdbc4.jar" />
 	<property name="juintexec" value="/usr/share/java" />
 	<path id="JUnit 4.libraryclasspath">
 		<pathelement location="${juintexec}/junit4.jar" />
@@ -20,7 +20,7 @@
 	<path id="cacert-gigi.classpath">
 		<pathelement location="bin" />
 		<pathelement location="binutil" />
-		<pathelement location="${mysqlconnector}" />
+		<pathelement location="${sqlconnector}" />
 	</path>
 	<path id="cacert-gigi.test.classpath">
 		<pathelement location="bintest" />
@@ -28,7 +28,7 @@
 		<pathelement location="binutil" />
 		<pathelement location="binutil-testing" />
 		<path refid="JUnit 4.libraryclasspath" />
-		<pathelement location="${mysqlconnector}" />
+		<pathelement location="${sqlconnector}" />
 	</path>
 	<target name="init">
 		<mkdir dir="bin" />
@@ -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,8 +97,9 @@
 		</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}">
+			<compilerarg value="-XDignore.symbol.file"/>
 			<src path="util-testing" />
 			<classpath refid="cacert-gigi.classpath" />
 		</javac>
@@ -152,7 +153,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" />
@@ -160,7 +161,7 @@
 		</javac>
 		<concat destfile="bintest/org/cacert/gigi/util/effective_tld_names.dat">
 			<path path="bin/org/cacert/gigi/util/effective_tld_names.dat"/>
-			<footer>${test_nic}</footer>
+			<path path="publicSuffixFooter.dat"/>
 		</concat>
 	</target>
 	<target name="check-locale">
@@ -188,7 +189,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 +197,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}">
@@ -218,6 +219,8 @@
 		</junitreport>
 	</target>
 	<target name="generatecoco">
+		<delete file="merged.exec"/>
+
 		<jacoco:merge destfile="merged.exec">
 			<fileset dir="." includes="*.exec"/>
 		</jacoco:merge>