From: <ls...@us...> - 2008-08-22 19:55:25
|
Revision: 4482 http://jnode.svn.sourceforge.net/jnode/?rev=4482&view=rev Author: lsantha Date: 2008-08-22 19:55:21 +0000 (Fri, 22 Aug 2008) Log Message: ----------- Added support for transitional checks. Modified Paths: -------------- trunk/all/build.xml Added Paths: ----------- trunk/all/new_checks.xml Modified: trunk/all/build.xml =================================================================== --- trunk/all/build.xml 2008-08-22 13:56:04 UTC (rev 4481) +++ trunk/all/build.xml 2008-08-22 19:55:21 UTC (rev 4482) @@ -401,7 +401,7 @@ </target> <!-- Create a bootable CDROM image for x86 32-bits --> - <target name="cd-x86-lite" depends="assemble"> + <target name="cd-x86-lite" depends="assemble" description="create a bootable JNode CD image"> <x86-build bits="32" target="java-image"/> <property name="jnode.bits" value="32" /> <ant antfile="build-x86.xml" inheritall="true" inheritrefs="true" target="cdrom-lite"/> @@ -750,8 +750,7 @@ </cp-compare> </target> - <target name="openjdk-annotate" depends="assemble-projects" - description="add annotations to compiled openjdk classes"> + <target name="openjdk-annotate" depends="assemble-projects"> <echo message="openjdk-annotate"/> <taskdef name="oj-annotate" classname="org.jnode.ant.taskdefs.AnnotateTask" classpathref="cp-jnode"/> @@ -886,7 +885,7 @@ </target> - <target name="checkstyle" description="Generates a report of code convention violations."> + <target name="checkstyle" description="check the mandatory code conventions"> <taskdef resource="checkstyletask.properties" classpath="../core/lib/checkstyle-all-4.4.jar"/> <checkstyle config="jnode_checks.xml"> <fileset dir="../builder/src/builder" includes="**/*.java"/> @@ -913,6 +912,37 @@ </checkstyle> </target> + <target name="checkstyle-new" description="check the recommanded code conventions"> + <taskdef resource="checkstyletask.properties" classpath="../core/lib/checkstyle-all-4.4.jar"/> + <checkstyle config="new_checks.xml"> + <!-- + <fileset dir="../builder/src/builder" includes="**/*.java"/> + <fileset dir="../builder/src/configure" includes="**/*.java"/> + <fileset dir="../core/src/core" includes="**/*.java"/> + <fileset dir="../core/src/driver" includes="**/*.java"/> + <fileset dir="../core/src/test" includes="**/*.java"/> + --> + <fileset dir="../distr/src/apps" includes="**/*.java"/> + <fileset dir="../distr/src/emu" includes="**/*.java"/> + <fileset dir="../distr/src/install" includes="**/*.java"/> + <fileset dir="../distr/src/test" includes="**/*.java"/> + <!-- + <fileset dir="../fs/src/fs" includes="**/*.java"/> + <fileset dir="../fs/src/driver" includes="**/*.java"/> + <fileset dir="../fs/src/test" includes="**/*.java"/> + <fileset dir="../gui/src/test" includes="**/*.java"/> + <fileset dir="../gui/src/desktop" includes="**/*.java"/> + <fileset dir="../gui/src/driver" includes="**/*.java"/> + <fileset dir="../gui/src/awt" includes="**/*.java"/> + <fileset dir="../net/src/net" includes="**/*.java"/> + <fileset dir="../net/src/driver" includes="**/*.java"/> + <fileset dir="../net/src/test" includes="**/*.java"/> + <fileset dir="../shell/src/test" includes="**/*.java"/> + <fileset dir="../shell/src/shell" includes="**/*.java"/> + --> + </checkstyle> + </target> + <!-- Create a patch --> <!-- TODO create replacement SVN task <target name="create-patch"> Added: trunk/all/new_checks.xml =================================================================== --- trunk/all/new_checks.xml (rev 0) +++ trunk/all/new_checks.xml 2008-08-22 19:55:21 UTC (rev 4482) @@ -0,0 +1,145 @@ +<?xml version="1.0"?> +<!DOCTYPE module PUBLIC + "-//Puppy Crawl//DTD Check Configuration 1.2//EN" + "http://www.puppycrawl.com/dtds/configuration_1_2.dtd"> + +<!-- + + Checkstyle configuration that checks the sun coding conventions from: + + - the Java Language Specification at + http://java.sun.com/docs/books/jls/second_edition/html/index.html + + - the Sun Code Conventions at http://java.sun.com/docs/codeconv/ + + - the Javadoc guidelines at + http://java.sun.com/j2se/javadoc/writingdoccomments/index.html + + - the JDK Api documentation http://java.sun.com/j2se/docs/api/index.html + + - some best practices + + Checkstyle is very configurable. Be sure to read the documentation at + http://checkstyle.sf.net (or in your downloaded distribution). + + Most Checks are configurable, be sure to consult the documentation. + + To completely disable a check, just comment it out or delete it from the file. + + Finally, it is worth reading the documentation. + +--> + +<module name="Checker"> + + <!-- Checks that a package.html file exists for each package. --> + <!-- See http://checkstyle.sf.net/config_javadoc.html#PackageHtml --> + <module name="PackageHtml"/> + + <!-- Checks that property files contain the same keys. --> + <!-- See http://checkstyle.sf.net/config_misc.html#Translation --> +<!-- <module name="Translation"/> --> + + + <module name="TreeWalker"> + + <!-- Checks for Javadoc comments. --> + <!-- See http://checkstyle.sf.net/config_javadoc.html --> + <module name="JavadocType"/> + <module name="JavadocMethod"/> + <module name="JavadocVariable"/> + <module name="JavadocStyle"/> + + + <!-- Checks for Naming Conventions. --> + <!-- See http://checkstyle.sf.net/config_naming.html --> +<!-- <module name="ConstantName"/> + <module name="LocalFinalVariableName"/> + <module name="LocalVariableName"/> + <module name="MemberName"/> + <module name="MethodName"/> + <module name="PackageName"/> + <module name="ParameterName"/> + <module name="StaticVariableName"/> + <module name="TypeName"/> --> + + + <!-- Checks for Headers --> + <!-- See http://checkstyle.sf.net/config_header.html --> + <!-- <module name="Header"> --> + <!-- The follow property value demonstrates the ability --> + <!-- to have access to ANT properties. In this case it uses --> + <!-- the ${basedir} property to allow Checkstyle to be run --> + <!-- from any directory within a project. See property --> + <!-- expansion, --> + <!-- http://checkstyle.sf.net/config.html#properties --> + <!-- <property --> + <!-- name="headerFile" --> + <!-- value="${basedir}/java.header"/> --> + <!-- </module> --> + + <!-- Following interprets the header file as regular expressions. --> + <!-- <module name="RegexpHeader"/> --> + + + <!-- Checks for imports --> + <!-- See http://checkstyle.sf.net/config_import.html --> +<!-- <module name="IllegalImport"/> --><!-- defaults to sun.* packages --> + + <!-- Checks for Size Violations. --> + <!-- See http://checkstyle.sf.net/config_sizes.html --> +<!-- <module name="FileLength"/> + <module name="MethodLength"/> + <module name="ParameterNumber"/> --> + + <!-- Checks for whitespace --> + <!-- See http://checkstyle.sf.net/config_whitespace.html --> + <!--<module name="OperatorWrap"> + <property name="option" value="eol"/> + </module>--> + <!-- Modifier Checks --> + <!-- See http://checkstyle.sf.net/config_modifiers.html --> +<!-- <module name="RedundantModifier"/> --> + + <!-- Checks for blocks. You know, those {}'s --> + <!-- See http://checkstyle.sf.net/config_blocks.html --> + <!--module name="NeedBraces"/--> + + <!-- Checks for common coding problems --> + <!-- See http://checkstyle.sf.net/config_coding.html --> +<!-- <module name="AvoidInlineConditionals"/> + <module name="DoubleCheckedLocking"/> + <module name="EmptyStatement"/> + <module name="EqualsHashCode"/> + <module name="HiddenField"/> + <module name="IllegalInstantiation"/> + <module name="InnerAssignment"/> + <module name="MagicNumber"/> + <module name="MissingSwitchDefault"/> + <module name="RedundantThrows"/> + <module name="SimplifyBooleanExpression"/> + <module name="SimplifyBooleanReturn"/> --> + + <!-- Checks for class design --> + <!-- See http://checkstyle.sf.net/config_design.html --> +<!-- <module name="DesignForExtension"/> + <module name="FinalClass"/> + <module name="HideUtilityClassConstructor"/> + <module name="InterfaceIsType"/> + <module name="VisibilityModifier"/> --> + + + <!-- Miscellaneous other checks. --> + <!-- See http://checkstyle.sf.net/config_misc.html --> +<!-- <module name="ArrayTypeStyle"/> + <module name="FinalParameters"/> + <module name="GenericIllegalRegexp"> + <property name="format" value="\s+$"/> + <property name="message" value="Line has trailing spaces."/> + </module> + <module name="TodoComment"/> + <module name="UpperEll"/> --> + + </module> + +</module> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |