Fix build now that Mac JDK 1.7 has JavaDoc tools library in right place
Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/c6190c23 Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/c6190c23 Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/c6190c23 Branch: refs/heads/5.3 Commit: c6190c23fb18db4956e622152c7b1025ca6e7c47 Parents: 2c303a4 Author: Howard M. Lewis Ship <[email protected]> Authored: Tue Jun 5 13:33:42 2012 -0700 Committer: Howard M. Lewis Ship <[email protected]> Committed: Tue Jun 5 13:33:42 2012 -0700 ---------------------------------------------------------------------- tapestry-javadoc/build.gradle | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/c6190c23/tapestry-javadoc/build.gradle ---------------------------------------------------------------------- diff --git a/tapestry-javadoc/build.gradle b/tapestry-javadoc/build.gradle index 76785cb..e861f3e 100644 --- a/tapestry-javadoc/build.gradle +++ b/tapestry-javadoc/build.gradle @@ -7,12 +7,13 @@ dependencies { /** Returns the tools.jar/classes.jar of the Java runtime. */ File getTools() { - def relpath = isMacOSX() ? "../classes/classes.jar" : "../lib/tools.jar" - + def relpath = isMacOSX_1_6() ? "../classes/classes.jar" : "../lib/tools.jar" + return new File(System.properties['java.home'], relpath) } -boolean isMacOSX() { - System.properties['os.name'].toLowerCase().contains('mac os') +boolean isMacOSX_1_6() { + System.properties['os.name'].toLowerCase().contains('mac os') && + System.properties['java.version'].startsWith("1.6.") }
