[FOray-commit] SF.net SVN: foray: [8019] trunk/foray

[<vic...@us...>]

Revision: 8019
          http://svn.sourceforge.net/foray/?rev=8019&view=rev
Author:   victormote
Date:     2006-09-09 14:48:03 -0700 (Sat, 09 Sep 2006)

Log Message:
-----------
Fix build scripts to handle new checkstyle classpath requirements.

Modified Paths:
--------------
    trunk/foray/foray-app/scripts/build.xml
    trunk/foray/foray-areatree/scripts/build.xml
    trunk/foray/foray-common/scripts/build.xml
    trunk/foray/foray-core/scripts/build.xml
    trunk/foray/foray-font/scripts/build.xml
    trunk/foray/foray-fotree/scripts/build.xml
    trunk/foray/foray-graphic/scripts/build.xml
    trunk/foray/foray-hyphen-r/scripts/build.xml
    trunk/foray/foray-layout/scripts/build.xml
    trunk/foray/foray-mif/scripts/build.xml
    trunk/foray/foray-output/scripts/build.xml
    trunk/foray/foray-pdf/scripts/build.xml
    trunk/foray/foray-pioneer/scripts/build.xml
    trunk/foray/foray-pretty/scripts/build.xml
    trunk/foray/foray-ps/scripts/build.xml
    trunk/foray/foray-render/scripts/build.xml
    trunk/foray/foray-text/scripts/build.xml

Modified: trunk/foray/foray-app/scripts/build.xml
===================================================================
--- trunk/foray/foray-app/scripts/build.xml	2006-09-09 20:42:38 UTC (rev 8018)
+++ trunk/foray/foray-app/scripts/build.xml	2006-09-09 21:48:03 UTC (rev 8019)
@@ -133,7 +133,7 @@
   <!-- =================================================================== -->
   <!-- Creates the class package                                           -->
   <!-- =================================================================== -->
-  <target name="package" depends="compile, style"
+  <target name="package" depends="compile"
       description="Generates the jar files (default target)">
     <echo message="Creating the jar file ${build.dir}/${name}.jar"/>
 
@@ -185,7 +185,7 @@
   <!-- =================================================================== -->
   <!-- Checkstyle                                                          -->
   <!-- =================================================================== -->
-  <target name="style" depends="init" description="Runs checkstyle"
+  <target name="style" depends="package" description="Runs checkstyle"
       if="checkstyle.home">
     <taskdef name="checkstyle"
         classname="com.puppycrawl.tools.checkstyle.CheckStyleTask">

Modified: trunk/foray/foray-areatree/scripts/build.xml
===================================================================
--- trunk/foray/foray-areatree/scripts/build.xml	2006-09-09 20:42:38 UTC (rev 8018)
+++ trunk/foray/foray-areatree/scripts/build.xml	2006-09-09 21:48:03 UTC (rev 8019)
@@ -96,7 +96,7 @@
   <!-- =================================================================== -->
   <!-- Creates the class package                                           -->
   <!-- =================================================================== -->
-  <target name="package" depends="compile, style"
+  <target name="package" depends="compile"
       description="Generates the jar files (default target)">
     <echo message="Creating the jar file ${build.dir}/${name}.jar"/>
 
@@ -153,7 +153,7 @@
   <!-- =================================================================== -->
   <!-- Checkstyle                                                          -->
   <!-- =================================================================== -->
-  <target name="style" depends="init" description="Runs checkstyle"
+  <target name="style" depends="package" description="Runs checkstyle"
       if="checkstyle.home">
     <taskdef name="checkstyle"
         classname="com.puppycrawl.tools.checkstyle.CheckStyleTask">
@@ -165,6 +165,12 @@
     </taskdef>
     <checkstyle config="../../scripts/checkstyle-config.xml">
       <fileset dir="${src.dir}" includes="**/*.java"/>
+      <classpath>
+        <path refid="libs-build-classpath"/>
+        <fileset dir="${build.dir}">
+          <include name="${name}-${module}.jar"/>
+        </fileset>
+      </classpath>
     </checkstyle>
   </target>
 

Modified: trunk/foray/foray-common/scripts/build.xml
===================================================================
--- trunk/foray/foray-common/scripts/build.xml	2006-09-09 20:42:38 UTC (rev 8018)
+++ trunk/foray/foray-common/scripts/build.xml	2006-09-09 21:48:03 UTC (rev 8019)
@@ -96,7 +96,7 @@
   <!-- =================================================================== -->
   <!-- Creates the class package                                           -->
   <!-- =================================================================== -->
-  <target name="package" depends="compile, style"
+  <target name="package" depends="compile"
       description="Generates the jar files (default target)">
     <echo message="Creating the jar file ${build.dir}/${name}.jar"/>
 
@@ -153,7 +153,7 @@
   <!-- =================================================================== -->
   <!-- Checkstyle                                                          -->
   <!-- =================================================================== -->
-  <target name="style" depends="init" description="Runs checkstyle"
+  <target name="style" depends="package" description="Runs checkstyle"
       if="checkstyle.home">
     <taskdef name="checkstyle"
         classname="com.puppycrawl.tools.checkstyle.CheckStyleTask">

Modified: trunk/foray/foray-core/scripts/build.xml
===================================================================
--- trunk/foray/foray-core/scripts/build.xml	2006-09-09 20:42:38 UTC (rev 8018)
+++ trunk/foray/foray-core/scripts/build.xml	2006-09-09 21:48:03 UTC (rev 8019)
@@ -94,7 +94,7 @@
   <!-- =================================================================== -->
   <!-- Creates the class package                                           -->
   <!-- =================================================================== -->
-  <target name="package" depends="compile, style"
+  <target name="package" depends="compile"
       description="Generates the jar files (default target)">
     <echo message="Creating the jar file ${build.dir}/${name}.jar"/>
 
@@ -163,6 +163,12 @@
     </taskdef>
     <checkstyle config="../../scripts/checkstyle-config.xml">
       <fileset dir="${src.dir}" includes="**/*.java"/>
+      <classpath>
+        <path refid="libs-build-classpath"/>
+        <fileset dir="${build.dir}">
+          <include name="${name}-${module}.jar"/>
+        </fileset>
+      </classpath>
     </checkstyle>
   </target>
 

Modified: trunk/foray/foray-font/scripts/build.xml
===================================================================
--- trunk/foray/foray-font/scripts/build.xml	2006-09-09 20:42:38 UTC (rev 8018)
+++ trunk/foray/foray-font/scripts/build.xml	2006-09-09 21:48:03 UTC (rev 8019)
@@ -106,7 +106,7 @@
   <!-- =================================================================== -->
   <!-- Creates the class package                                           -->
   <!-- =================================================================== -->
-  <target name="package" depends="compile, style"
+  <target name="package" depends="compile"
       description="Generates the jar files (default target)">
     <echo message="Creating the jar file ${build.dir}/${name}.jar"/>
 
@@ -163,7 +163,7 @@
   <!-- =================================================================== -->
   <!-- Checkstyle                                                          -->
   <!-- =================================================================== -->
-  <target name="style" depends="init" description="Runs checkstyle"
+  <target name="style" depends="package" description="Runs checkstyle"
       if="checkstyle.home">
     <taskdef name="checkstyle"
         classname="com.puppycrawl.tools.checkstyle.CheckStyleTask">
@@ -175,6 +175,12 @@
     </taskdef>
     <checkstyle config="../../scripts/checkstyle-config.xml">
       <fileset dir="${src.dir}" includes="**/*.java"/>
+      <classpath>
+        <path refid="libs-build-classpath"/>
+        <fileset dir="${build.dir}">
+          <include name="${name}-${module}.jar"/>
+        </fileset>
+      </classpath>
     </checkstyle>
   </target>
 

Modified: trunk/foray/foray-fotree/scripts/build.xml
===================================================================
--- trunk/foray/foray-fotree/scripts/build.xml	2006-09-09 20:42:38 UTC (rev 8018)
+++ trunk/foray/foray-fotree/scripts/build.xml	2006-09-09 21:48:03 UTC (rev 8019)
@@ -104,7 +104,7 @@
   <!-- =================================================================== -->
   <!-- Creates the class package                                           -->
   <!-- =================================================================== -->
-  <target name="package" depends="compile, style"
+  <target name="package" depends="compile"
       description="Generates the jar files (default target)">
     <echo message="Creating the jar file ${build.dir}/${name}.jar"/>
 
@@ -161,7 +161,7 @@
   <!-- =================================================================== -->
   <!-- Checkstyle                                                          -->
   <!-- =================================================================== -->
-  <target name="style" depends="init" description="Runs checkstyle"
+  <target name="style" depends="package" description="Runs checkstyle"
       if="checkstyle.home">
     <taskdef name="checkstyle"
         classname="com.puppycrawl.tools.checkstyle.CheckStyleTask">
@@ -173,6 +173,12 @@
     </taskdef>
     <checkstyle config="../../scripts/checkstyle-config.xml">
       <fileset dir="${src.dir}" includes="**/*.java"/>
+      <classpath>
+        <path refid="libs-build-classpath"/>
+        <fileset dir="${build.dir}">
+          <include name="${name}-${module}.jar"/>
+        </fileset>
+      </classpath>
     </checkstyle>
   </target>
 

Modified: trunk/foray/foray-graphic/scripts/build.xml
===================================================================
--- trunk/foray/foray-graphic/scripts/build.xml	2006-09-09 20:42:38 UTC (rev 8018)
+++ trunk/foray/foray-graphic/scripts/build.xml	2006-09-09 21:48:03 UTC (rev 8019)
@@ -147,7 +147,7 @@
   <!-- =================================================================== -->
   <!-- Creates the class package                                           -->
   <!-- =================================================================== -->
-  <target name="package" depends="compile, style"
+  <target name="package" depends="compile"
       description="Generates the jar files (default target)">
     <echo message="Creating the jar file ${build.dir}/${name}.jar"/>
 
@@ -204,7 +204,7 @@
   <!-- =================================================================== -->
   <!-- Checkstyle                                                          -->
   <!-- =================================================================== -->
-  <target name="style" depends="init" description="Runs checkstyle"
+  <target name="style" depends="package" description="Runs checkstyle"
       if="checkstyle.home">
     <taskdef name="checkstyle"
         classname="com.puppycrawl.tools.checkstyle.CheckStyleTask">
@@ -216,6 +216,12 @@
     </taskdef>
     <checkstyle config="../../scripts/checkstyle-config.xml">
       <fileset dir="${src.dir}" includes="**/*.java"/>
+      <classpath>
+        <path refid="libs-build-classpath"/>
+        <fileset dir="${build.dir}">
+          <include name="${name}-${module}.jar"/>
+        </fileset>
+      </classpath>
     </checkstyle>
   </target>
 

Modified: trunk/foray/foray-hyphen-r/scripts/build.xml
===================================================================
--- trunk/foray/foray-hyphen-r/scripts/build.xml	2006-09-09 20:42:38 UTC (rev 8018)
+++ trunk/foray/foray-hyphen-r/scripts/build.xml	2006-09-09 21:48:03 UTC (rev 8019)
@@ -119,7 +119,7 @@
   <!-- =================================================================== -->
   <!-- Creates the class package                                           -->
   <!-- =================================================================== -->
-  <target name="package" depends="compile, style, hyphenation"
+  <target name="package" depends="compile, hyphenation"
       description="Generates the jar files (default target)">
     <echo message="Creating the jar file ${build.dir}/${name}.jar"/>
 
@@ -184,7 +184,7 @@
   <!-- =================================================================== -->
   <!-- Checkstyle                                                          -->
   <!-- =================================================================== -->
-  <target name="style" depends="init" description="Runs checkstyle"
+  <target name="style" depends="package" description="Runs checkstyle"
       if="checkstyle.home">
     <taskdef name="checkstyle"
         classname="com.puppycrawl.tools.checkstyle.CheckStyleTask">
@@ -196,6 +196,12 @@
     </taskdef>
     <checkstyle config="../../scripts/checkstyle-config.xml">
       <fileset dir="${src.dir}" includes="**/*.java"/>
+      <classpath>
+        <path refid="libs-build-classpath"/>
+        <fileset dir="${build.dir}">
+          <include name="${name}-${module}.jar"/>
+        </fileset>
+      </classpath>
     </checkstyle>
   </target>
 

Modified: trunk/foray/foray-layout/scripts/build.xml
===================================================================
--- trunk/foray/foray-layout/scripts/build.xml	2006-09-09 20:42:38 UTC (rev 8018)
+++ trunk/foray/foray-layout/scripts/build.xml	2006-09-09 21:48:03 UTC (rev 8019)
@@ -93,7 +93,7 @@
   <!-- =================================================================== -->
   <!-- Creates the class package                                           -->
   <!-- =================================================================== -->
-  <target name="package" depends="compile, style"
+  <target name="package" depends="compile"
       description="Generates the jar files (default target)">
     <echo message="Creating the jar file ${build.dir}/${name}.jar"/>
 
@@ -150,7 +150,7 @@
   <!-- =================================================================== -->
   <!-- Checkstyle                                                          -->
   <!-- =================================================================== -->
-  <target name="style" depends="init" description="Runs checkstyle"
+  <target name="style" depends="package" description="Runs checkstyle"
       if="checkstyle.home">
     <taskdef name="checkstyle"
         classname="com.puppycrawl.tools.checkstyle.CheckStyleTask">
@@ -162,6 +162,12 @@
     </taskdef>
     <checkstyle config="../../scripts/checkstyle-config.xml">
       <fileset dir="${src.dir}" includes="**/*.java"/>
+      <classpath>
+        <path refid="libs-build-classpath"/>
+        <fileset dir="${build.dir}">
+          <include name="${name}-${module}.jar"/>
+        </fileset>
+      </classpath>
     </checkstyle>
   </target>
 

Modified: trunk/foray/foray-mif/scripts/build.xml
===================================================================
--- trunk/foray/foray-mif/scripts/build.xml	2006-09-09 20:42:38 UTC (rev 8018)
+++ trunk/foray/foray-mif/scripts/build.xml	2006-09-09 21:48:03 UTC (rev 8019)
@@ -92,7 +92,7 @@
   <!-- =================================================================== -->
   <!-- Creates the class package                                           -->
   <!-- =================================================================== -->
-  <target name="package" depends="compile, style"
+  <target name="package" depends="compile"
       description="Generates the jar files (default target)">
     <echo message="Creating the jar file ${build.dir}/${name}.jar"/>
 
@@ -149,7 +149,7 @@
   <!-- =================================================================== -->
   <!-- Checkstyle                                                          -->
   <!-- =================================================================== -->
-  <target name="style" depends="init" description="Runs checkstyle"
+  <target name="style" depends="package" description="Runs checkstyle"
       if="checkstyle.home">
     <taskdef name="checkstyle"
         classname="com.puppycrawl.tools.checkstyle.CheckStyleTask">

Modified: trunk/foray/foray-output/scripts/build.xml
===================================================================
--- trunk/foray/foray-output/scripts/build.xml	2006-09-09 20:42:38 UTC (rev 8018)
+++ trunk/foray/foray-output/scripts/build.xml	2006-09-09 21:48:03 UTC (rev 8019)
@@ -105,7 +105,7 @@
   <!-- =================================================================== -->
   <!-- Creates the class package                                           -->
   <!-- =================================================================== -->
-  <target name="package" depends="compile, style"
+  <target name="package" depends="compile"
       description="Generates the jar files (default target)">
     <echo message="Creating the jar file ${build.dir}/${name}.jar"/>
 
@@ -162,7 +162,7 @@
   <!-- =================================================================== -->
   <!-- Checkstyle                                                          -->
   <!-- =================================================================== -->
-  <target name="style" depends="init" description="Runs checkstyle"
+  <target name="style" depends="package" description="Runs checkstyle"
       if="checkstyle.home">
     <taskdef name="checkstyle"
         classname="com.puppycrawl.tools.checkstyle.CheckStyleTask">

Modified: trunk/foray/foray-pdf/scripts/build.xml
===================================================================
--- trunk/foray/foray-pdf/scripts/build.xml	2006-09-09 20:42:38 UTC (rev 8018)
+++ trunk/foray/foray-pdf/scripts/build.xml	2006-09-09 21:48:03 UTC (rev 8019)
@@ -96,7 +96,7 @@
   <!-- =================================================================== -->
   <!-- Creates the class package                                           -->
   <!-- =================================================================== -->
-  <target name="package" depends="compile, style"
+  <target name="package" depends="compile"
       description="Generates the jar files (default target)">
     <echo message="Creating the jar file ${build.dir}/${name}.jar"/>
 
@@ -153,7 +153,7 @@
   <!-- =================================================================== -->
   <!-- Checkstyle                                                          -->
   <!-- =================================================================== -->
-  <target name="style" depends="init" description="Runs checkstyle"
+  <target name="style" depends="package" description="Runs checkstyle"
       if="checkstyle.home">
     <taskdef name="checkstyle"
         classname="com.puppycrawl.tools.checkstyle.CheckStyleTask">
@@ -165,6 +165,12 @@
     </taskdef>
     <checkstyle config="../../scripts/checkstyle-config.xml">
       <fileset dir="${src.dir}" includes="**/*.java"/>
+      <classpath>
+        <path refid="libs-build-classpath"/>
+        <fileset dir="${build.dir}">
+          <include name="${name}-${module}.jar"/>
+        </fileset>
+      </classpath>
     </checkstyle>
   </target>
 

Modified: trunk/foray/foray-pioneer/scripts/build.xml
===================================================================
--- trunk/foray/foray-pioneer/scripts/build.xml	2006-09-09 20:42:38 UTC (rev 8018)
+++ trunk/foray/foray-pioneer/scripts/build.xml	2006-09-09 21:48:03 UTC (rev 8019)
@@ -99,7 +99,7 @@
   <!-- =================================================================== -->
   <!-- Creates the class package                                           -->
   <!-- =================================================================== -->
-  <target name="package" depends="compile, style"
+  <target name="package" depends="compile"
       description="Generates the jar files (default target)">
     <echo message="Creating the jar file ${build.dir}/${name}.jar"/>
 
@@ -156,7 +156,7 @@
   <!-- =================================================================== -->
   <!-- Checkstyle                                                          -->
   <!-- =================================================================== -->
-  <target name="style" depends="init" description="Runs checkstyle"
+  <target name="style" depends="package" description="Runs checkstyle"
       if="checkstyle.home">
     <taskdef name="checkstyle"
         classname="com.puppycrawl.tools.checkstyle.CheckStyleTask">
@@ -168,6 +168,12 @@
     </taskdef>
     <checkstyle config="../../scripts/checkstyle-config.xml">
       <fileset dir="${src.dir}" includes="**/*.java"/>
+      <classpath>
+        <path refid="libs-build-classpath"/>
+        <fileset dir="${build.dir}">
+          <include name="${name}-${module}.jar"/>
+        </fileset>
+      </classpath>
     </checkstyle>
   </target>
 

Modified: trunk/foray/foray-pretty/scripts/build.xml
===================================================================
--- trunk/foray/foray-pretty/scripts/build.xml	2006-09-09 20:42:38 UTC (rev 8018)
+++ trunk/foray/foray-pretty/scripts/build.xml	2006-09-09 21:48:03 UTC (rev 8019)
@@ -96,7 +96,7 @@
   <!-- =================================================================== -->
   <!-- Creates the class package                                           -->
   <!-- =================================================================== -->
-  <target name="package" depends="compile, style"
+  <target name="package" depends="compile"
       description="Generates the jar files (default target)">
     <echo message="Creating the jar file ${build.dir}/${name}.jar"/>
 
@@ -153,7 +153,7 @@
   <!-- =================================================================== -->
   <!-- Checkstyle                                                          -->
   <!-- =================================================================== -->
-  <target name="style" depends="init" description="Runs checkstyle"
+  <target name="style" depends="package" description="Runs checkstyle"
       if="checkstyle.home">
     <taskdef name="checkstyle"
         classname="com.puppycrawl.tools.checkstyle.CheckStyleTask">
@@ -165,6 +165,9 @@
     </taskdef>
     <checkstyle config="../../scripts/checkstyle-config.xml">
       <fileset dir="${src.dir}" includes="**/*.java"/>
+      <classpath>
+        <path refid="libs-build-classpath"/>
+      </classpath>
     </checkstyle>
   </target>
 

Modified: trunk/foray/foray-ps/scripts/build.xml
===================================================================
--- trunk/foray/foray-ps/scripts/build.xml	2006-09-09 20:42:38 UTC (rev 8018)
+++ trunk/foray/foray-ps/scripts/build.xml	2006-09-09 21:48:03 UTC (rev 8019)
@@ -99,7 +99,7 @@
   <!-- =================================================================== -->
   <!-- Creates the class package                                           -->
   <!-- =================================================================== -->
-  <target name="package" depends="compile, style"
+  <target name="package" depends="compile"
       description="Generates the jar files (default target)">
     <echo message="Creating the jar file ${build.dir}/${name}.jar"/>
 
@@ -156,7 +156,7 @@
   <!-- =================================================================== -->
   <!-- Checkstyle                                                          -->
   <!-- =================================================================== -->
-  <target name="style" depends="init" description="Runs checkstyle"
+  <target name="style" depends="package" description="Runs checkstyle"
       if="checkstyle.home">
     <taskdef name="checkstyle"
         classname="com.puppycrawl.tools.checkstyle.CheckStyleTask">
@@ -172,6 +172,12 @@
         <!-- The GlyphList classes cause checkstyle to exceed stack limits. -->
         <exclude name="**/GlyphListAGL*.java"/>
       </fileset>
+      <classpath>
+        <path refid="libs-build-classpath"/>
+        <fileset dir="${build.dir}">
+          <include name="${name}-${module}.jar"/>
+        </fileset>
+      </classpath>
     </checkstyle>
   </target>
 

Modified: trunk/foray/foray-render/scripts/build.xml
===================================================================
--- trunk/foray/foray-render/scripts/build.xml	2006-09-09 20:42:38 UTC (rev 8018)
+++ trunk/foray/foray-render/scripts/build.xml	2006-09-09 21:48:03 UTC (rev 8019)
@@ -116,7 +116,7 @@
   <!-- =================================================================== -->
   <!-- Creates the class package                                           -->
   <!-- =================================================================== -->
-  <target name="package" depends="compile, style"
+  <target name="package" depends="compile"
       description="Generates the jar files (default target)">
     <echo message="Creating the jar file ${build.dir}/${name}.jar"/>
 
@@ -173,7 +173,7 @@
   <!-- =================================================================== -->
   <!-- Checkstyle                                                          -->
   <!-- =================================================================== -->
-  <target name="style" depends="init" description="Runs checkstyle"
+  <target name="style" depends="package" description="Runs checkstyle"
       if="checkstyle.home">
     <taskdef name="checkstyle"
         classname="com.puppycrawl.tools.checkstyle.CheckStyleTask">
@@ -185,6 +185,12 @@
     </taskdef>
     <checkstyle config="../../scripts/checkstyle-config.xml">
       <fileset dir="${src.dir}" includes="**/*.java"/>
+      <classpath>
+        <path refid="libs-build-classpath"/>
+        <fileset dir="${build.dir}">
+          <include name="${name}-${module}.jar"/>
+        </fileset>
+      </classpath>
     </checkstyle>
   </target>
 

Modified: trunk/foray/foray-text/scripts/build.xml
===================================================================
--- trunk/foray/foray-text/scripts/build.xml	2006-09-09 20:42:38 UTC (rev 8018)
+++ trunk/foray/foray-text/scripts/build.xml	2006-09-09 21:48:03 UTC (rev 8019)
@@ -102,7 +102,7 @@
   <!-- =================================================================== -->
   <!-- Creates the class package                                           -->
   <!-- =================================================================== -->
-  <target name="package" depends="compile, style"
+  <target name="package" depends="compile"
       description="Generates the jar files (default target)">
     <echo message="Creating the jar file ${build.dir}/${name}.jar"/>
 
@@ -167,7 +167,7 @@
   <!-- =================================================================== -->
   <!-- Checkstyle                                                          -->
   <!-- =================================================================== -->
-  <target name="style" depends="init" description="Runs checkstyle"
+  <target name="style" depends="package" description="Runs checkstyle"
       if="checkstyle.home">
     <taskdef name="checkstyle"
         classname="com.puppycrawl.tools.checkstyle.CheckStyleTask">
@@ -179,6 +179,12 @@
     </taskdef>
     <checkstyle config="../../scripts/checkstyle-config.xml">
       <fileset dir="${src.dir}" includes="**/*.java"/>
+      <classpath>
+        <path refid="libs-build-classpath"/>
+        <fileset dir="${build.dir}">
+          <include name="${name}-${module}.jar"/>
+        </fileset>
+      </classpath>
     </checkstyle>
   </target>
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.