Fixed report generation on webserver

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

DoReports.sh

@@ -13,5 +13,11 @@ SVN="/usr/bin/svn"
 /bin/sh $MYDIR/oblong.sh "Reports" "Style Report Generation Started";
 cd $MYDIR
 $SVN update
-$ANT -k -buildfile $MYDIR/doreports.xml reports
+if [ "$1" = "--all" ]; then
+	$ANT -k -buildfile $MYDIR/doreports.xml allreports
+elif [ "$1" = "--findbugs" ]; then
+	$ANT -k -buildfile $MYDIR/doreports.xml findbugs
+else
+	$ANT -k -buildfile $MYDIR/doreports.xml mostreports
+fi
 /bin/sh $MYDIR/oblong.sh "Reports" "Report Generation Complete"

checkstyle/build.xml

@@ -1,161 +1,179 @@
 <?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=" 
-            findbugs, 
-	    cpd, 
-            pmd,
-	    checkstyle-all, 
-            checkstyle-actions,
-	    checkstyle-core,
-	    checkstyle-commandparser,
-	    checkstyle-identities,
-	    checkstyle-logger,
-	    checkstyle-parser,
-            checkstyle-plugins,
-	    checkstyle-ui,
-	    remove-xml-files, move-index" /> 
-
-    <target name="checkstyle-plugins">
-            <taskdef resource="checkstyletask.properties"
-                     classpath="checkstyle.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-identities">
-	    <taskdef resource="checkstyletask.properties"
-		     classpath="checkstyle.jar"/>
-	    <checkstyle config="checkstyle/dmdirc_checks.xml" failureProperty="checkstyle.failure"
-			failOnViolation="false">
-		    <fileset dir="src/com/dmdirc/identities/" includes="**/*.java"/>
-		    <formatter type="xml" tofile="reports/report-identities.xml"/>
-	    </checkstyle>
-	    <xslt in="reports/report-identities.xml" out="reports/report-identities.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/" 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/" 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/">
-			<include name="**/*.java"/>
-		</fileset>
-        </cpd>
-	<xslt in="reports/report-cpd.xml" style="checkstyle/cpd.xslt" out="reports/report-cpd.html" />
-    </target>
-
-    <target name="findbugs">
-        <taskdef name="findbugs" classpath="findbugs-ant.jar"
-                classname="edu.umd.cs.findbugs.anttask.FindBugsTask" />
-        <findbugs home="checkstyle/findbugs/" effort="max"
-                output="xml:withMessages"
-                outputFile="reports/report-fb.xml" >
-            <sourcePath path="src/" />
-            <class location="dist/DMDirc.jar" />
-        </findbugs>
-        <xslt in="reports/report-fb.xml" style="checkstyle/findbugs.xslt" out="reports/report-fb.html" />
-    </target>
+	<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-identities,
+					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-identities">
+		<taskdef resource="checkstyletask.properties"
+						 classpath="checkstyle.jar"/>
+		<checkstyle config="checkstyle/dmdirc_checks.xml" failureProperty="checkstyle.failure"
+								failOnViolation="false">
+			<fileset dir="src/com/dmdirc/identities/" includes="**/*.java"/>
+			<formatter type="xml" tofile="reports/report-identities.xml"/>
+		</checkstyle>
+		<xslt in="reports/report-identities.xml" out="reports/report-identities.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/" 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/" 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/">
+				<include name="**/*.java"/>
+			</fileset>
+		</cpd>
+		<xslt in="reports/report-cpd.xml" style="checkstyle/cpd.xslt" out="reports/report-cpd.html" />
+	</target>
+	
+	<target name="findbugs">
+		
+		<taskdef name="findbugs" classpath="findbugs-ant.jar"
+						 classname="edu.umd.cs.findbugs.anttask.FindBugsTask" />
+		<findbugs home="/usr/share/java/findbugs/" effort="max"
+							output="xml:withMessages"
+							outputFile="reports/report-fb.xml" >
+			<sourcePath path="src/" />
+			<class location="dist/DMDirc.jar" />
+		</findbugs>
+		<xslt in="reports/report-fb.xml" style="checkstyle/findbugs.xslt" out="reports/report-fb.html" />
+	</target>
 </project>