ADD: Additional target + deffering between develop and release; use

[gigi.git] / build.xml

diff --git a/build.xml b/build.xml
index 057c6881623ea77dfa40d9b2aaee337e07c1066c..458ee4df389285b1d0c7e32c975055dc95677414 100644 (file)
--- a/build.xml
+++ b/build.xml
@@ -1,5 +1,5 @@
 <?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" />
@@ -65,6 +65,7 @@
                <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" />
@@ -75,10 +76,7 @@
        </target>
 
        <target name="native">
-               <exec executable="make" dir="natives">
-                       <arg value="clean" />
-                       <arg value="all" />
-               </exec>
+               <exec executable="make" dir="natives"/>
        </target>
 
        <target depends="build" name="pack">
@@ -90,17 +88,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>