X-Git-Url: https://code.wpia.club/?p=gigi.git;a=blobdiff_plain;f=build.xml;h=f03eca76c781f71abd573cbf1601af4f393197b1;hp=6d2587eb9ec0c86a2fa562348841b0050afb177e;hb=HEAD;hpb=780abef46a72c2b43b137cdd1b5c713cde61b0d3

diff --git a/build.xml b/build.xml
index 6d2587eb..f03eca76 100644
--- a/build.xml
+++ b/build.xml
@@ -11,6 +11,7 @@
 	<property name="debuglevel" value="source,lines,vars" />
 	<property name="target" value="1.8" />
 	<property name="source" value="1.8" />
+	<property name="dnsjava" value="/usr/share/java/dnsjava.jar" />
 	<property name="sqlconnector" value="/usr/share/java/postgresql-jdbc4.jar" />
 	<property name="juintexec" value="/usr/share/java" />
 	<path id="JUnit 4.libraryclasspath">
@@ -21,6 +22,7 @@
 		<pathelement location="bin" />
 		<pathelement location="binutil" />
 		<pathelement location="${sqlconnector}" />
+		<pathelement location="${dnsjava}" />
 	</path>
 	<path id="gigi.test.classpath">
 		<pathelement location="bintest" />
@@ -29,6 +31,7 @@
 		<pathelement location="binutil-testing" />
 		<path refid="JUnit 4.libraryclasspath" />
 		<pathelement location="${sqlconnector}" />
+		<pathelement location="${dnsjava}" />
 	</path>
 	<path id="gigi.test.classpath.jdt">
 		<pathelement location="${jdt}" />
@@ -81,9 +84,9 @@
 	<target depends="clean,clean-test" name="cleanall" />
 	<target depends="build-project, build-testing, native" name="build" />
 	<target depends="init" name="build-project">
-		<exec outputproperty="git-version" executable="git">
-			<arg line="rev-parse"/>
-			<arg line="HEAD"/>
+		<exec outputproperty="git-version" executable="sh">
+			<arg value="-c"/>
+			<arg value="git describe HEAD --tags --match &quot;v*&quot; | sed &quot;s/^v//&quot;"/>
 		</exec>
 		<manifest file="Gigi.MF">
 			<attribute name="Main-Class" value="club.wpia.gigi.Launcher" />
@@ -117,7 +120,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 +136,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">
@@ -345,10 +355,6 @@
 	</target>
 	<target name="update-effective-tlds">
 		<mkdir dir="bin/club/wpia/gigi/util"/>
-		<exec executable="wget" dir="bin/club/wpia/gigi/util">
-			<arg value="-N"/>
-			<arg value="-q"/>
-			<arg value="https://publicsuffix.org/list/effective_tld_names.dat"/>
-		</exec>
+		<copy file="/usr/share/publicsuffix/effective_tld_names.dat" tofile="bin/club/wpia/gigi/util/effective_tld_names.dat"/>
 	</target>
 </project>