diff options
| author | Vincent Hennebert <vhennebert@apache.org> | 2014-01-30 15:51:03 +0000 |
|---|---|---|
| committer | Vincent Hennebert <vhennebert@apache.org> | 2014-01-30 15:51:03 +0000 |
| commit | 3daf8eabb262dc4434bd13e1ee0901051f7d2059 (patch) | |
| tree | 72b77e2fc24b6ef14e398ff36e2b523623ab88df /build.xml | |
| parent | f8e822efe1de8bd8192dbb8ff035b9a79f876614 (diff) | |
| parent | cdc09052891898a46b70b3298c389e96ffff87ac (diff) | |
| download | xmlgraphics-fop-3daf8eabb262dc4434bd13e1ee0901051f7d2059.tar.gz xmlgraphics-fop-3daf8eabb262dc4434bd13e1ee0901051f7d2059.zip | |
Brought the branch in sync with rev. 1562429 of trunk
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/branches/Temp_FopFontsForSVG@1562866 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'build.xml')
| -rw-r--r-- | build.xml | 17 |
1 files changed, 8 insertions, 9 deletions
@@ -563,16 +563,17 @@ list of possible build targets. <include name="org/apache/fop/apps/Fop.class"/> <include name="org/apache/fop/apps/FOPException.class"/> <include name="org/apache/fop/apps/io/**"/> + <include name="org/apache/fop/area/AreaTreeControl*"/> <include name="org/apache/fop/complexscripts/fonts/*.class"/> <include name="org/apache/fop/complexscripts/util/GlyphTester.class"/> <include name="org/apache/fop/events/EventProducer.class"/> <include name="org/apache/fop/fo/Constants.class"/> <include name="org/apache/fop/fo/FOTreeBuilder.class"/> - <include name="org/apache/fop/area/AreaTreeControl*"/> + <include name="org/apache/fop/image/loader/batik/BatikImageFlavors*.class"/> <include name="org/apache/fop/svg/**"/> <include name="org/apache/fop/fonts/**"/> + <include name="org/apache/fop/render/shading/**"/> <include name="org/apache/fop/traits/MinOptMax.class"/> - <include name="org/apache/fop/image/loader/batik/BatikImageFlavors*.class"/> <include name="org/apache/fop/util/CMYKColorSpace*.class"/> <include name="org/apache/fop/util/Color*.class"/> <include name="org/apache/fop/util/ASCII*.class"/> @@ -1046,10 +1047,8 @@ NOTE: <!-- Checkstyle --> <!-- =================================================================== --> <property name="checkstyle.location" value="${lib-tools}/checkstyle-5.5-all.jar" /> - <property name="checkstyle.noframes.xslt" value="${basedir}/checkstyle-noframes.xsl" /> <property name="checkstyle.config" value="${basedir}/checkstyle-5.5.xml" /> <path id="checkstyle-classpath"> - <path refid="libs-build-classpath"/> <pathelement location="${checkstyle.location}"/> </path> <condition property="checkstyle.avail"> @@ -1057,20 +1056,18 @@ NOTE: <available classname="com.puppycrawl.tools.checkstyle.CheckStyleTask"> <classpath refid="checkstyle-classpath"/> </available> - <available file="${checkstyle.noframes.xslt}"/> <available file="${checkstyle.config}"/> </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="... please provide ${checkstyle.location}"/> - <echo message="... please provide ${checkstyle.noframes.xslt}"/> <echo message="... please provide ${checkstyle.config}"/> </target> <target name="checkstyle" depends="package, checkstyle-avail" if="checkstyle.avail" description="Runs Checkstyle for a code quality report"> <taskdef name="checkstyle" classname="com.puppycrawl.tools.checkstyle.CheckStyleTask" classpathref="checkstyle-classpath"/> <mkdir dir="${build.dir}"/> - <checkstyle config="${checkstyle.config}" failonviolation="false"> + <checkstyle config="${checkstyle.config}" failonviolation="true" maxWarnings="0"> <classpath> <path refid="checkstyle-classpath"/> <pathelement location="${build.classes.dir}"/> @@ -1078,9 +1075,10 @@ NOTE: <pathelement location="${build.codegen-classes.dir}"/> </classpath> <fileset dir="${src.dir}" includes="**/*.java"/> + <fileset dir="${test.dir}" includes="**/*.java"/> <formatter type="xml" toFile="${build.dir}/report_checkstyle.xml"/> + <formatter type="plain"/> </checkstyle> - <xslt in="${build.dir}/report_checkstyle.xml" out="${build.dir}/report_checkstyle.html" style="${checkstyle.noframes.xslt}"/> </target> <!-- =================================================================== --> <!-- PMD --> @@ -1092,6 +1090,7 @@ NOTE: <path refid="libs-tools-build-classpath"/> </classpath> </taskdef> + <mkdir dir="${build.dir}"/> <pmd shortFilenames="true" targetjdk="${javac.target}"> <ruleset>basic</ruleset> <ruleset>rulesets/migrating_to_14.xml</ruleset> @@ -1510,7 +1509,7 @@ NOTE: <!-- Special target for Gump --> <!-- =================================================================== --> <target name="gump" depends="package,transcoder-pkg"/> - <target name="gump-test" depends="junit-all"> + <target name="gump-test" depends="junit-all,checkstyle"> <fail> <condition> <or> |