git commit: Fix build now that Mac JDK 1.7 has JavaDoc tools library in right place

[hl...@apache.org]

Updated Branches:
  refs/heads/master 68a68e1e6 -> e9cf9bc44


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/e9cf9bc4
Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/e9cf9bc4
Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/e9cf9bc4

Branch: refs/heads/master
Commit: e9cf9bc44318364cf659e53d62ed54f1f058c3f4
Parents: 68a68e1
Author: Howard M. Lewis Ship <hl...@apache.org>
Authored: Tue Jun 5 13:33:42 2012 -0700
Committer: Howard M. Lewis Ship <hl...@apache.org>
Committed: Tue Jun 5 14:03:13 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/e9cf9bc4/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.")
 }