tapestry-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hls...@apache.org
Subject svn commit: r1130328 - in /tapestry/tapestry5/trunk: build.gradle settings.gradle tapestry-javadoc/build.gradle
Date Wed, 01 Jun 2011 22:34:32 GMT
Author: hlship
Date: Wed Jun  1 22:34:31 2011
New Revision: 1130328

URL: http://svn.apache.org/viewvc?rev=1130328&view=rev
Log:
TAP5-1528: Restore the tapestry-javadoc sub-project

Modified:
    tapestry/tapestry5/trunk/build.gradle
    tapestry/tapestry5/trunk/settings.gradle
    tapestry/tapestry5/trunk/tapestry-javadoc/build.gradle

Modified: tapestry/tapestry5/trunk/build.gradle
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/build.gradle?rev=1130328&r1=1130327&r2=1130328&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/build.gradle (original)
+++ tapestry/tapestry5/trunk/build.gradle Wed Jun  1 22:34:31 2011
@@ -33,8 +33,8 @@ subprojects {
     }
     
     configurations {
-		provided
-        deployerJars
+      provided
+     deployerJars
     }
 
     // See http://jira.codehaus.org/browse/GRADLE-784
@@ -91,12 +91,14 @@ subprojects {
     }
 }
 
+// Specific to top-level build, not set for subprojects:
+
 configurations {
   javadoc
 }
 
 dependencies {
-  // javadoc project(':tapestry-javadoc') -- temporarily removed
+  javadoc project(':tapestry-javadoc')
 }
 
 subprojects.each { evaluationDependsOn(it.name) }
@@ -146,4 +148,4 @@ task clean(type: Delete) {
   delete buildDirName
 }
 
-task continuousIntegration(dependsOn: [subprojects.build /* , 'aggregateJavadoc' */])
\ No newline at end of file
+task continuousIntegration(dependsOn: [subprojects.build, 'aggregateJavadoc'])
\ No newline at end of file

Modified: tapestry/tapestry5/trunk/settings.gradle
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/settings.gradle?rev=1130328&r1=1130327&r2=1130328&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/settings.gradle (original)
+++ tapestry/tapestry5/trunk/settings.gradle Wed Jun  1 22:34:31 2011
@@ -1,6 +1,6 @@
 include "plastic", "tapestry-annotations", "tapestry-test", "tapestry-func", "tapestry-ioc",
"tapestry-json", "tapestry-core"
 include "tapestry-hibernate-core", "tapestry-hibernate", "tapestry-jmx", "tapestry-upload",
"tapestry-spring"
 include "tapestry-beanvalidator", "tapestry-yuicompressor", "tapestry-jpa"
-// Temporarily removed: "tapestry-javadoc"
+include "tapestry-javadoc"
 // TODO (LATER): tapestry-component-report, quickstart
 

Modified: tapestry/tapestry5/trunk/tapestry-javadoc/build.gradle
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-javadoc/build.gradle?rev=1130328&r1=1130327&r2=1130328&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-javadoc/build.gradle (original)
+++ tapestry/tapestry5/trunk/tapestry-javadoc/build.gradle Wed Jun  1 22:34:31 2011
@@ -2,4 +2,17 @@ description = "JavaDoc Plugin for Tapest
 
 dependencies {
   compile project(':tapestry-core')
-}
\ No newline at end of file
+  compile files(getTools())
+}
+
+/** Returns the tools.jar/classes.jar of the Java runtime. */
+File getTools() {
+  def relpath = isMacOSX() ? "../classes/classes.jar" : "../lib/tools.jar"
+  
+  return new File(System.properties['java.home'], relpath)
+}
+
+boolean isMacOSX() {
+  System.properties['os.name'].toLowerCase().contains('mac os')
+}
+  



Mime
View raw message