Build-file fiddlage. Does not impact functionality.

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

build-installer.xml

@@ -22,4 +22,7 @@
         <echo message="This task only works on linux"/>
     </target>
 
+    <target name="installer" depends="-installer-nobuild, -installer-build"
+            description="Build the installer." />
+
 </project>

build-plugins.xml

@@ -17,7 +17,7 @@
     </taskdef>
     
     
-    <target name="makepluginjar">
+    <target name="-makepluginjar">
         <propertyregex property="pluginjar.name" input="${target.file}" regexp=".*[\\/](.*)$" select="\1.jar" casesensitive="false" />
         <propertyregex property="folder.name" input="${target.file}" regexp=".*${build.classes.dir}/(.*)$" select="\1" casesensitive="false" />
 
@@ -36,18 +36,20 @@
         </if>
     </target>
         
-    <target name="build-plugins" depends="build-plugins_bash, build-plugins_ant-contrib"/>
+    <target name="build-plugins"
+            depends="-build-plugins_bash, -build-plugins_ant-contrib"
+            description="Build all plugins. "/>
     
-    <target name="build-plugins_bash" unless="has.ant-contrib" if="has.bash">
+    <target name="-build-plugins_bash" unless="has.ant-contrib" if="has.bash">
         <exec executable="/bin/bash">
             <arg value="createAllPluginJar.sh"/>
             <arg value="${src.dir}/com/dmdirc/addons/"/>
         </exec>
     </target>
     
-    <target name="build-plugins_ant-contrib" if="has.ant-contrib">
+    <target name="-build-plugins_ant-contrib" if="has.ant-contrib">
         <mkdir dir="plugins/"/>
-        <foreach target="makepluginjar" param="target.file">
+        <foreach target="-makepluginjar" param="target.file">
             <path>
                 <dirset dir="${build.classes.dir}/com/dmdirc/addons/">
                     <include name="**/*"/>

build-reports.xml

@@ -0,0 +1,175 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project name="DMDirc-reports" default="default" basedir=".">
+    <description>Checkstyle, findbugs, CPD and PMD reports</description>
+
+    <target name="doallreports" depends="test-both,-allreports,javadoc"
+            description="Run all reports." />
+    <target name="domostreports" depends="test-both,-mostreports,javadoc"
+            description="Run all reports except Findbugs." />
+
+    <target name="checkstyle" depends="checkstyle-all, checkstyle-actions,
+                                       checkstyle-core,
+                                       checkstyle-commandparser,
+                                       checkstyle-config, checkstyle-logger,
+                                       checkstyle-parser, checkstyle-plugins,
+                                       checkstyle-ui, -remove-xml-files,
+                                       -move-index"
+            description="Run checkstyle." /> 
+
+    <target name="-allreports" depends="findbugs, cpd, pmd, checkstyle" /> 
+    <target name="-mostreports" depends="cpd, pmd, checkstyle" /> 
+    
+    <target name="checkstyle-plugins">
+        <taskdef resource="checkstyletask.properties"
+                         classpath="checkstyle-all-4.3.jar"/>
+        <checkstyle config="checkstyle/dmdirc_checks.xml" failureProperty="checkstyle.failure"
+                                failOnViolation="false">
+            <fileset dir="src/com/dmdirc/plugins/" includes="**/*.java"/>
+            <formatter type="xml" tofile="reports/report-plugins.xml"/>
+            
+        </checkstyle>
+        <xslt in="reports/report-plugins.xml" out="reports/report-plugins.html" style="checkstyle/checkstyle.xsl"/>
+    </target>
+    
+    <target name="checkstyle-actions">
+        <taskdef resource="checkstyletask.properties"
+                         classpath="checkstyle.jar"/>
+        <checkstyle config="checkstyle/dmdirc_checks.xml" failureProperty="checkstyle.failure"
+                                failOnViolation="false">
+            <fileset dir="src/com/dmdirc/actions/" includes="**/*.java"/>
+            <formatter type="xml" tofile="reports/report-actions.xml"/>
+            
+        </checkstyle>
+        <xslt in="reports/report-actions.xml" out="reports/report-actions.html" style="checkstyle/checkstyle.xsl"/>
+    </target>            
+    
+    <target name="checkstyle-ui">
+        <taskdef resource="checkstyletask.properties"
+                         classpath="checkstyle.jar"/>
+        <checkstyle config="checkstyle/dmdirc_checks.xml" failureProperty="checkstyle.failure"
+                                failOnViolation="false">
+            <fileset dir="src/com/dmdirc/ui/" includes="**/*.java"/>
+            <formatter type="xml" tofile="reports/report-ui.xml"/>
+        </checkstyle>
+        
+        <xslt in="reports/report-ui.xml" out="reports/report-ui.html" style="checkstyle/checkstyle.xsl"/>
+    </target>
+    
+    <target name="checkstyle-parser">
+        <taskdef resource="checkstyletask.properties"
+                         classpath="checkstyle.jar"/>
+        <checkstyle config="checkstyle/dmdirc_checks.xml" failureProperty="checkstyle.failure"
+                                failOnViolation="false">
+            <fileset dir="src/com/dmdirc/parser/" includes="**/*.java"/>
+            <formatter type="xml" tofile="reports/report-parser.xml"/>
+        </checkstyle>
+        <xslt in="reports/report-parser.xml" out="reports/report-parser.html" style="checkstyle/checkstyle.xsl"/>
+        
+    </target>
+    
+    <target name="checkstyle-logger">
+        <taskdef resource="checkstyletask.properties"
+                         classpath="checkstyle.jar"/>
+        <checkstyle config="checkstyle/dmdirc_checks.xml" failureProperty="checkstyle.failure"
+                                failOnViolation="false">
+            <fileset dir="src/com/dmdirc/logger/" includes="**/*.java"/>
+            <formatter type="xml" tofile="reports/report-logger.xml"/>
+        </checkstyle>
+        <xslt in="reports/report-logger.xml" out="reports/report-logger.html" style="checkstyle/checkstyle.xsl"/>
+    </target>
+    
+    
+    <target name="checkstyle-config">
+        <taskdef resource="checkstyletask.properties"
+                         classpath="checkstyle.jar"/>
+        <checkstyle config="checkstyle/dmdirc_checks.xml" failureProperty="checkstyle.failure"
+                                failOnViolation="false">
+            <fileset dir="src/com/dmdirc/config/" includes="**/*.java"/>
+            <formatter type="xml" tofile="reports/report-config.xml"/>
+        </checkstyle>
+        <xslt in="reports/report-config.xml" out="reports/report-config.html" style="checkstyle/checkstyle.xsl"/>
+    </target>
+    
+    <target name="checkstyle-commandparser">
+        <taskdef resource="checkstyletask.properties"
+                         classpath="checkstyle.jar"/>
+        <checkstyle config="checkstyle/dmdirc_checks.xml" failureProperty="checkstyle.failure"
+                                failOnViolation="false">
+            <fileset dir="src/com/dmdirc/commandparser/" includes="**/*.java"/>
+            <formatter type="xml" tofile="reports/report-commandparser.xml"/>
+        </checkstyle>
+        <xslt in="reports/report-commandparser.xml" out="reports/report-commandparser.html" style="checkstyle/checkstyle.xsl"/>
+    </target>
+    
+    <target name="checkstyle-core">
+        <taskdef resource="checkstyletask.properties"
+                         classpath="checkstyle.jar"/>
+        
+        <checkstyle config="checkstyle/dmdirc_checks.xml" failureProperty="checkstyle.failure"
+                                failOnViolation="false">
+            <fileset dir="src/com/dmdirc/" includes="*.java"/>
+            <formatter type="xml" tofile="reports/report-core.xml"/>
+        </checkstyle>
+        <xslt in="reports/report-core.xml" out="reports/report-core.html" style="checkstyle/checkstyle.xsl"/>
+    </target>
+    
+    <target name="checkstyle-all">
+        <taskdef resource="checkstyletask.properties"
+                         classpath="checkstyle.jar"/>
+        <checkstyle config="checkstyle/dmdirc_checks.xml" failureProperty="checkstyle.failure"
+                                failOnViolation="false">
+            
+            <fileset dir="src/com/dmdirc/" includes="**/*.java"/>
+            <formatter type="xml" tofile="reports/report-all.xml"/>
+        </checkstyle>
+        <xslt in="reports/report-all.xml" out="reports/report-all.html" style="checkstyle/checkstyle.xsl"/>
+    </target>
+    
+    <target name="-remove-xml-files">
+        <delete>
+            <fileset dir="reports/" includes="*.xml"/>
+        </delete>
+    </target>
+
+    <target name="-move-index">
+        <!-- <copy file="checkstyle/index.html" tofile="reports/index.html"/> -->
+        <copy file="checkstyle/sorttable.js" tofile="reports/sorttable.js"/>
+    </target>
+    
+    <target name="pmd" description="Run PMD.">
+        <taskdef name="pmd" classpath="pmd-3.9.jar" 
+                         classname="net.sourceforge.pmd.ant.PMDTask" />
+        <pmd shortFilenames="true">
+            
+            <ruleset>checkstyle/pmd_checks.xml</ruleset>
+            <formatter type="xml" toFile="reports/report-pmd.xml" linkPrefix="http://pmd.sourceforge.net/xref/"/>
+            <fileset dir="src/com/" includes="**/*.java" />
+        </pmd>
+        <xslt in="reports/report-pmd.xml" style="checkstyle/pmd.xslt" out="reports/report-pmd.html" />
+    </target>
+    
+    <target name="cpd" description="Run CPD.">
+        <taskdef name="cpd" classpath="pmd-3.9.jar" classname="net.sourceforge.pmd.cpd.CPDTask" />
+        
+        <cpd format="xml" minimumTokenCount="50" outputFile="reports/report-cpd.xml">
+            <fileset dir="src/com/">
+                <include name="**/*.java"/>
+            </fileset>
+        </cpd>
+        <xslt in="reports/report-cpd.xml" style="checkstyle/cpd.xslt" out="reports/report-cpd.html" />
+    </target>
+    
+    <target name="findbugs" depends="jar" description="Run Findbugs.">
+        <mkdir dir="reports/findbugs" />
+        <taskdef name="findbugs" classpath="findbugs-ant.jar"
+                         classname="edu.umd.cs.findbugs.anttask.FindBugsTask" />
+        <findbugs home="/usr/share/java/findbugs/" effort="max"
+                            jvmargs="-Xmx512M"
+                            output="xml:withMessages"
+                             outputFile="reports/findbugs/report-fb.xml" reportLevel="low">
+            <sourcePath path="src/" />
+            <class location="dist/DMDirc.jar" />
+        </findbugs>
+        <xslt in="reports/findbugs/report-fb.xml" style="checkstyle/findbugs.xslt" out="reports/report-fb.html" />
+    </target>
+</project>

build-svn.xml

@@ -6,32 +6,32 @@
         This will revert the svn revision in Main.java to prevent commiting the
         change everyt time someone builds and causing conflicts.
       -->
-    <target name="unsvn" depends="unsvn_nobash, unsvn_bash"/>
+    <target name="-unsvn" depends="-unsvn_nobash, -unsvn_bash"/>
 
-    <target name="unsvn_bash" if="has.bash">
+    <target name="-unsvn_bash" if="has.bash">
         <exec executable="/bin/bash">
             <arg value="AddSVN.sh"/>
             <arg value="--post"/>
         </exec>
     </target>
 
-    <target name="unsvn_nobash" unless="has.bash">
+    <target name="-unsvn_nobash" unless="has.bash">
         <echo message="This task only works on linux"/>
     </target>
 
     <!--
         This will add the svn revision to Main.java
       -->
-    <target name="addsvn" depends="addsvn_nobash, addsvn_bash"/>
+    <target name="-addsvn" depends="-addsvn_nobash, -addsvn_bash"/>
 
-    <target name="addsvn_bash" if="has.bash">
+    <target name="-addsvn_bash" if="has.bash">
         <exec executable="/bin/bash">
             <arg value="AddSVN.sh"/>
             <arg value="--pre"/>
         </exec>
     </target>
 
-    <target name="addsvn_nobash" unless="has.bash">
+    <target name="-addsvn_nobash" unless="has.bash">
         <echo message="This task only works on linux"/>
     </target>
 

build-tests.xml

@@ -6,7 +6,8 @@
     <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">
+    <target name="with.clover" depends="clean" if="clover.installed"
+            description="Set up Clover to instrument tests.">
         <clover-clean/>
         <clover-setup>
             <fileset dir="src/com/" includes="**/*.java" />
@@ -17,14 +18,16 @@
         </clover-setup>
     </target>
 
-    <target name="clover.xml" if="clover.installed">
+    <target name="clover.xml" if="clover.installed"
+            description="Generate a Clover XML report.">
         <mkdir dir="reports/clover" />
         <clover-report>
             <current outfile="reports/clover/clover.xml"/>
         </clover-report>
     </target>
 
-    <target name="clover.html" if="clover.installed">
+    <target name="clover.html" if="clover.installed"
+            description="Generate a Clover HTML report.">
         <mkdir dir="reports/clover" />
         <mkdir dir="reports/clover/history" />
         <clover-historypoint historydir="reports/clover/history" />
@@ -48,4 +51,11 @@
         </junitreport>
     </target>
 
+    <target name="test-html" depends="with.clover,compile-test,test,clover.html"
+            description="Run tests and generate a Clover HTML report."/>
+    <target name="test-xml" depends="with.clover,compile-test,test,clover.xml"
+            description="Run tests and generate a Clover XML report."/>
+    <target name="test-both" depends="test-html,test-xml"
+            description="Run tests and generate Clover XML and HTML reports."/>
+
 </project>

build.xml

@@ -7,17 +7,12 @@
     <import file="nbproject/build-impl.xml"/>
     <import file="build-installer.xml"/>
     <import file="build-plugins.xml"/>
+    <import file="build-reports.xml"/>
     <import file="build-svn.xml"/>
     <import file="build-tests.xml"/>
 
-    <target name="installer" depends="-installer-nobuild, -installer-build"/>
-    
-    <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-compile" depends="-unsvn, build-plugins"/>
+    <target name="-pre-compile" depends="-addsvn"/>
     <target name="-post-test-run" depends="-do-test-reports"/>
 
 </project>

checkstyle/build.xml

@@ -1,180 +1,180 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project name="DMDirc" default="default" basedir=".">
-	<description>Builds, tests, and runs the project DMDirc.</description>
-	<import file="nbproject/build-impl.xml"/>    
-	<target name="checkstyle" depends=" 
-					checkstyle-all, 
-					checkstyle-actions,
-					checkstyle-core,
-					checkstyle-commandparser,
-					checkstyle-config,
-					checkstyle-logger,
-					checkstyle-parser,
-					checkstyle-plugins,
-					checkstyle-ui,
-					remove-xml-files, move-index" /> 
-	<target name="allreports" depends=" 
-					findbugs, 
-					cpd, 
-					pmd,
-					checkstyle" /> 
-	<target name="mostreports" depends=" 
-					cpd,
-					pmd,
-					checkstyle" /> 
-	
-	<target name="checkstyle-plugins">
-		<taskdef resource="checkstyletask.properties"
-						 classpath="checkstyle-all-4.3.jar"/>
-		<checkstyle config="checkstyle/dmdirc_checks.xml" failureProperty="checkstyle.failure"
-								failOnViolation="false">
-			<fileset dir="src/com/dmdirc/plugins/" includes="**/*.java"/>
-			<formatter type="xml" tofile="reports/report-plugins.xml"/>
-			
-		</checkstyle>
-		<xslt in="reports/report-plugins.xml" out="reports/report-plugins.html" style="checkstyle/checkstyle.xsl"/>
-	</target>
-	
-	<target name="checkstyle-actions">
-		<taskdef resource="checkstyletask.properties"
-						 classpath="checkstyle.jar"/>
-		<checkstyle config="checkstyle/dmdirc_checks.xml" failureProperty="checkstyle.failure"
-								failOnViolation="false">
-			<fileset dir="src/com/dmdirc/actions/" includes="**/*.java"/>
-			<formatter type="xml" tofile="reports/report-actions.xml"/>
-			
-		</checkstyle>
-		<xslt in="reports/report-actions.xml" out="reports/report-actions.html" style="checkstyle/checkstyle.xsl"/>
-	</target>            
-	
-	<target name="checkstyle-ui">
-		<taskdef resource="checkstyletask.properties"
-						 classpath="checkstyle.jar"/>
-		<checkstyle config="checkstyle/dmdirc_checks.xml" failureProperty="checkstyle.failure"
-								failOnViolation="false">
-			<fileset dir="src/com/dmdirc/ui/" includes="**/*.java"/>
-			<formatter type="xml" tofile="reports/report-ui.xml"/>
-		</checkstyle>
-		
-		<xslt in="reports/report-ui.xml" out="reports/report-ui.html" style="checkstyle/checkstyle.xsl"/>
-	</target>
-	
-	<target name="checkstyle-parser">
-		<taskdef resource="checkstyletask.properties"
-						 classpath="checkstyle.jar"/>
-		<checkstyle config="checkstyle/dmdirc_checks.xml" failureProperty="checkstyle.failure"
-								failOnViolation="false">
-			<fileset dir="src/com/dmdirc/parser/" includes="**/*.java"/>
-			<formatter type="xml" tofile="reports/report-parser.xml"/>
-		</checkstyle>
-		<xslt in="reports/report-parser.xml" out="reports/report-parser.html" style="checkstyle/checkstyle.xsl"/>
-		
-	</target>
-	
-	<target name="checkstyle-logger">
-		<taskdef resource="checkstyletask.properties"
-						 classpath="checkstyle.jar"/>
-		<checkstyle config="checkstyle/dmdirc_checks.xml" failureProperty="checkstyle.failure"
-								failOnViolation="false">
-			<fileset dir="src/com/dmdirc/logger/" includes="**/*.java"/>
-			<formatter type="xml" tofile="reports/report-logger.xml"/>
-		</checkstyle>
-		<xslt in="reports/report-logger.xml" out="reports/report-logger.html" style="checkstyle/checkstyle.xsl"/>
-	</target>
-	
-	
-	<target name="checkstyle-config">
-		<taskdef resource="checkstyletask.properties"
-						 classpath="checkstyle.jar"/>
-		<checkstyle config="checkstyle/dmdirc_checks.xml" failureProperty="checkstyle.failure"
-								failOnViolation="false">
-			<fileset dir="src/com/dmdirc/config/" includes="**/*.java"/>
-			<formatter type="xml" tofile="reports/report-config.xml"/>
-		</checkstyle>
-		<xslt in="reports/report-config.xml" out="reports/report-config.html" style="checkstyle/checkstyle.xsl"/>
-	</target>
-	
-	<target name="checkstyle-commandparser">
-		
-		<taskdef resource="checkstyletask.properties"
-						 classpath="checkstyle.jar"/>
-		<checkstyle config="checkstyle/dmdirc_checks.xml" failureProperty="checkstyle.failure"
-								failOnViolation="false">
-			<fileset dir="src/com/dmdirc/commandparser/" includes="**/*.java"/>
-			<formatter type="xml" tofile="reports/report-commandparser.xml"/>
-		</checkstyle>
-		<xslt in="reports/report-commandparser.xml" out="reports/report-commandparser.html" style="checkstyle/checkstyle.xsl"/>
-	</target>
-	
-	<target name="checkstyle-core">
-		<taskdef resource="checkstyletask.properties"
-						 classpath="checkstyle.jar"/>
-		
-		<checkstyle config="checkstyle/dmdirc_checks.xml" failureProperty="checkstyle.failure"
-								failOnViolation="false">
-			<fileset dir="src/com/dmdirc/" includes="*.java"/>
-			<formatter type="xml" tofile="reports/report-core.xml"/>
-		</checkstyle>
-		<xslt in="reports/report-core.xml" out="reports/report-core.html" style="checkstyle/checkstyle.xsl"/>
-	</target>
-	
-	<target name="checkstyle-all">
-		<taskdef resource="checkstyletask.properties"
-						 classpath="checkstyle.jar"/>
-		<checkstyle config="checkstyle/dmdirc_checks.xml" failureProperty="checkstyle.failure"
-								failOnViolation="false">
-			
-			<fileset dir="src/com/dmdirc/" includes="**/*.java"/>
-			<formatter type="xml" tofile="reports/report-all.xml"/>
-		</checkstyle>
-		<xslt in="reports/report-all.xml" out="reports/report-all.html" style="checkstyle/checkstyle.xsl"/>
-	</target>
-	
-	<target name="remove-xml-files">
-		<delete>
-			<fileset dir="reports/" includes="*.xml"/>
-		</delete>
-		
-	</target>
-	<target name="move-index">
-		<!-- <copy file="checkstyle/index.html" tofile="reports/index.html"/> -->
-		<copy file="checkstyle/sorttable.js" tofile="reports/sorttable.js"/>
-	</target>
-	
-	<target name="pmd">
-		<taskdef name="pmd" classpath="pmd-3.9.jar" 
-						 classname="net.sourceforge.pmd.ant.PMDTask" />
-		<pmd shortFilenames="true">
-			
-			<ruleset>checkstyle/pmd_checks.xml</ruleset>
-			<formatter type="xml" toFile="reports/report-pmd.xml" linkPrefix="http://pmd.sourceforge.net/xref/"/>
-			<fileset dir="src/com/" includes="**/*.java" />
-		</pmd>
-		<xslt in="reports/report-pmd.xml" style="checkstyle/pmd.xslt" out="reports/report-pmd.html" />
-	</target>
-	
-	<target name="cpd">
-		<taskdef name="cpd" classpath="pmd-3.9.jar" classname="net.sourceforge.pmd.cpd.CPDTask" />
-		
-		<cpd format="xml" minimumTokenCount="50" outputFile="reports/report-cpd.xml">
-			<fileset dir="src/com/">
-				<include name="**/*.java"/>
-			</fileset>
-		</cpd>
-		<xslt in="reports/report-cpd.xml" style="checkstyle/cpd.xslt" out="reports/report-cpd.html" />
-	</target>
-	
-	<target name="findbugs" depends="jar">
-		<mkdir dir="reports/findbugs" />
-		<taskdef name="findbugs" classpath="findbugs-ant.jar"
-						 classname="edu.umd.cs.findbugs.anttask.FindBugsTask" />
-		<findbugs home="/usr/share/java/findbugs/" effort="max"
-							jvmargs="-Xmx512M"
-							output="xml:withMessages"
-							 outputFile="reports/findbugs/report-fb.xml" reportLevel="low">
-			<sourcePath path="src/" />
-			<class location="dist/DMDirc.jar" />
-		</findbugs>
-		<xslt in="reports/findbugs/report-fb.xml" style="checkstyle/findbugs.xslt" out="reports/report-fb.html" />
-	</target>
+    <!--
+
+    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>
+    <import file="nbproject/build-impl.xml"/>    
+    <target name="checkstyle" depends=" 
+                    checkstyle-all, 
+                    checkstyle-actions,
+                    checkstyle-core,
+                    checkstyle-commandparser,
+                    checkstyle-config,
+                    checkstyle-logger,
+                    checkstyle-parser,
+                    checkstyle-plugins,
+                    checkstyle-ui,
+                    remove-xml-files, move-index" /> 
+    <target name="allreports" depends="findbugs, cpd, pmd, checkstyle" /> 
+    <target name="mostreports" depends="cpd, pmd, checkstyle" /> 
+    
+    <target name="checkstyle-plugins">
+        <taskdef resource="checkstyletask.properties"
+                         classpath="checkstyle-all-4.3.jar"/>
+        <checkstyle config="checkstyle/dmdirc_checks.xml" failureProperty="checkstyle.failure"
+                                failOnViolation="false">
+            <fileset dir="src/com/dmdirc/plugins/" includes="**/*.java"/>
+            <formatter type="xml" tofile="reports/report-plugins.xml"/>
+            
+        </checkstyle>
+        <xslt in="reports/report-plugins.xml" out="reports/report-plugins.html" style="checkstyle/checkstyle.xsl"/>
+    </target>
+    
+    <target name="checkstyle-actions">
+        <taskdef resource="checkstyletask.properties"
+                         classpath="checkstyle.jar"/>
+        <checkstyle config="checkstyle/dmdirc_checks.xml" failureProperty="checkstyle.failure"
+                                failOnViolation="false">
+            <fileset dir="src/com/dmdirc/actions/" includes="**/*.java"/>
+            <formatter type="xml" tofile="reports/report-actions.xml"/>
+            
+        </checkstyle>
+        <xslt in="reports/report-actions.xml" out="reports/report-actions.html" style="checkstyle/checkstyle.xsl"/>
+    </target>            
+    
+    <target name="checkstyle-ui">
+        <taskdef resource="checkstyletask.properties"
+                         classpath="checkstyle.jar"/>
+        <checkstyle config="checkstyle/dmdirc_checks.xml" failureProperty="checkstyle.failure"
+                                failOnViolation="false">
+            <fileset dir="src/com/dmdirc/ui/" includes="**/*.java"/>
+            <formatter type="xml" tofile="reports/report-ui.xml"/>
+        </checkstyle>
+        
+        <xslt in="reports/report-ui.xml" out="reports/report-ui.html" style="checkstyle/checkstyle.xsl"/>
+    </target>
+    
+    <target name="checkstyle-parser">
+        <taskdef resource="checkstyletask.properties"
+                         classpath="checkstyle.jar"/>
+        <checkstyle config="checkstyle/dmdirc_checks.xml" failureProperty="checkstyle.failure"
+                                failOnViolation="false">
+            <fileset dir="src/com/dmdirc/parser/" includes="**/*.java"/>
+            <formatter type="xml" tofile="reports/report-parser.xml"/>
+        </checkstyle>
+        <xslt in="reports/report-parser.xml" out="reports/report-parser.html" style="checkstyle/checkstyle.xsl"/>
+        
+    </target>
+    
+    <target name="checkstyle-logger">
+        <taskdef resource="checkstyletask.properties"
+                         classpath="checkstyle.jar"/>
+        <checkstyle config="checkstyle/dmdirc_checks.xml" failureProperty="checkstyle.failure"
+                                failOnViolation="false">
+            <fileset dir="src/com/dmdirc/logger/" includes="**/*.java"/>
+            <formatter type="xml" tofile="reports/report-logger.xml"/>
+        </checkstyle>
+        <xslt in="reports/report-logger.xml" out="reports/report-logger.html" style="checkstyle/checkstyle.xsl"/>
+    </target>
+    
+    
+    <target name="checkstyle-config">
+        <taskdef resource="checkstyletask.properties"
+                         classpath="checkstyle.jar"/>
+        <checkstyle config="checkstyle/dmdirc_checks.xml" failureProperty="checkstyle.failure"
+                                failOnViolation="false">
+            <fileset dir="src/com/dmdirc/config/" includes="**/*.java"/>
+            <formatter type="xml" tofile="reports/report-config.xml"/>
+        </checkstyle>
+        <xslt in="reports/report-config.xml" out="reports/report-config.html" style="checkstyle/checkstyle.xsl"/>
+    </target>
+    
+    <target name="checkstyle-commandparser">
+        
+        <taskdef resource="checkstyletask.properties"
+                         classpath="checkstyle.jar"/>
+        <checkstyle config="checkstyle/dmdirc_checks.xml" failureProperty="checkstyle.failure"
+                                failOnViolation="false">
+            <fileset dir="src/com/dmdirc/commandparser/" includes="**/*.java"/>
+            <formatter type="xml" tofile="reports/report-commandparser.xml"/>
+        </checkstyle>
+        <xslt in="reports/report-commandparser.xml" out="reports/report-commandparser.html" style="checkstyle/checkstyle.xsl"/>
+    </target>
+    
+    <target name="checkstyle-core">
+        <taskdef resource="checkstyletask.properties"
+                         classpath="checkstyle.jar"/>
+        
+        <checkstyle config="checkstyle/dmdirc_checks.xml" failureProperty="checkstyle.failure"
+                                failOnViolation="false">
+            <fileset dir="src/com/dmdirc/" includes="*.java"/>
+            <formatter type="xml" tofile="reports/report-core.xml"/>
+        </checkstyle>
+        <xslt in="reports/report-core.xml" out="reports/report-core.html" style="checkstyle/checkstyle.xsl"/>
+    </target>
+    
+    <target name="checkstyle-all">
+        <taskdef resource="checkstyletask.properties"
+                         classpath="checkstyle.jar"/>
+        <checkstyle config="checkstyle/dmdirc_checks.xml" failureProperty="checkstyle.failure"
+                                failOnViolation="false">
+            
+            <fileset dir="src/com/dmdirc/" includes="**/*.java"/>
+            <formatter type="xml" tofile="reports/report-all.xml"/>
+        </checkstyle>
+        <xslt in="reports/report-all.xml" out="reports/report-all.html" style="checkstyle/checkstyle.xsl"/>
+    </target>
+    
+    <target name="remove-xml-files">
+        <delete>
+            <fileset dir="reports/" includes="*.xml"/>
+        </delete>
+        
+    </target>
+    <target name="move-index">
+        <!-- <copy file="checkstyle/index.html" tofile="reports/index.html"/> -->
+        <copy file="checkstyle/sorttable.js" tofile="reports/sorttable.js"/>
+    </target>
+    
+    <target name="pmd">
+        <taskdef name="pmd" classpath="pmd-3.9.jar" 
+                         classname="net.sourceforge.pmd.ant.PMDTask" />
+        <pmd shortFilenames="true">
+            
+            <ruleset>checkstyle/pmd_checks.xml</ruleset>
+            <formatter type="xml" toFile="reports/report-pmd.xml" linkPrefix="http://pmd.sourceforge.net/xref/"/>
+            <fileset dir="src/com/" includes="**/*.java" />
+        </pmd>
+        <xslt in="reports/report-pmd.xml" style="checkstyle/pmd.xslt" out="reports/report-pmd.html" />
+    </target>
+    
+    <target name="cpd">
+        <taskdef name="cpd" classpath="pmd-3.9.jar" classname="net.sourceforge.pmd.cpd.CPDTask" />
+        
+        <cpd format="xml" minimumTokenCount="50" outputFile="reports/report-cpd.xml">
+            <fileset dir="src/com/">
+                <include name="**/*.java"/>
+            </fileset>
+        </cpd>
+        <xslt in="reports/report-cpd.xml" style="checkstyle/cpd.xslt" out="reports/report-cpd.html" />
+    </target>
+    
+    <target name="findbugs" depends="jar">
+        <mkdir dir="reports/findbugs" />
+        <taskdef name="findbugs" classpath="findbugs-ant.jar"
+                         classname="edu.umd.cs.findbugs.anttask.FindBugsTask" />
+        <findbugs home="/usr/share/java/findbugs/" effort="max"
+                            jvmargs="-Xmx512M"
+                            output="xml:withMessages"
+                             outputFile="reports/findbugs/report-fb.xml" reportLevel="low">
+            <sourcePath path="src/" />
+            <class location="dist/DMDirc.jar" />
+        </findbugs>
+        <xslt in="reports/findbugs/report-fb.xml" style="checkstyle/findbugs.xslt" out="reports/report-fb.html" />
+    </target>
 </project>

doreports.xml

@@ -1,5 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <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>
     <import file="junitreport.xml" />
     <import file="style_build.xml" />