6965264: langtools build should use ${ant.core.lib} instead of ${ant.home}/lib/ant.jar

Mon, 13 Sep 2010 11:35:27 -0700

author
jjg
date
Mon, 13 Sep 2010 11:35:27 -0700
changeset 680
80505c2026e7
parent 679
fc73f83cd563
child 681
e92ae290fb47

6965264: langtools build should use ${ant.core.lib} instead of ${ant.home}/lib/ant.jar
Reviewed-by: mcimadamore
Contributed-by: jesse.glick@oracle.com

make/build.xml file | annotate | diff | comparison | revisions
     1.1 --- a/make/build.xml	Thu Sep 09 13:31:28 2010 -0700
     1.2 +++ b/make/build.xml	Mon Sep 13 11:35:27 2010 -0700
     1.3 @@ -621,7 +621,7 @@
     1.4          <genstubs
     1.5              srcdir="${import.jdk.src.dir}" destdir="${build.genstubs.dir}"
     1.6              includes="${import.jdk.stub.files}"
     1.7 -            fork="true" classpath="${build.toolclasses.dir}:${build.bootstrap.dir}/classes:${ant.home}/lib/ant.jar"
     1.8 +            fork="true" classpath="${build.toolclasses.dir}:${build.bootstrap.dir}/classes:${ant.core.lib}"
     1.9          />
    1.10      </target>
    1.11  
    1.12 @@ -813,7 +813,8 @@
    1.13                 executable="${boot.java.home}/bin/javac"
    1.14                 srcdir="${make.tools.dir}/CompileProperties"
    1.15                 destdir="${build.toolclasses.dir}/"
    1.16 -               classpath="${ant.home}/lib/ant.jar"/>
    1.17 +               classpath="${ant.core.lib}"
    1.18 +               includeantruntime="false"/>
    1.19          <taskdef name="pcompile"
    1.20                   classname="CompilePropertiesTask"
    1.21                   classpath="${build.toolclasses.dir}/"/>
    1.22 @@ -827,7 +828,8 @@
    1.23                 executable="${boot.java.home}/bin/javac"
    1.24                 srcdir="${make.tools.dir}/GenStubs"
    1.25                 destdir="${build.toolclasses.dir}/"
    1.26 -               classpath="${build.bootstrap.dir}/classes:${ant.home}/lib/ant.jar"/>
    1.27 +               classpath="${build.bootstrap.dir}/classes:${ant.core.lib}"
    1.28 +               includeantruntime="false"/>
    1.29          <taskdef name="genstubs"
    1.30                   classname="GenStubs$$Ant"
    1.31                   classpath="${build.toolclasses.dir}/"/>

mercurial