More build file jiggery pokery. Does not impact functionality.

git-svn-id: http://svn.dmdirc.com/trunk@4587 00569f92-eb28-0410-84fd-f71c24880f

build-installer.xml

@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project name="DMDirc-installer" default="default" basedir=".">
+    <description>Tasks to build the DMDirc installer.</description>
+
+    <target name="-installer-build" if="has.bash">
+        <exec executable="/bin/bash" dir="installer" resultproperty="installer.result">
+            <arg value="release.sh"/>
+            <arg value="this"/>
+        </exec>
+
+        <condition property="installer.success">
+            <equals arg1="${installer.result}" arg2="0" />
+        </condition>
+
+        <echo message="Installer build finished."/>
+        <echo message="Completed build files can be found in:"/>
+        <echo message="    ${installer.output.dir}"/>
+        <echo message=""/>
+    </target>
+    
+    <target name="-installer-nobuild" unless="has.bash">
+        <echo message="This task only works on linux"/>
+    </target>
+
+</project>

build-plugins.xml

@@ -38,8 +38,6 @@
         
     <target name="build-plugins" depends="build-plugins_bash, build-plugins_ant-contrib"/>
     
-    <available file="/bin/bash" property="has.bash"/>    
-
     <target name="build-plugins_bash" unless="has.ant-contrib" if="has.bash">
         <exec executable="/bin/bash">
             <arg value="createAllPluginJar.sh"/>

build-tests.xml

@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project name="DMDirc-tests" default="default" basedir=".">
+    <description>Test-related tasks for DMDirc.</description>
+
+    <property name="clover.jar" location="/home/dmdirc/clover/clover/lib/clover.jar"/>
+    <taskdef resource="cloverlib.xml" classpath="${clover.jar}"/>
+    <available property="clover.installed" classname="com.cenqua.clover.CloverInstr" />
+
+    <target name="with.clover" depends="clean" if="clover.installed">
+        <clover-clean/>
+        <clover-setup>
+            <fileset dir="src/com/" includes="**/*.java" />
+            <fileset dir="test/com/">
+                <include name="**/*.java" />
+                <exclude name="**/harness/**/*.java" />
+            </fileset>
+        </clover-setup>
+    </target>
+
+    <target name="clover.xml" if="clover.installed">
+        <mkdir dir="reports/clover" />
+        <clover-report>
+            <current outfile="reports/clover/clover.xml"/>
+        </clover-report>
+    </target>
+
+    <target name="clover.html" if="clover.installed">
+        <mkdir dir="reports/clover" />
+        <mkdir dir="reports/clover/history" />
+        <clover-historypoint historydir="reports/clover/history" />
+        <clover-report>
+            <current outfile="reports/clover">
+                <format type="html"/>
+             </current>
+             <historical outfile="reports/clover" historydir="reports/clover/history" />
+        </clover-report>
+    </target>
+
+    <property name="test.reports" value="./junitreports" />
+
+    <target name="-do-test-reports">
+        <mkdir dir="${test.reports}" />
+        <junitreport todir="${test.reports}">
+            <fileset dir="${build.test.results.dir}">
+                <include name="TEST-*.xml" />
+            </fileset>
+            <report todir="${test.reports}" />
+        </junitreport>
+    </target>
+
+</project>

build.xml

@@ -2,33 +2,22 @@
 <project name="DMDirc" default="default" basedir=".">
     <description>Builds, tests, and runs the project DMDirc.</description>
 
+    <available file="/bin/bash" property="has.bash"/>
+
     <import file="nbproject/build-impl.xml"/>
+    <import file="build-installer.xml"/>
     <import file="build-plugins.xml"/>
     <import file="build-svn.xml"/>
+    <import file="build-tests.xml"/>
 
     <target name="installer" depends="-installer-nobuild, -installer-build"/>
     
-    <target name="-installer-build" if="has.bash">
-        <exec executable="/bin/bash" dir="installer" resultproperty="installer.result">
-            <arg value="release.sh"/>
-            <arg value="this"/>
-        </exec>
-
-        <condition property="installer.success">
-            <equals arg1="${installer.result}" arg2="0" />
-        </condition>
-
-        <echo message="Installer build finished."/>
-        <echo message="Completed build files can be found in:"/>
-        <echo message="    ${installer.output.dir}"/>
-        <echo message=""/>
-    </target>
-    
-    <target name="-installer-nobuild" unless="has.bash">
-        <echo message="This task only works on linux"/>
-    </target>
-
     <target name="-post-compile" depends="unsvn, build-plugins"/>
     <target name="-pre-compile" depends="addsvn"/>
 
+    <target name="test-html" depends="with.clover,compile-test,test,clover.html"/>
+    <target name="test-xml" depends="with.clover,compile-test,test,clover.xml"/>
+    <target name="test-both" depends="test-html,test-xml"/>
+    <target name="-post-test-run" depends="-do-test-reports"/>
+
 </project>

junitreport.xml

@@ -1,8 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- You may freely edit this file. See commented blocks below for -->
-<!-- some examples of how to customize the build. -->
-<!-- (If you delete it and reopen the project it will be recreated.) -->
 <project name="DMDirc" default="default" basedir=".">
+    <!--
+
+    THIS FILE IS DEPRECATED. THE TASKS HAVE BEEN INTEGRATED INTO THE MAIN
+    DMDIRC BUILD FILE. IT WILL BE REMOVED IN THE FUTURE. STOP USING IT.
+
+    -->
+
     <description>Builds, tests, and runs the project DMDirc.</description>
 
     <property name="clover.jar" location="/home/dmdirc/clover/clover/lib/clover.jar"/>