[Squirrel-sql-commits] sql12/build build.xml,1.73,1.74

[Rob M. <man...@us...>]

Update of /cvsroot/squirrel-sql/sql12/build
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv5125/build

Modified Files:
	build.xml 
Log Message:
Incorporated pmd/cpd targets into main build for use on the continuous integration build server.

Index: build.xml
===================================================================
RCS file: /cvsroot/squirrel-sql/sql12/build/build.xml,v
retrieving revision 1.73
retrieving revision 1.74
diff -C2 -d -r1.73 -r1.74
*** build.xml	11 Nov 2008 20:22:13 -0000	1.73
--- build.xml	12 Nov 2008 02:04:23 -0000	1.74
***************
*** 68,72 ****
--- 68,78 ----
  		<property name="findbugs.report.dir"
  		          value="${test_output_root}/reports/findbugs" />
+ 		<!-- directory which contains reports generated by CPD (Copy/Paste Detector) -->
+ 		<property name="cpd.reports.dir"
+ 		          value="${test_output_root}/reports/cpd" />
  
+ 		<!-- directory which contains reports generated by PMD (Project Mess Detector) -->
+ 		<property name="pmd.reports.dir" value="${test_output_root}/reports/pmd"  />
+ 		
  		<!-- init emma task dependencies -->
  		<property name="emma.dir" value="${basedir}/test/lib" />
***************
*** 85,92 ****
  		</path>
  
! 		<!-- Load <emma>, <emmajava> and <findbugs> custom tasks so that they can be used in ANT -->
  		<taskdef resource="emma_ant.properties" classpathref="emma.lib" />
  		<taskdef name="findbugs"
  		         classname="edu.umd.cs.findbugs.anttask.FindBugsTask" />
  
  		<!-- Classpath that is used to compile tests -->
--- 91,101 ----
  		</path>
  
! 		<!-- Load <emma>, <emmajava>, <findbugs>, <pmd> and <cpd> custom tasks so that they can 
! 		be used in ANT -->
  		<taskdef resource="emma_ant.properties" classpathref="emma.lib" />
  		<taskdef name="findbugs"
  		         classname="edu.umd.cs.findbugs.anttask.FindBugsTask" />
+ 		<taskdef name="cpd" classname="net.sourceforge.pmd.cpd.CPDTask" />
+ 		<taskdef name="pmd" classname="net.sourceforge.pmd.ant.PMDTask" />
  
  		<!-- Classpath that is used to compile tests -->
***************
*** 1156,1160 ****
  		          output="xml"
  		          outputFile="${findbugs.report.dir}/squirrel-fb.xml"
! 		          jvmargs="-Xmx512m" timeout="3600000">
  
  			<auxclasspath refid="findbugs.aux.classpath" />
--- 1165,1170 ----
  		          output="xml"
  		          outputFile="${findbugs.report.dir}/squirrel-fb.xml"
! 		          jvmargs="-Xmx512m"
! 		          timeout="3600000">
  
  			<auxclasspath refid="findbugs.aux.classpath" />
***************
*** 1162,1168 ****
--- 1172,1210 ----
  			<class location="${coverage.classes.dir}" />
  		</findbugs>
+ 	</target>
+ 
+ 	<!--
+         ==================================================================
+         Run PMD (Project Mess Detector) detector against the built files for core as 
+         well as plugins and store the result in the PMD report directory.
+         ==================================================================
+         -->
+ 	<target name="pmd" depends="init">
+ 		<mkdir dir="${pmd.reports.dir}" />
  
+ 		<pmd >
+ 			<formatter type="xml" toFile="${pmd.reports.dir}/pmd.xml" />
+                         <fileset dir="${coverage.sources.dir}">
+                                 <include name="**/*.java" />
+                         </fileset>
+ 			<ruleset>basic</ruleset>
+ 			<ruleset>unusedcode</ruleset>
+ 		</pmd>
  
+ 	</target>
  
+ 	<!--
+         ==================================================================
+         Run CPD (Copy/Paste) detector against the built files for core as 
+         well as plugins and store the result in the CPD report directory.
+         ==================================================================
+         -->
+ 	<target name="cpd" depends="init">
+ 		<mkdir dir="${cpd.reports.dir}" />
+ 		<cpd minimumTokenCount="100" outputFile="${cpd.reports.dir}/cpd.txt">
+ 			<fileset dir="${coverage.sources.dir}">
+ 				<include name="**/*.java" />
+ 			</fileset>
+ 		</cpd>
  	</target>