Mercurial > hg > openjdk > jdk7 > langtools
changeset 679:80505c2026e7
6965264: langtools build should use ${ant.core.lib} instead of ${ant.home}/lib/ant.jar
Reviewed-by: mcimadamore
Contributed-by: jesse.glick@oracle.com
author | jjg |
---|---|
date | Mon, 13 Sep 2010 11:35:27 -0700 |
parents | fc73f83cd563 |
children | e92ae290fb47 |
files | make/build.xml |
diffstat | 1 files changed, 5 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/make/build.xml Thu Sep 09 13:31:28 2010 -0700 +++ b/make/build.xml Mon Sep 13 11:35:27 2010 -0700 @@ -621,7 +621,7 @@ <genstubs srcdir="${import.jdk.src.dir}" destdir="${build.genstubs.dir}" includes="${import.jdk.stub.files}" - fork="true" classpath="${build.toolclasses.dir}:${build.bootstrap.dir}/classes:${ant.home}/lib/ant.jar" + fork="true" classpath="${build.toolclasses.dir}:${build.bootstrap.dir}/classes:${ant.core.lib}" /> </target> @@ -813,7 +813,8 @@ executable="${boot.java.home}/bin/javac" srcdir="${make.tools.dir}/CompileProperties" destdir="${build.toolclasses.dir}/" - classpath="${ant.home}/lib/ant.jar"/> + classpath="${ant.core.lib}" + includeantruntime="false"/> <taskdef name="pcompile" classname="CompilePropertiesTask" classpath="${build.toolclasses.dir}/"/> @@ -827,7 +828,8 @@ executable="${boot.java.home}/bin/javac" srcdir="${make.tools.dir}/GenStubs" destdir="${build.toolclasses.dir}/" - classpath="${build.bootstrap.dir}/classes:${ant.home}/lib/ant.jar"/> + classpath="${build.bootstrap.dir}/classes:${ant.core.lib}" + includeantruntime="false"/> <taskdef name="genstubs" classname="GenStubs$$Ant" classpath="${build.toolclasses.dir}/"/>