diff options
| author | Maximilian Berger <maxberger@apache.org> | 2009-10-13 13:04:51 +0000 |
|---|---|---|
| committer | Maximilian Berger <maxberger@apache.org> | 2009-10-13 13:04:51 +0000 |
| commit | a267cc5fa78c67e2b6257a9b54c0726a18b1a51b (patch) | |
| tree | 5218cc54cc684148ed55027e60467fa7f390988c /build.xml | |
| parent | c14b33ab1d48584e33e4cec1ece99edf8c3c01d4 (diff) | |
| download | xmlgraphics-fop-a267cc5fa78c67e2b6257a9b54c0726a18b1a51b.tar.gz xmlgraphics-fop-a267cc5fa78c67e2b6257a9b54c0726a18b1a51b.zip | |
Updated ant to run checkstyle 5. This is now supported in lib/build rather than the previously used checkstyle.home
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@824735 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'build.xml')
| -rw-r--r-- | build.xml | 33 |
1 files changed, 20 insertions, 13 deletions
@@ -110,9 +110,10 @@ list of possible build targets. <include name="*.jar"/> </fileset> </path> + <property name="lib-build-tools" value="${basedir}/lib/build"/> <path id="libs-build-tools-classpath"> <path refid="libs-build-classpath"/> - <fileset dir="${basedir}/lib/build"> + <fileset dir="${lib-build-tools}"> <include name="*.jar"/> </fileset> </path> @@ -1139,19 +1140,25 @@ NOTE: <!-- =================================================================== --> <!-- Checkstyle --> <!-- =================================================================== --> - <property name="checkstyle.lib" value="${checkstyle.home.dir}"/> - <property name="checkstyle.noframes.xslt" value="${checkstyle.home.dir}/contrib/checkstyle-noframes.xsl"/> - <path id="libs-checkstyle"> - <fileset dir="${checkstyle.lib}"> - <include name="*.jar"/> - </fileset> - </path> - <target name="checkstyle-avail" unless="checkstyle.home.dir"> - <echo message="Checkstyle Support NOT Present. Please download it from http://checkstyle.sf.net/ and set checkstyle.home.dir in build-local.properties"/> + <property name="checkstyle.noframes.xslt" value="${basedir}/checkstyle-noframes.xsl" /> + <condition property="checkstyle.avail"> + <and> + <available classname="com.puppycrawl.tools.checkstyle.CheckStyleTask"> + <classpath> + <path refid="libs-build-tools-classpath"/> + </classpath> + </available> + <available file="${checkstyle.noframes.xslt}"/> + </and> + </condition> + <target name="checkstyle-avail" unless="checkstyle.avail"> + <echo message="Checkstyle support NOT present. Please download it from http://checkstyle.sf.net/ and"/> + <echo message="..copy or link checkstyle-all-5.0.jar to ${lib-build-tools}"/> + <echo message="..copy or link checkstyle-noframes.xsl to ${checkstyle.noframes.xslt}"/> </target> - <target name="checkstyle" depends="init, checkstyle-avail" if="checkstyle.home.dir" description="Runs Checkstyle for a code quality report"> - <taskdef name="checkstyle" classname="com.puppycrawl.tools.checkstyle.CheckStyleTask" classpathref="libs-checkstyle"/> - <checkstyle config="checkstyle-4.0.xml" failonviolation="false"> + <target name="checkstyle" depends="init, checkstyle-avail" if="checkstyle.avail" description="Runs Checkstyle for a code quality report"> + <taskdef name="checkstyle" classname="com.puppycrawl.tools.checkstyle.CheckStyleTask" classpathref="libs-build-tools-classpath"/> + <checkstyle config="checkstyle-5.0.xml" failonviolation="false"> <fileset dir="${src.java.dir}" includes="**/*.java"/> <formatter type="xml" toFile="${build.dir}/report_checkstyle.xml"/> </checkstyle> |