From 60fd02582d24c9b2b08ff40c29db0922cf552519 Mon Sep 17 00:00:00 2001 From: Greg Schueler Date: Sat, 29 Mar 2014 16:53:20 -0700 Subject: [PATCH] Add storage lib javadocs to exported docs --- Makefile | 4 ++-- build.gradle | 22 +++++++++++++++------- 2 files changed, 17 insertions(+), 9 deletions(-) diff --git a/Makefile b/Makefile index 031e1a8426e..aa17194c0bb 100644 --- a/Makefile +++ b/Makefile @@ -58,9 +58,9 @@ deb: app #doc build javadoc: - cd core; ./gradlew $(PROXY_DEFS) -Psnapshot -PbuildNum=$(RELEASE) javadoc + ./gradlew $(PROXY_DEFS) -Psnapshot -PbuildNum=$(RELEASE) alljavadoc mkdir -p docs/en/dist/html - cp -r core/build/docs/javadoc docs/en/dist/html/ + cp -r build/docs/javadoc docs/en/dist/html/ #clean various components diff --git a/build.gradle b/build.gradle index 10aacaf2b7e..3dcf0d8362f 100644 --- a/build.gradle +++ b/build.gradle @@ -5,6 +5,7 @@ * artifacts, however it allows us to set defaults for the subjects and provides * Groovy syntax highlighting for gradle build files (like this one) **/ + import org.gradle.plugins.signing.Sign buildscript { repositories { mavenCentral() @@ -51,6 +52,13 @@ subprojects { ext.isDevBuild=true } } +def exportedProjects= [ + ":core", + ":rundeck-storage:rundeck-storage-api", + ":rundeck-storage:rundeck-storage-data", + ":rundeck-storage:rundeck-storage-filesys", + ":rundeck-storage:rundeck-storage-conf" +] task wrapper(type: Wrapper) { gradleVersion = '1.10' @@ -77,13 +85,7 @@ gradle.taskGraph.whenReady { taskGraph -> } //subproject libs that are uploaded to maven central -[ - ":core", - ":rundeck-storage:rundeck-storage-api", - ":rundeck-storage:rundeck-storage-data", - ":rundeck-storage:rundeck-storage-filesys", - ":rundeck-storage:rundeck-storage-conf" -].each { +exportedProjects.each { project(it) { apply from: "${rootDir}/gradle/java.gradle" apply plugin: 'signing' @@ -175,3 +177,9 @@ gradle.taskGraph.whenReady { taskGraph -> } } } + +task alljavadoc(type: Javadoc) { + source exportedProjects.collect { project(it).sourceSets.main.allJava } + classpath = files(exportedProjects.collect { project(it).sourceSets.main.compileClasspath }) + destinationDir = file("${buildDir}/docs/javadoc") +}