donaldp 02/03/22 18:48:39
Modified: proposal/myrmidon build.xml
Log:
Integrate checkstyle target.
Not fully integrated into our build as we get bazillions of errors ;(
Revision Changes Path
1.87 +208 -160 jakarta-ant/proposal/myrmidon/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/build.xml,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -r1.86 -r1.87
--- build.xml 23 Mar 2002 01:45:42 -0000 1.86
+++ build.xml 23 Mar 2002 02:48:39 -0000 1.87
@@ -86,100 +86,100 @@
<available property="jdk1.3+" classname="java.lang.StrictMath" />
<available property="jdk1.4+" classname="java.lang.CharSequence" />
<available property="bsf.present"
- classname="com.ibm.bsf.BSFManager"
- classpathref="project.class.path" />
+ classname="com.ibm.bsf.BSFManager"
+ classpathref="project.class.path" />
<available property="netrexx.present"
- classname="netrexx.lang.Rexx"
- classpathref="project.class.path" />
+ classname="netrexx.lang.Rexx"
+ classpathref="project.class.path" />
<available property="trax.present"
- classname="javax.xml.transform.Transformer"
- classpathref="project.class.path" />
+ classname="javax.xml.transform.Transformer"
+ classpathref="project.class.path" />
<available property="xslp.present"
- classname="com.kvisco.xsl.XSLProcessor"
- classpathref="project.class.path" />
+ classname="com.kvisco.xsl.XSLProcessor"
+ classpathref="project.class.path" />
<available property="xalan.present"
- classname="org.apache.xalan.xslt.XSLTProcessorFactory"
- classpathref="project.class.path" />
+ classname="org.apache.xalan.xslt.XSLTProcessorFactory"
+ classpathref="project.class.path" />
<available property="xalan2.present"
- classname="org.apache.xalan.transformer.TransformerImpl"
- classpathref="project.class.path" />
+ classname="org.apache.xalan.transformer.TransformerImpl"
+ classpathref="project.class.path" />
<available property="ejb.ejbc.present"
- classname="weblogic.ejbc"
- classpathref="project.class.path" />
+ classname="weblogic.ejbc"
+ classpathref="project.class.path" />
<available property="ejb.DDCreator.present"
- classname="weblogic.ejb.utils.DDCreator"
- classpathref="project.class.path" />
+ classname="weblogic.ejb.utils.DDCreator"
+ classpathref="project.class.path" />
<available property="ejb.wls.present"
- classname="weblogic.Server"
- classpathref="project.class.path" />
+ classname="weblogic.Server"
+ classpathref="project.class.path" />
<available property="junit.present"
- classname="junit.framework.TestCase"
- classpathref="project.class.path" />
+ classname="junit.framework.TestCase"
+ classpathref="project.class.path" />
<available property="netcomp.present"
- classname="com.oroinc.net.ftp.FTPClient"
- classpathref="project.class.path" />
+ classname="com.oroinc.net.ftp.FTPClient"
+ classpathref="project.class.path" />
<available property="jcifs.present"
- classname="jcifs.smb.SmbFile"
- classpathref="project.class.path" />
+ classname="jcifs.smb.SmbFile"
+ classpathref="project.class.path" />
<available property="starteam.present"
- classname="com.starbase.util.Platform"
- classpathref="project.class.path" />
+ classname="com.starbase.util.Platform"
+ classpathref="project.class.path" />
<available property="antlr.present"
- classname="antlr.Tool"
- classpathref="project.class.path"/>
+ classname="antlr.Tool"
+ classpathref="project.class.path"/>
<available property="vaj.present"
- classname="com.ibm.ivj.util.base.Workspace"
- classpathref="project.class.path"/>
+ classname="com.ibm.ivj.util.base.Workspace"
+ classpathref="project.class.path"/>
<available property="stylebook.present"
- classname="org.apache.stylebook.Engine"
- classpathref="project.class.path"/>
+ classname="org.apache.stylebook.Engine"
+ classpathref="project.class.path"/>
<available property="jakarta.regexp.present"
- classname="org.apache.regexp.RE"
- classpathref="project.class.path"/>
+ classname="org.apache.regexp.RE"
+ classpathref="project.class.path"/>
<available property="jakarta.oro.present"
- classname="org.apache.oro.text.regex.Perl5Matcher"
- classpathref="project.class.path" />
+ classname="org.apache.oro.text.regex.Perl5Matcher"
+ classpathref="project.class.path" />
<available property="jmf.present"
- classname="javax.sound.sampled.Clip"
- classpathref="project.class.path"/>
+ classname="javax.sound.sampled.Clip"
+ classpathref="project.class.path"/>
<available property="icontract.present"
- classname="com.reliablesystems.iContract.IContracted"
- classpathref="project.class.path"/>
+ classname="com.reliablesystems.iContract.IContracted"
+ classpathref="project.class.path"/>
<available property="jdepend.present"
- classname="jdepend.framework.JDepend"
- classpathref="project.class.path"/>
+ classname="jdepend.framework.JDepend"
+ classpathref="project.class.path"/>
<available property="log4j.present"
- classname="org.apache.log4j.Category"
- classpathref="project.class.path"/>
+ classname="org.apache.log4j.Category"
+ classpathref="project.class.path"/>
<!-- this is just a way to check for a TraX implementation -->
<available property="trax.impl.present"
-
resource="META-INF/services/javax.xml.transform.TransformerFactory"
- classpathref="project.class.path"/>
+
resource="META-INF/services/javax.xml.transform.TransformerFactory"
+ classpathref="project.class.path"/>
<available property="xalan.envcheck"
- classname="org.apache.xalan.xslt.EnvironmentCheck"
- classpathref="project.class.path" />
+ classname="org.apache.xalan.xslt.EnvironmentCheck"
+ classpathref="project.class.path" />
<available property="servlet.present"
- classname="javax.servlet.Servlet"
- classpathref="project.class.path"/>
+ classname="javax.servlet.Servlet"
+ classpathref="project.class.path"/>
<available property="adaptx.present"
- classname="org.exolab.adaptx.xslt.XSLTProcessor"
- classpathref="project.class.path" />
+ classname="org.exolab.adaptx.xslt.XSLTProcessor"
+ classpathref="project.class.path" />
<available property="xerces.present"
- classname="org.apache.xerces.parsers.SAXParser"
- classpathref="project.class.path" />
+ classname="org.apache.xerces.parsers.SAXParser"
+ classpathref="project.class.path" />
<available property="bcel.present"
- classname="org.apache.bcel.Constants"
- classpathref="project.class.path" />
+ classname="org.apache.bcel.Constants"
+ classpathref="project.class.path" />
<condition property="javamail.complete">
- <and>
- <available classname="javax.activation.DataHandler"
- classpathref="project.class.path"/>
- <available classname="javax.mail.Transport"
- classpathref="project.class.path"/>
- </and>
+ <and>
+ <available classname="javax.activation.DataHandler"
+ classpathref="project.class.path"/>
+ <available classname="javax.mail.Transport"
+ classpathref="project.class.path"/>
+ </and>
</condition>
</target>
@@ -201,7 +201,7 @@
</taskdef>
<taskdef name="antlib-descriptor"
- classname="org.apache.myrmidon.build.AntlibDescriptorTask">
+ classname="org.apache.myrmidon.build.AntlibDescriptorTask">
<classpath>
<pathelement location="${custom-tasks-dir}"/>
<path refid="project.class.path"/>
@@ -220,9 +220,9 @@
<mkdir dir="${build.classes}"/>
<javac
- destdir="${build.classes}"
- debug="${debug}"
- deprecation="${deprecation}" >
+ destdir="${build.classes}"
+ debug="${debug}"
+ deprecation="${deprecation}" >
<classpath refid="project.class.path"/>
<src location="src/todo"/>
<src path="${java.dir}" />
@@ -284,74 +284,74 @@
<patternset id="ant1.todo.include">
<include name="org/apache/tools/**" />
<exclude name="${regexp.package}/JakartaRegexp*.java"
- unless="jakarta.regexp.present" />
+ unless="jakarta.regexp.present" />
<exclude name="${regexp.package}/JakartaOro*.java"
- unless="jakarta.oro.present" />
+ unless="jakarta.oro.present" />
<exclude name="${regexp.package}/Jdk14Regexp*.java"
- unless="jdk1.4+" />
+ unless="jdk1.4+" />
<exclude name="${ant.package}/AntSecurityManager.java"
- unless="jdk1.2+" />
+ unless="jdk1.2+" />
<exclude name="${ant.package}/listener/Log4jListener.java"
- unless="log4j.present" />
+ unless="log4j.present" />
<exclude name="${taskdefs.package}/IContract.java"
- unless="icontract.present" />
+ unless="icontract.present" />
<exclude name="${taskdefs.package}/Script.java"
- unless="bsf.present" />
+ unless="bsf.present" />
<exclude name="${taskdefs.package}/stylebook/StyleBook.java"
- unless="stylebook.present" />
+ unless="stylebook.present" />
<exclude name="${taskdefs.package}/NetRexxC.java"
- unless="netrexx.present" />
+ unless="netrexx.present" />
<exclude name="${antlib.package}/xml/TraXLiaison.java"
- unless="trax.present" />
+ unless="trax.present" />
<exclude name="${antlib.package}/xml/XalanLiaison.java"
- unless="xalan.present" />
+ unless="xalan.present" />
<exclude name="${taskdefs.package}/Javah.java"
- unless="jdk1.2+" />
+ unless="jdk1.2+" />
<exclude name="${taskdefs.package}/junit/*"
- unless="junit.present" />
+ unless="junit.present" />
<exclude name="${taskdefs.package}/net/**.java"
- unless="netcomp.present" />
+ unless="netcomp.present" />
<exclude name="${taskdefs.package}/net/MimeMail.java"
- unless="javamail.complete" />
+ unless="javamail.complete" />
<exclude name="${taskdefs.package}/scm/AntStarTeam*.java"
- unless="starteam.present" />
+ unless="starteam.present" />
<exclude name="${taskdefs.package}/ANTLR.java"
- unless="antlr.present" />
+ unless="antlr.present" />
<exclude name="${taskdefs.package}/perforce/*.java"
- unless="jakarta.oro.present" />
+ unless="jakarta.oro.present" />
<exclude
name="${taskdefs.package}/junit/XMLResultAggregator.java"
- unless="trax.present" />
+ unless="trax.present" />
<exclude
name="${taskdefs.package}/junit/AggregateTransformer.java"
- unless="trax.present" />
+ unless="trax.present" />
<exclude
name="${taskdefs.package}/junit/XMLResultAggregator.java"
- unless="xalan2.present" />
+ unless="xalan2.present" />
<exclude
name="${taskdefs.package}/junit/AggregateTransformer.java"
- unless="xalan2.present" />
+ unless="xalan2.present" />
<exclude name="${taskdefs.package}/junit/XalanExecutor.java"
- unless="xalan2.present" />
+ unless="xalan2.present" />
<exclude name="${taskdefs.package}/junit/Xalan2Executor.java"
- unless="xalan2.present" />
+ unless="xalan2.present" />
<exclude name="${taskdefs.package}/junit/Xalan1Executor.java"
- unless="xalan.present" />
+ unless="xalan.present" />
<exclude name="${taskdefs.package}/jdepend/*"
- unless="jdepend.present" />
+ unless="jdepend.present" />
<exclude name="${taskdefs.package}/sitraka/**"
- unless="some.regexp.support"/>
+ unless="some.regexp.support"/>
<exclude name="${taskdefs.package}/metamata/MAudit*"
- unless="jakarta.oro.present"/>
+ unless="jakarta.oro.present"/>
<exclude name="${taskdefs.package}/metamata/MMetrics*"
- unless="trax.present"/>
+ unless="trax.present"/>
<exclude name="${taskdefs.package}/metamata/**"
- unless="jdk1.2+" />
+ unless="jdk1.2+" />
<exclude name="${optional.type.package}/depend/*.java"
- unless="bcel.present" />
+ unless="bcel.present" />
<exclude name="${util.package}/depend/*.java"
- unless="bcel.present" />
+ unless="bcel.present" />
<exclude name="${optional.type.package}/depend/*.java"
- unless="jdk1.2+" />
+ unless="jdk1.2+" />
<exclude name="${util.package}/depend/*.java"
- unless="jdk1.2+" />
+ unless="jdk1.2+" />
</patternset>
<patternset id="selftest.include">
@@ -367,37 +367,37 @@
<!-- The generation of the descriptor is kept separated from the
packaging
of the jars, since jarring is fast and XDoclet is really slow.-->
<target name="antlib-descriptors"
- depends="setup-patterns, custom-tasks"
- unless="antlib-descriptors.omit"
- description="Generates Antlib descriptors using XDoclet.">
+ depends="setup-patterns, custom-tasks"
+ unless="antlib-descriptors.omit"
+ description="Generates Antlib descriptors using XDoclet.">
<antlib-descriptor libName="builtin"
- destdir="${gen.dir}"
- classpathref="project.class.path">
+ destdir="${gen.dir}"
+ classpathref="project.class.path">
<fileset dir="${java.dir}">
<patternset refid="myrmidon-api.include"/>
</fileset>
</antlib-descriptor>
<antlib-descriptor libName="container"
- destdir="${gen.dir}"
- classpathref="project.class.path">
+ destdir="${gen.dir}"
+ classpathref="project.class.path">
<fileset dir="${java.dir}">
<patternset refid="myrmidon-container.include"/>
</fileset>
</antlib-descriptor>
<antlib-descriptor libName="aut"
- destdir="${gen.dir}"
- classpathref="project.class.path">
+ destdir="${gen.dir}"
+ classpathref="project.class.path">
<fileset dir="${java.dir}">
<patternset refid="aut.include"/>
</fileset>
</antlib-descriptor>
<antlib-descriptor libName="selftest"
- destdir="${gen.dir}"
- classpathref="project.class.path">
+ destdir="${gen.dir}"
+ classpathref="project.class.path">
<fileset dir="${java.dir}">
<patternset refid="selftest.include"/>
</fileset>
@@ -420,95 +420,95 @@
<mkdir dir="${build.ext}"/>
<jar jarfile="${build.bin}/myrmidon-launcher.jar"
- basedir="${build.classes}"
- manifest="${manifest.dir}/myrmidon-launcher.mf">
+ basedir="${build.classes}"
+ manifest="${manifest.dir}/myrmidon-launcher.mf">
<patternset refid="myrmidon-launcher.include"/>
</jar>
<antlib-jar jarfile="${build.bin}/lib/myrmidon-container.jar"
- basedir="${build.classes}"
- manifest="${manifest.dir}/myrmidon-container.mf"
- rolesDescriptor="${gen.dir}/container-ant-roles.xml"
- descriptor="${gen.dir}/container-ant-descriptor.xml" >
+ basedir="${build.classes}"
+ manifest="${manifest.dir}/myrmidon-container.mf"
+ rolesDescriptor="${gen.dir}/container-ant-roles.xml"
+ descriptor="${gen.dir}/container-ant-descriptor.xml" >
<patternset refid="myrmidon-container.include"/>
</antlib-jar>
<antlib-jar jarfile="${build.lib}/myrmidon-api.jar"
- basedir="${build.classes}"
- manifest="${manifest.dir}/myrmidon-api.mf"
- rolesDescriptor="${gen.dir}/builtin-ant-roles.xml"
- descriptor="${gen.dir}/builtin-ant-descriptor.xml"
- servicesDescriptor="${manifest.dir}/core-services.xml" >
- <patternset refid="myrmidon-api.include"/>
+ basedir="${build.classes}"
+ manifest="${manifest.dir}/myrmidon-api.mf"
+ rolesDescriptor="${gen.dir}/builtin-ant-roles.xml"
+ descriptor="${gen.dir}/builtin-ant-descriptor.xml"
+ servicesDescriptor="${manifest.dir}/core-services.xml" >
+ <patternset refid="myrmidon-api.include"/>
</antlib-jar>
<antlib-jar jarfile="${build.lib}/aut.jar"
- basedir="${build.classes}"
- manifest="${manifest.dir}/aut.mf"
- rolesDescriptor="${gen.dir}/aut-ant-roles.xml"
- descriptor="${gen.dir}/aut-ant-descriptor.xml" >
- <patternset refid="aut.include"/>
+ basedir="${build.classes}"
+ manifest="${manifest.dir}/aut.mf"
+ rolesDescriptor="${gen.dir}/aut-ant-roles.xml"
+ descriptor="${gen.dir}/aut-ant-descriptor.xml" >
+ <patternset refid="aut.include"/>
</antlib-jar>
<antlib-jar jarfile="${build.lib}/ant1_todo.jar"
- basedir="${build.classes}"
- descriptor="${manifest.dir}/ant1-ant-descriptor.xml" >
- <patternset refid="ant1.todo.include"/>
+ basedir="${build.classes}"
+ descriptor="${manifest.dir}/ant1-ant-descriptor.xml" >
+ <patternset refid="ant1.todo.include"/>
</antlib-jar>
<antlib-jar jarfile="${build.ext}/selftest.atl"
- basedir="${build.classes}"
- manifest="${manifest.dir}/selftest.mf"
- descriptor="${gen.dir}/selftest-ant-descriptor.xml"
- rolesDescriptor="${gen.dir}/selftest-ant-roles.xml">
- <patternset refid="selftest.include"/>
+ basedir="${build.classes}"
+ manifest="${manifest.dir}/selftest.mf"
+ descriptor="${gen.dir}/selftest-ant-descriptor.xml"
+ rolesDescriptor="${gen.dir}/selftest-ant-roles.xml">
+ <patternset refid="selftest.include"/>
</antlib-jar>
<jar jarfile="${build.ext}/selftest-extension1.jar"
- basedir="${build.classes}"
- manifest="${manifest.dir}/selftest-extension1.mf">
- <patternset refid="selftest-extension1.include" />
+ basedir="${build.classes}"
+ manifest="${manifest.dir}/selftest-extension1.mf">
+ <patternset refid="selftest-extension1.include" />
</jar>
<!-- Simple cases handled by antlib.xml -->
<ant antfile="antlib.xml">
- <property name="antlib.name" value="core"/>
+ <property name="antlib.name" value="core"/>
</ant>
<ant antfile="antlib.xml">
- <property name="antlib.name" value="file"/>
+ <property name="antlib.name" value="file"/>
</ant>
<ant antfile="antlib.xml">
- <property name="antlib.name" value="archive"/>
+ <property name="antlib.name" value="archive"/>
</ant>
<ant antfile="antlib.xml">
- <property name="antlib.name" value="cvslib"/>
+ <property name="antlib.name" value="cvslib"/>
</ant>
<ant antfile="antlib.xml">
- <property name="antlib.name" value="nativelib"/>
+ <property name="antlib.name" value="nativelib"/>
</ant>
<ant antfile="antlib.xml">
- <property name="antlib.name" value="security"/>
+ <property name="antlib.name" value="security"/>
</ant>
<ant antfile="antlib.xml">
- <property name="antlib.name" value="runtime"/>
+ <property name="antlib.name" value="runtime"/>
</ant>
<ant antfile="antlib.xml">
- <property name="antlib.name" value="sound"/>
+ <property name="antlib.name" value="sound"/>
</ant>
<ant antfile="antlib.xml">
- <property name="antlib.name" value="vfile"/>
+ <property name="antlib.name" value="vfile"/>
</ant>
<ant antfile="antlib.xml">
- <property name="antlib.name" value="java"/>
+ <property name="antlib.name" value="java"/>
</ant>
</target>
@@ -517,9 +517,9 @@
<!-- Compile the unit tests -->
<mkdir dir="${test.classes}"/>
<javac srcdir="src/test"
- destdir="${test.classes}"
- debug="${debug}"
- deprecation="${deprecation}">
+ destdir="${test.classes}"
+ debug="${debug}"
+ deprecation="${deprecation}">
<classpath refid="project.class.path"/>
<exclude name="**/SmbFileSystemTestCase.java"
unless="jcifs.present"/>
<exclude name="**/FtpFileSystemTestCase.java"
unless="netcomp.present"/>
@@ -553,7 +553,7 @@
<!-- Prepare deployer tests -->
<property name="test.deployer.dir"
-
value="${test.working.dir}/org/apache/myrmidon/components/deployer/test"/>
+
value="${test.working.dir}/org/apache/myrmidon/components/deployer/test"/>
<mkdir dir="${test.deployer.dir}"/>
<jar jarfile="${test.deployer.dir}/test.atl">
<zipfileset dir="${test.deployer.dir}" prefix="META-INF"
includes="*.xml"/>
@@ -561,7 +561,7 @@
<!-- Prepare type factory tests -->
<property name="test.type.dir"
-
value="${test.working.dir}/org/apache/myrmidon/interfaces/type/test"/>
+
value="${test.working.dir}/org/apache/myrmidon/interfaces/type/test"/>
<mkdir dir="${test.type.dir}"/>
<jar jarfile="${test.type.dir}/types.jar">
<fileset dir="${test.classes}"
includes="org/apache/myrmidon/interfaces/type/test/MyType1.class"/>
@@ -569,15 +569,15 @@
<!-- Prepare the project tests -->
<antlib-descriptor libName="unittests"
- destdir="${gen.dir}"
- classpathref="project.class.path">
+ destdir="${gen.dir}"
+ classpathref="project.class.path">
<fileset dir="src/test">
<include name="org/apache/antlib/**"/>
<include name="org/apache/myrmidon/framework/**"/>
</fileset>
</antlib-descriptor>
<copy file="${gen.dir}/unittests-ant-descriptor.xml"
- tofile="${test.classes}/META-INF/ant-descriptor.xml"/>
+ tofile="${test.classes}/META-INF/ant-descriptor.xml"/>
<!-- Run all the tests -->
<junit printsummary="on" fork="true" failureProperty="test.failed">
@@ -611,10 +611,58 @@
<fail> - One or more tests failed.</fail>
</target>
+ <target name="checkstyle" description="Checkstyle">
+
+ <!-- this invocation of checkstyle requires that checkstyle be
downloaded and setup -->
+ <!-- thats why you are required to define do.checkstyle property to
generate the report -->
+ <taskdef name="checkstyle"
+ classname="com.puppycrawl.tools.checkstyle.CheckStyleTask">
+ <classpath refid="project.class.path"/>
+ </taskdef>
+ <checkstyle
+ lcurlyType="nl"
+ lcurlyMethod="nl"
+ lcurlyOther="nl"
+ rcurly="ignore"
+ allowProtected="false"
+ allowPackage="false"
+ allowNoAuthor="false"
+ maxLineLen="100"
+ maxMethodLen="100"
+ maxConstructorLen="100"
+ memberPattern="^m_[a-z][a-zA-Z0-9]*$"
+ staticPattern="^c_[a-z][a-zA-Z0-9]*$"
+ constPattern="(^c_[a-z][a-zA-Z0-9]*$)|([A-Z_]*$)"
+ ignoreImportLen="true"
+ allowTabs="false"
+ javadocScope="protected"
+ ignoreWhitespace="true"
+ cacheFile="checkstyle.cache"
+ failOnViolation="false"
+ ignoreCastWhitespace="true">
+ <fileset dir="${java.dir}">
+ <include name="**/*.java"/>
+ </fileset>
+ <formatter type="plain"/>
+ <formatter type="xml" toFile="build/checkstyle-results.xml"/>
+ </checkstyle>
+ </target>
+
+ <target name="checkstyle-report"
+ depends="checkstyle"
+ if="do.checkstyle"
+ description="Generate Checkstyle Report">
+
+ <mkdir dir="${build.reports}/checkstyle"/>
+ <style style="../../src/etc/checkstyle-frames.xsl"
in="build/checkstyle-results.xml"
+ out="${build.reports}/checkstyle/delete-me.html"/>
+
+ </target>
+
<!-- Creates the distribution -->
<target name="dist-lite"
- depends="jars"
- description="Generates a minimal working distribution.">
+ depends="jars"
+ description="Generates a minimal working distribution.">
<mkdir dir="${dist.bin}"/>
<mkdir dir="${dist.lib}"/>
@@ -651,7 +699,7 @@
</target>
<target name="dist-extralite"
- description="A faster version of dist-lite (no XDoclet).">
+ description="A faster version of dist-lite (no XDoclet).">
<property name="antlib-descriptors.omit" value="true"/>
<antcall target="dist-lite"/>
</target>
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
