Updated this files with defaults for debs

[gigi.git] / build.xml

diff --git a/build.xml b/build.xml
index 35973fb1d5969657bae7d695849ba9c3b40318ca..278fca971004e8324b42169f09613b7bda9a7a0c 100644 (file)
--- a/build.xml
+++ b/build.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<project basedir="." default="all" name="cacert-gigi">
+<project basedir="." default="develop" name="cacert-gigi">
        <property environment="env" />
        <property name="junit.output.dir" value="junit" />
        <property name="debuglevel" value="source,lines,vars" />
        <property name="target" value="1.8" />
        <property name="source" value="1.8" />
-       <property name="mysqlconnector" value="mysql-connector-java-5.1.31-bin.jar" />
-       <property name="juintexec" value="." />
+       <property name="mysqlconnector" value="/usr/share/java/mysql-connector-java.jar" />
+       <property name="juintexec" value="/usr/share/java" />
        <path id="JUnit 4.libraryclasspath">
-               <pathelement location="${juintexec}/junit.jar" />
-               <pathelement location="${juintexec}/org.hamcrest.core.jar" />
+               <pathelement location="${juintexec}/junit4.jar" />
+               <pathelement location="${juintexec}/hamcrest-core.jar" />
        </path>
        <path id="cacert-gigi.classpath">
                <pathelement location="bin" />
@@ -59,12 +59,16 @@
        <target name="clean">
                <delete dir="bin" />
        </target>
-       <target depends="clean" name="cleanall" />
+       <target name="clean-test">
+               <delete dir="bintest" />
+       </target>
+       <target depends="clean,clean-test" name="cleanall" />
        <target depends="build-project, native" name="build" />
        <target depends="init" name="build-project">
                <echo message="${ant.project.name}: ${ant.file}" />
                <javac debug="true" debuglevel="${debuglevel}" destdir="bin"
                        includeantruntime="false" source="${source}" target="${target}">
+                       <compilerarg value="-XDignore.symbol.file"/>
                        <src path="lib/servlet-api" />
                        <src path="lib/jetty" />
                        <src path="lib/jtar" />
@@ -87,17 +91,37 @@
                        includes="gigi.jar,native/*.so,doc/tableStructure.sql,static/**,templates/**" />
        </target>
        <target name="static-bundle">
-               <tar destfile="static.tar.gz" compression="gzip" basedir="."
-                       includes="doc/tableStructure.sql,static/**,templates/**" />
+           <mkdir dir="work"/>
+           <mkdir dir="work/static"/>
+           <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="../doc/tableStructure.sql,**,templates/**" />
+       </target>
+       
+       <target name="static-bundle-release">
+               <mkdir dir="work"/>
+           <mkdir dir="work/static"/>
+           <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="../doc/tableStructure.sql,**,templates/**" />
        </target>
 
-       <target name="all" depends="bundle,static-bundle" />
-
+       <target name="develop" depends="bundle,static-bundle" />
 
+       <target name="release" depends="bundle,static-bundle-release" />
+       
        <target depends="init,build-project" name="build-project-test">
                <echo message="${ant.project.name}: ${ant.file}" />
                <javac debug="true" debuglevel="${debuglevel}" destdir="bintest"
                        includeantruntime="false" source="${source}" target="${target}">
+                       <compilerarg value="-XDignore.symbol.file"/>
                        <src path="tests" />
                        <classpath refid="cacert-gigi.test.classpath" />
                </javac>