Author: maartenc Date: Wed Sep 24 14:29:55 2008 New Revision: 698745 URL: http://svn.apache.org/viewvc?rev=698745&view=rev Log: FIX: build.xml: checkstyle + checkstyle-report dont work together (IVY-919)
Modified: ant/ivy/core/trunk/CHANGES.txt ant/ivy/core/trunk/build.xml Modified: ant/ivy/core/trunk/CHANGES.txt URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/CHANGES.txt?rev=698745&r1=698744&r2=698745&view=diff ============================================================================== --- ant/ivy/core/trunk/CHANGES.txt (original) +++ ant/ivy/core/trunk/CHANGES.txt Wed Sep 24 14:29:55 2008 @@ -87,6 +87,7 @@ - FIX: Resolve failed on certain proxy environment (IVY-911) - FIX: Ivy can't handle bare POM ${groupId} property (IVY-913) (thanks to Tom Widmer) - FIX: Properties needed to parse version in POM (IVY-914) (thanks to Tom Widmer) +- FIX: build.xml: checkstyle + checkstyle-report dont work together (IVY-919) 2.0.0-rc1 ===================================== Modified: ant/ivy/core/trunk/build.xml URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/build.xml?rev=698745&r1=698744&r2=698745&view=diff ============================================================================== --- ant/ivy/core/trunk/build.xml (original) +++ ant/ivy/core/trunk/build.xml Wed Sep 24 14:29:55 2008 @@ -540,7 +540,7 @@ </apply> </target> - <target name="checkstyle" depends="jar" description="checks Ivy codebase according to ${checkstyle.src.dir}/checkstyle-config"> + <target name="checkstyle-internal" depends="jar" description="checks Ivy codebase according to ${checkstyle.src.dir}/checkstyle-config"> <ivy:cachepath organisation="checkstyle" module="checkstyle" revision="4.3" inline="true" conf="default" pathid="checkstyle.classpath" transitive="true" log="download-only"/> @@ -560,11 +560,14 @@ <include name="**/*.java" /> </fileset> </checkstyle> + </target> + + <target name="checkstyle" depends="checkstyle-internal" description="checks Ivy codebase according to ${checkstyle.src.dir}/checkstyle-config"> <fail if="checkstyle.failed" message="Checkstyle has errors. See report in ${checkstyle.report.dir}" /> </target> - <target name="checkstyle-report" depends="checkstyle"> + <target name="checkstyle-report" depends="checkstyle-internal"> <property name="checkstyle.basedir" location="${src.dir}" /> <xslt in="${checkstyle.report.dir}/checkstyle.xml" style="${checkstyle.src.dir}/checkstyle-frames.xsl"