Merge changes I86c1045b,I9fc533ac

[gigi.git] / build.xml

diff --git a/build.xml b/build.xml
index c42ec1fc34745185704d313a44def36b341bf51c..e9fe6e53aa1280873e6a92404e9f99b0b0577118 100644 (file)
--- a/build.xml
+++ b/build.xml
@@ -117,7 +117,7 @@
                        <classpath refid="gigi.classpath" />
                </javac>
        </target>
-       <target depends="init, build-project" name="build-testing-l10n">
+       <target depends="init, build-project, reset-db" 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"/>
@@ -133,6 +133,13 @@
                        <classpath refid="gigi.test.classpath" />
                        <classpath refid="gigi.test.classpath.jdt" />
                </java>
+               <java classname="club.wpia.gigi.localisation.TranslationCollector" failonerror="true">
+                       <arg value="util-testing/club/wpia/gigi/localisation/conf.txt"/>
+                       <arg value="."/>
+                       <arg value="SQLValidation"/>
+                       <classpath refid="gigi.test.classpath" />
+                       <classpath refid="gigi.test.classpath.jdt" />
+               </java>
        </target>
 
        <target name="native">
@@ -160,8 +167,6 @@
                <copy todir="work/static">
                        <fileset dir="static"/>
                </copy>
-               <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="../src/club/wpia/gigi/database/tableStructure.sql,**,templates/**" />
        </target>
@@ -172,7 +177,6 @@
                <copy todir="work/static">
                        <fileset dir="static"/>
                </copy>
-               <delete file="work/static/static/image/cacert4-test.png"/>
                <tar destfile="static.tar.gz" compression="gzip" basedir="work"
                        includes="../src/club/wpia/gigi/database/tableStructure.sql,**,templates/**" />
        </target>
@@ -301,7 +305,6 @@
                <copy todir="${env.DESTDIR}/usr/share/wpia-gigi/static">
                        <fileset dir="static" />
                </copy>
-               <delete file="${env.DESTDIR}/usr/share/wpia-gigi/static/static/images/cacert4-test.png" />
                <copy file="gigi.jar" tofile="${env.DESTDIR}/usr/share/java/gigi.jar"/>
        </target>
        <target name="install-testing" depends="install-common">
@@ -309,8 +312,6 @@
                <copy todir="${env.DESTDIR}/usr/share/wpia-gigi/static">
                        <fileset dir="static" />
                </copy>
-               <move file="${env.DESTDIR}/usr/share/wpia-gigi/static/static/images/cacert4-test.png" tofile="${env.DESTDIR}/usr/share/wpia-gigi/static/static/images/cacert4.png" />
-               <delete file="${env.DESTDIR}/usr/share/wpia-gigi/static/static/images/cacert4-test.png" />
                <copy file="gigi-testing.jar" tofile="${env.DESTDIR}/usr/share/java/gigi.jar"/>
        </target>