add: api for Test-memberid-lookup (addresses #4)

[gigi.git] / build.xml

diff --git a/build.xml b/build.xml
index 4e94aa3448555bb1ff5c86c6e4efbfb59571a8c5..20c6f496c25d2df87373d4c5c52104d733a49cfb 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,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" />
@@ -161,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">
@@ -219,6 +219,8 @@
                </junitreport>
        </target>
        <target name="generatecoco">
+               <delete file="merged.exec"/>
+
                <jacoco:merge destfile="merged.exec">
                        <fileset dir="." includes="*.exec"/>
                </jacoco:merge>