changeset 4836:903908477a58 8.0-b105

RT-32564: javadoc build failure after fix for RT-32004 Backed out changeset ec7f003e2214
author kcr
date Tue, 27 Aug 2013 11:46:26 -0700
parents b92a762b41da
children f2ea75d88413 7f98f57fecd2 6c72b0975d08
files build.gradle
diffstat 1 files changed, 2 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/build.gradle	Tue Aug 27 09:36:40 2013 -0700
+++ b/build.gradle	Tue Aug 27 11:46:26 2013 -0700
@@ -1677,9 +1677,9 @@
     def projectsToDocument = [
             project(":base"), project(":graphics"), project(":controls"),
             project(":swing"), project(":swt"), project(":fxml"), project(":web")]
-    source = projectsToDocument.collect({
+    source(projectsToDocument.collect({
         [it.sourceSets.main.java, "$it.buildDir/generated-src/builders"]
-    });
+    }));
     setDestinationDir(new File(buildDir, 'javadoc'));
     // Might need a classpath
     classpath = files(projectsToDocument.collect { project ->
@@ -1688,13 +1688,6 @@
     classpath += files(projectsToDocument.collect { project ->
         project.sourceSets.main.output
     });
-
-    // TODO: temporary for javadoc build until media is open sourced
-    if (BUILD_CLOSED) {
-        source += fileTree(dir: "$mediaApiDir").include('**/*.java')
-        classpath += files("modules/media/build/classes/main")
-    }
-
     exclude("com/**/*", "javafx/scene/ParentDesignInfo*", "Compile*", "javafx/builder/**/*");
     options.windowTitle("JavaFX ${RELEASE_NAME}")
     options.links(JDK_DOCS);