Merge "upd: remove 'browser install'"

[gigi.git] / build.xml

diff --git a/build.xml b/build.xml
index e9fe6e53aa1280873e6a92404e9f99b0b0577118..f03eca76c781f71abd573cbf1601af4f393197b1 100644 (file)
--- 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" />
@@ -352,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>