]> WPIA git - gigi.git/commitdiff
UPD: Split bindirs in buildprocess
authorFelix Dörre <felix@dogcraft.de>
Mon, 22 Sep 2014 19:38:32 +0000 (21:38 +0200)
committerFelix Dörre <felix@dogcraft.de>
Mon, 22 Sep 2014 20:04:14 +0000 (22:04 +0200)
build.xml

index 83c95e10328deb6e9675ae3e31bafad7711278ba..526992260879cb05b95021287ae7e48c71443c0e 100644 (file)
--- a/build.xml
+++ b/build.xml
        </path>
        <path id="cacert-gigi.classpath">
                <pathelement location="bin" />
+               <pathelement location="binutil" />
                <pathelement location="${mysqlconnector}" />
        </path>
        <path id="cacert-gigi.test.classpath">
                <pathelement location="bin" />
+               <pathelement location="binutil" />
                <pathelement location="bintest" />
                <path refid="JUnit 4.libraryclasspath" />
                <pathelement location="${mysqlconnector}" />
        </path>
        <target name="init">
                <mkdir dir="bin" />
+               <mkdir dir="binutil" />
                <mkdir dir="bintest" />
 
                <copy includeemptydirs="false" todir="bin">
                        <src path="lib/jetty" />
                        <src path="lib/jtar" />
                        <src path="src" />
+                       <classpath refid="cacert-gigi.classpath" />
+               </javac>
+               <javac debug="true" debuglevel="${debuglevel}" destdir="binutil"
+                       includeantruntime="false" source="${source}" target="${target}">
+                       <compilerarg value="-XDignore.symbol.file"/>
                        <src path="util" />
                        <classpath refid="cacert-gigi.classpath" />
                </javac>
@@ -90,7 +98,8 @@
        </target>
 
        <target depends="build" name="pack">
-               <jar destfile="gigi.jar" basedir="bin" manifest="Gigi.MF" />
+               <jar destfile="gigi.jar" basedir="bin" manifest="Gigi.MF" update="false"/>
+               <jar destfile="gigi.jar" basedir="bintest" update="on"/>
        </target>
 
        <target depends="test,native" name="bundle">