Skip to content

Commit 6b67bb4

Browse files
committed
RVM-300: Only ensure that checkstyle is downloaded if we are actually
going to do the checkstyle target. Patch from Erik Brangs.
1 parent d21ecb5 commit 6b67bb4

File tree

1 file changed

+6
-2
lines changed

1 file changed

+6
-2
lines changed

build.xml

+6-2
Original file line numberDiff line numberDiff line change
@@ -274,7 +274,6 @@
274274
<ant antfile="build/components/dacapo.xml" target="ensure"/>
275275
</sequential>
276276
</if>
277-
<ant antfile="build/components/checkstyle.xml" target="ensure"/>
278277
<ant antfile="build/components/asm.xml" target="ensure"/>
279278
<if>
280279
<conditions>
@@ -2060,6 +2059,11 @@ target.jni-suffix=${target.jni-suffix}
20602059
<!-- * * -->
20612060
<!-- **************************************************************************** -->
20622061

2062+
<target name="ensure-checkstyle">
2063+
<ant antfile="build/components/checkstyle.xml" target="ensure"/>
2064+
<property file="${components.file}"/>
2065+
</target>
2066+
20632067
<target name="do-checkstyle">
20642068
<if>
20652069
<conditions>
@@ -2071,7 +2075,7 @@ target.jni-suffix=${target.jni-suffix}
20712075
</if>
20722076
</target>
20732077

2074-
<target name="checkstyle" depends="prepare-source,prepare-config-source,choose-classlib">
2078+
<target name="checkstyle" depends="prepare-source,prepare-config-source,choose-classlib,ensure-checkstyle">
20752079
<taskdef resource="checkstyletask.properties" classpath="${checkstyle.dir}/checkstyle-5.3-all.jar"/>
20762080

20772081
<mkdir dir="${build.dir}/checkstyle"/>

0 commit comments

Comments
 (0)