Fix: give Menu a hash code

[gigi.git] / build.xml

diff --git a/build.xml b/build.xml
index 71a2d37107807b8be6a47584caf22cfb25a79aab..f4876becef126fe58b6bae30c73a2ffd78bcc6eb 100644 (file)
--- a/build.xml
+++ b/build.xml
@@ -41,20 +41,14 @@
                                <exclude name="**/*.launch" />
                                <exclude name="**/*.java" />
                        </fileset>
-               </copy>
-               <copy includeemptydirs="false" todir="bin">
                        <fileset dir="lib/jetty">
                                <exclude name="**/*.launch" />
                                <exclude name="**/*.java" />
                        </fileset>
-               </copy>
-               <copy includeemptydirs="false" todir="bin">
                        <fileset dir="src">
                                <exclude name="**/*.launch" />
                                <exclude name="**/*.java" />
                        </fileset>
-               </copy>
-               <copy includeemptydirs="false" todir="bin">
                        <fileset dir="util">
                                <exclude name="**/*.launch" />
                                <exclude name="**/*.java" />
@@ -91,6 +85,7 @@
                        <src path="lib/servlet-api" />
                        <src path="lib/jetty" />
                        <src path="lib/jtar" />
+                       <src path="lib/scrypt" />
                        <src path="src" />
                        <classpath refid="cacert-gigi.classpath" />
                </javac>
@@ -126,7 +121,7 @@
 
        <target depends="test,native" name="bundle">
                <zip destfile="gigi-linux_amd64.zip" basedir="."
-                       includes="gigi.jar,native/*.so,doc/tableStructure.sql,static/**,templates/**" />
+                       includes="gigi.jar,native/*.so,src/org/cacert/gigi/database/tableStructure.sql,static/**,templates/**" />
        </target>
        <target name="static-bundle">
                <mkdir dir="work"/>
@@ -137,7 +132,7 @@
                <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="../doc/tableStructure.sql,**,templates/**" />
+                       includes="../src/org/cacert/gigi/database/tableStructure.sql,**,templates/**" />
        </target>
 
        <target name="static-bundle-release">
@@ -148,7 +143,7 @@
                </copy>
                <delete file="work/static/static/image/cacert4-test.png"/>
                <tar destfile="static.tar.gz" compression="gzip" basedir="work"
-                       includes="../doc/tableStructure.sql,**,templates/**" />
+                       includes="../src/org/cacert/gigi/database/tableStructure.sql,**,templates/**" />
        </target>
 
        <target name="develop" depends="bundle,static-bundle" />
@@ -208,6 +203,7 @@
                                <fileset dir="tests">
                                        <include name="**/*.java" />
                                        <exclude name="**/testUtils/**" />
+                                       <exclude name="**/com/lambdaworks/crypto/test/CryptoTestUtil.java"/>
                                </fileset>
                        </batchtest>
                        <classpath refid="cacert-gigi.test.classpath" />
@@ -291,7 +287,7 @@
 
                <chmod file="${env.DESTDIR}/usr/bin/gigi" perm="+x"/>
                <mkdir dir="${env.DESTDIR}/usr/share/dbconfig-common/data/${PACKAGE}/install/"/>
-               <copy file="doc/tableStructure.sql" tofile="${env.DESTDIR}/usr/share/dbconfig-common/data/${PACKAGE}/install/mysql.sql"/>
+               <copy file="src/org/cacert/gigi/database/tableStructure.sql" tofile="${env.DESTDIR}/usr/share/dbconfig-common/data/${PACKAGE}/install/mysql.sql"/>
 
                <mkdir dir="${env.DESTDIR}/var/lib/cacert-gigi/doc"/>
                <exec executable="ln">