Merge "Suggestions to enhance the SQL call pattern."

[gigi.git] / build.xml

diff --git a/build.xml b/build.xml
index 5d4634d52f5e66e49033d1cc67ecc543ece020ec..be1b127e7613d85bcde19c0b503cb7219d240177 100644 (file)
--- 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,10 @@
                <pathelement location="binutil" />
                <pathelement location="binutil-testing" />
                <path refid="JUnit 4.libraryclasspath" />
-               <pathelement location="${mysqlconnector}" />
+               <pathelement location="${sqlconnector}" />
+       </path>
+       <path id="cacert-gigi.test.classpath.jdt">
+               <pathelement location="${jdt}" />
        </path>
        <target name="init">
                <mkdir dir="bin" />
@@ -99,9 +102,28 @@
        <target depends="init, build-project" name="build-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" />
+                       <exclude name="org/cacert/gigi/localisation/**"/>
+                       <classpath refid="cacert-gigi.classpath" />
+               </javac>
+       </target>
+       <target depends="init, build-project" name="build-testing-l10n">
+               <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" />
+                       <include name="org/cacert/gigi/localisation/**"/>
                        <classpath refid="cacert-gigi.classpath" />
+                       <classpath refid="cacert-gigi.test.classpath.jdt" />
                </javac>
+               <java classname="org.cacert.gigi.localisation.TranslationCollector">
+                       <arg value="util-testing/org/cacert/gigi/localisation/conf.txt"/>
+                       <arg value="."/>
+                       <arg value="messages.po"/>
+                       <classpath refid="cacert-gigi.test.classpath" />
+                       <classpath refid="cacert-gigi.test.classpath.jdt" />
+               </java>
        </target>
 
        <target name="native">
@@ -160,7 +182,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">
@@ -170,6 +192,7 @@
                <java classname="org.cacert.gigi.util.FetchLocales" failonerror="true"
                        fork="yes">
                        <classpath refid="cacert-gigi.classpath" />
+                       <arg value="${localePath}"/>
                </java>
        </target>
        <target name="check-generateKeys">
@@ -188,7 +211,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"/>
@@ -198,6 +221,7 @@
                <mkdir dir="${junit.output.dir}" />
                <junit maxmemory="2g" fork="yes" printsummary="withOutAndErr">
                        <jvmarg value="-javaagent:/usr/share/java/jacocoagent.jar=destfile=tester.exec"/>
+                       <jvmarg value="-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=0.0.0.0:50001"/>
                        <formatter type="xml" />
                        <batchtest fork="yes" todir="${junit.output.dir}">
                                <fileset dir="tests">
@@ -218,6 +242,8 @@
                </junitreport>
        </target>
        <target name="generatecoco">
+               <delete file="merged.exec"/>
+
                <jacoco:merge destfile="merged.exec">
                        <fileset dir="." includes="*.exec"/>
                </jacoco:merge>