1.1 --- a/make/build.xml Tue Mar 06 20:27:12 2012 +0000 1.2 +++ b/make/build.xml Wed Mar 07 13:11:27 2012 +0100 1.3 @@ -862,7 +862,8 @@ 1.4 source="${boot.javac.source}" 1.5 target="${boot.javac.target}" 1.6 executable="${boot.java.home}/bin/javac" 1.7 - srcdir="${make.tools.dir}/CompileProperties" 1.8 + srcdir="${make.tools.dir}" 1.9 + includes="compileproperties/* anttasks/CompileProperties*" 1.10 destdir="${build.toolclasses.dir}/" 1.11 classpath="${ant.core.lib}" 1.12 bootclasspath="${boot.java.home}/jre/lib/rt.jar" 1.13 @@ -870,7 +871,7 @@ 1.14 <compilerarg line="${javac.lint.opts}"/> 1.15 </javac> 1.16 <taskdef name="pcompile" 1.17 - classname="CompilePropertiesTask" 1.18 + classname="anttasks.CompilePropertiesTask" 1.19 classpath="${build.toolclasses.dir}/"/> 1.20 </target> 1.21 1.22 @@ -880,7 +881,8 @@ 1.23 source="${boot.javac.source}" 1.24 target="${boot.javac.target}" 1.25 executable="${boot.java.home}/bin/javac" 1.26 - srcdir="${make.tools.dir}/GenStubs" 1.27 + srcdir="${make.tools.dir}" 1.28 + includes="genstubs/* anttasks/GenStubs*" 1.29 destdir="${build.toolclasses.dir}/" 1.30 classpath="${ant.core.lib}" 1.31 includeantruntime="false"> 1.32 @@ -888,7 +890,7 @@ 1.33 <compilerarg line="${javac.lint.opts}"/> 1.34 </javac> 1.35 <taskdef name="genstubs" 1.36 - classname="GenStubs$$Ant" 1.37 + classname="anttasks.GenStubsTask" 1.38 classpath="${build.toolclasses.dir}/"/> 1.39 </target> 1.40