Mercurial > hg > openjdk > bsd-port > langtools
changeset 1104:23aadf169f08 7u0
- langtools check for when to build stub files is ok for 1.6, but fails with older 1.7 builds. Use a more recent class to detect when to build stub files so that older 1.7 builds can build newer 1.7 builds.
| author | kurt |
|---|---|
| date | Thu, 14 Jul 2011 21:53:20 -0400 |
| parents | c6bbd2dc1701 |
| children | 213f06472cd8 dbb3f73bbe95 |
| files | make/build.xml |
| diffstat | 1 files changed, 5 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/make/build.xml Mon Jun 27 22:08:20 2011 -0700 +++ b/make/build.xml Thu Jul 14 21:53:20 2011 -0400 @@ -169,10 +169,10 @@ in the build-bootstrap-classes macro. --> <available property="import.jdk.src.dir" value="${import.jdk}/src/share/classes" - filepath="${import.jdk}/src/share/classes" file="java/nio/file/Path.java"/> + filepath="${import.jdk}/src/share/classes" file="java/nio/file/StandardWatchEventKinds.java"/> <available property="import.jdk.jar" value="${import.jdk}/jre/lib/rt.jar" ignoresystemclasses="true" - classpath="${import.jdk}/jre/lib/rt.jar" classname="java.nio.file.Path"/> + classpath="${import.jdk}/jre/lib/rt.jar" classname="java.nio.file.StandardWatchEventKinds"/> <!-- Set the default bootclasspath option used for javac. Note that different variants of the option are used, meaning we can't just @@ -186,14 +186,9 @@ </condition> <condition property="boot.java.provides.latest.jdk"> - <and> - <available - ignoresystemclasses="true" - classpath="${boot.java.home}/jre/lib/rt.jar" classname="java.nio.file.Path"/> - <hasmethod - classpath="${boot.java.home}/jre/lib/rt.jar" - classname="java.nio.file.Path" method="getFileName"/> - </and> + <available + ignoresystemclasses="true" + classpath="${boot.java.home}/jre/lib/rt.jar" classname="java.nio.file.StandardWatchEventKinds"/> </condition> <condition property="bootstrap.exclude.files" value="" else="${require.latest.jdk.files}">