[jsword-svn] jsword-support/tools/checkstyle s

[jswordcvs at crosswire.org]

Update of /cvs/jsword/jsword-support/tools/checkstyle
In directory www.crosswire.org:/tmp/cvs-serv25341/tools/checkstyle

Modified Files:
	HOWTO-UPGRADE.txt build.xml 
Log Message:
Upgraded Checkstyle to 4.1

Index: build.xml
===================================================================
RCS file: /cvs/jsword/jsword-support/tools/checkstyle/build.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** build.xml	16 Aug 2005 18:03:05 -0000	1.1
--- build.xml	2 Jan 2006 03:34:33 -0000	1.2
***************
*** 2,17 ****
  
    <property name="support.style" value="${support.tools}/checkstyle"/>
!   <property name="version.style" value="4.0-beta5"/>
  
    <!-- this should be overridden by the parent file -->
    <property name="support.tools" value=".."/>
  
!   <taskdef resource="checkstyletask.properties">
!     <classpath>
!       <fileset dir="${support.style}/checkstyle-${version.style}" includes="**/checkstyle-all*.jar"/>
!     </classpath>
!   </taskdef>
  
    <target name="checkstyle">
      <mkdir dir="${target.web}/checkstyle"/>
      <copy file="${support.style}/custom.xml" overwrite="true"
--- 2,18 ----
  
    <property name="support.style" value="${support.tools}/checkstyle"/>
!   <property name="version.style" value="4.1"/>
  
    <!-- this should be overridden by the parent file -->
    <property name="support.tools" value=".."/>
  
!   <taskdef resource="checkstyletask.properties"/>
  
    <target name="checkstyle">
+     <echo>CheckStyle may fail if checkstyle-all-${version.style}.jar is not visible to Ant.
+ To make it visible you need to do one of two things depending
+ on whether you are running ant in Eclipse or not.
+ In Eclipse, add checkstyle-all-${version.style}.jar to Preferences -> Ant -> Runtime -> Global Entries
+ Otherwise, run the checkstyle.antlibs task to copy jars to ANT_HOME/lib</echo>
      <mkdir dir="${target.web}/checkstyle"/>
      <copy file="${support.style}/custom.xml" overwrite="true"
***************
*** 33,35 ****
--- 34,42 ----
    </target>
  
+   <!-- This does not need to be done in Eclipse. Add it to Ant preferences instead -->
+   <target name="checkstyle.antlibs" description="Copy required jars to ant/lib">
+     <echo message="copy ${basedir}/${support.style}/checkstyle-${version.style}/checkstyle-${version.style}.jar"/>
+     <copy file="${support.tools}/${support.style}/checkstyle-${version.style}/checkstyle-all-${version.style}.jar" todir="${ant.home}/lib"/>
+   </target>
+ 
  </project>

Index: HOWTO-UPGRADE.txt
===================================================================
RCS file: /cvs/jsword/jsword-support/tools/checkstyle/HOWTO-UPGRADE.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** HOWTO-UPGRADE.txt	16 Aug 2005 18:03:05 -0000	1.1
--- HOWTO-UPGRADE.txt	2 Jan 2006 03:34:33 -0000	1.2
***************
*** 13,16 ****
--- 13,17 ----
     docs
     build.xml
+    all jars but checkstyle-all-*.jar
  
  Change the references to the old directory to the new directory in the following files:
***************
*** 21,22 ****
--- 22,29 ----
  Determine what has changed in checkstyle and update custom.xml appropriately.
  
+ You may need to tell ant where to find the checkstyle-all jar.
+ This varies by ide or whether ant is run standalone.
+ See build.xml for further info.
+ 
+ If you have copied the checkstyle-all jar to ANT_HOME/lib,
+ you will want to delete the older one.