1.1 --- a/make/build.xml Fri May 30 11:08:40 2008 +0100
1.2 +++ b/make/build.xml Tue Jun 03 13:26:47 2008 -0700
1.3 @@ -136,7 +136,7 @@
1.4 <arg value="-html:${findbugs.home}/src/xsl/fancy.xsl"/>
1.5 <arg value="${dist.findbugs.dir}/findbugs.xml"/>
1.6 <redirector output="${dist.findbugs.dir}/findbugs.html"/>
1.7 - </exec>
1.8 + </exec>
1.9 </target>
1.10
1.11 <target name="coverage" depends="-def-cobertura,build-all-classes,instrument-classes,jtreg,coverage-report"/>
1.12 @@ -301,14 +301,15 @@
1.13 jarmainclass="sun.tools.javap.Main"/>
1.14 </target>
1.15
1.16 - <target name="build-classes-javap" depends="build-bootstrap-javac">
1.17 + <target name="build-classes-javap" depends="build-classes-javac">
1.18 <build-classes name="javap" includes="${javap.includes}"/>
1.19 </target>
1.20
1.21 - <target name="build-javap" depends="build-bootstrap-javac">
1.22 + <target name="build-javap" depends="build-javac">
1.23 <build-tool name="javap"
1.24 includes="${javap.includes}"
1.25 - jarmainclass="sun.tools.javap.Main"/>
1.26 + jarmainclass="sun.tools.javap.Main"
1.27 + jarclasspath="javac.jar"/>
1.28 </target>
1.29
1.30 <!-- (no javadoc for javap) -->
1.31 @@ -480,7 +481,7 @@
1.32 destdir="@{gensrc.dir}"
1.33 includes="@{includes}"/>
1.34 <copy todir="@{gensrc.dir}">
1.35 - <fileset dir="${src.classes.dir}" includes="${javac.includes}"/>
1.36 + <fileset dir="${src.classes.dir}" includes="@{includes}"/>
1.37 <globmapper from="*.properties-template" to="*.properties"/>
1.38 <filterset begintoken="$(" endtoken=")">
1.39 <filter token="JDK_VERSION" value="${jdk.version}"/>
