From 7777548d67757e85a06b214bf70ee8a485ffe984 Mon Sep 17 00:00:00 2001 From: Justin Steffy Date: Thu, 31 Jul 2014 17:41:35 -0500 Subject: [PATCH 1/3] Refactor pieces of build into `site`. Some of these things go together and should live together. --- build.gradle | 30 +----------------------------- gradle/site.gradle | 30 ++++++++++++++++++++++++++++-- 2 files changed, 29 insertions(+), 31 deletions(-) diff --git a/build.gradle b/build.gradle index f3a6c5d..42e0329 100644 --- a/build.gradle +++ b/build.gradle @@ -21,9 +21,8 @@ apply plugin: 'java' apply plugin: 'eclipse' apply plugin: 'idea' apply plugin: 'fatjar' -apply plugin: 'github-pages' apply plugin: 'maven' -apply plugin: 'me.champeau.jbake' +apply from: 'gradle/site.gradle' sourceCompatibility = 1.6 targetCompatibility = 1.6 @@ -103,30 +102,3 @@ idea { scopes.COMPILE.plus += configurations.integrationCompile } } - -task makeDist(dependsOn: ['clean', 'javadoc'], type: Zip) { - from("README.md") - from("LICENSE") - from jar.outputs.files - into("javadoc/") { - from javadoc.destinationDir - } - into("examples/") { - from("src/examples/java") - } - into("docs/") { - from("docs/") - } -} - -apply from: 'gradle/site.gradle' - -githubPages { - repoUri = 'https://github.com/orgsync/orgsync-api-java.git' - - pages { - from(jbake.output) { - into '.' - } - } -} diff --git a/gradle/site.gradle b/gradle/site.gradle index c8e8460..2156af1 100644 --- a/gradle/site.gradle +++ b/gradle/site.gradle @@ -11,6 +11,9 @@ buildscript { } } +apply plugin: 'me.champeau.jbake' +apply plugin: 'github-pages' + def siteDir = 'site' def siteBuildDir = "$buildDir/site" def siteOutDir = "$buildDir/jbaked" @@ -138,14 +141,37 @@ task copyJavadoc(dependsOn: 'javadoc', type: Copy) { into(file(javadocDir)) } +task makeDist(dependsOn: ['clean', 'javadoc'], type: Zip) { + from("README.md") + from("LICENSE") + from jar.outputs.files + into("javadoc/") { + from javadoc.destinationDir + } + into("examples/") { + from("src/examples/java") + } + into("docs/") { + from("site/docs/") + } +} + task copyDist(dependsOn: 'makeDist', type: Copy) { from tasks['makeDist'].archivePath into(file(assertVersionDir)) } -task copy - jbake.dependsOn(convertPages) jbake.dependsOn(convertDocs) jbake.dependsOn(copyJavadoc) jbake.dependsOn(copyDist) + +githubPages { + repoUri = 'https://github.com/orgsync/orgsync-api-java.git' + + pages { + from(jbake.output) { + into '.' + } + } +} From 7470b1a33de014a52bb96ae7a18da5a3b85324f5 Mon Sep 17 00:00:00 2001 From: Justin Steffy Date: Thu, 31 Jul 2014 17:45:11 -0500 Subject: [PATCH 2/3] rename site.gradle to publish.gradle --- build.gradle | 2 +- gradle/{site.gradle => publish.gradle} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename gradle/{site.gradle => publish.gradle} (100%) diff --git a/build.gradle b/build.gradle index 42e0329..799ef0a 100644 --- a/build.gradle +++ b/build.gradle @@ -22,7 +22,7 @@ apply plugin: 'eclipse' apply plugin: 'idea' apply plugin: 'fatjar' apply plugin: 'maven' -apply from: 'gradle/site.gradle' +apply from: 'gradle/publish.gradle' sourceCompatibility = 1.6 targetCompatibility = 1.6 diff --git a/gradle/site.gradle b/gradle/publish.gradle similarity index 100% rename from gradle/site.gradle rename to gradle/publish.gradle From 12fb710fee15d0e055c3aa608c13d2f1322c56e1 Mon Sep 17 00:00:00 2001 From: Justin Steffy Date: Thu, 31 Jul 2014 19:27:51 -0500 Subject: [PATCH 3/3] Update `makeDist` to render the docs to HTML. + Remove the config of the standard `jbake` task + Create a new task that extends `JBakeTask` to create just docs and javadoc + Update `makeDist` to copy contents of this half-baked site + Make a new task `generateSite` to bake the whole site + Make sure `copySite` happens after any `clean`... otherwise things are missing --- gradle/publish.gradle | 61 +++++++++++++++++++++++++------------------ 1 file changed, 35 insertions(+), 26 deletions(-) diff --git a/gradle/publish.gradle b/gradle/publish.gradle index 2156af1..2df5619 100644 --- a/gradle/publish.gradle +++ b/gradle/publish.gradle @@ -1,4 +1,5 @@ import groovy.text.SimpleTemplateEngine +import me.champeau.gradle.JBakeTask buildscript { repositories { @@ -31,17 +32,11 @@ def siteBaseHref = { } } -jbake { - input = file(siteBuildDir) - output = file(siteOutDir) - clearCache = true - - configuration['base_href'] = siteBaseHref() -} - task copySite(type: Copy) { from(file(siteDir)) into(siteBuildDir) + + shouldRunAfter 'clean' } def pagesBinding = [ @@ -67,7 +62,6 @@ task convertPages(dependsOn: copySite) << { } def findDocs() { - println "Running find docs" new File('site/docs').listFiles().sort{ it.name }.collect { file -> def pattern = ~/(\d+)-(\S+).md/ def match = file.name =~ pattern @@ -136,35 +130,50 @@ task convertDocs(dependsOn: copySite) << { createIndex(docs, docsDir) } -task copyJavadoc(dependsOn: 'javadoc', type: Copy) { +task copyJavadoc(dependsOn: ['javadoc', 'copySite'], type: Copy) { from javadoc.destinationDir into(file(javadocDir)) } -task makeDist(dependsOn: ['clean', 'javadoc'], type: Zip) { - from("README.md") - from("LICENSE") - from jar.outputs.files - into("javadoc/") { - from javadoc.destinationDir - } - into("examples/") { - from("src/examples/java") +task generateDocs(type: JBakeTask) { + dependsOn convertDocs + dependsOn copyJavadoc + + input = file(siteBuildDir) + output = file(siteOutDir) + clearCache = true + + configuration['base_href'] = siteBaseHref() +} + +task makeDist(dependsOn: ['clean', 'generateDocs'], type: Zip) { + from('README.md') + from('LICENSE') + into('examples/') { + from('src/examples/java') } - into("docs/") { - from("site/docs/") + into('.') { + from(file(new File(siteOutDir, "versions/$version"))) } } -task copyDist(dependsOn: 'makeDist', type: Copy) { +task copyDist(dependsOn: ['makeDist', 'copySite'], type: Copy) { from tasks['makeDist'].archivePath into(file(assertVersionDir)) } -jbake.dependsOn(convertPages) -jbake.dependsOn(convertDocs) -jbake.dependsOn(copyJavadoc) -jbake.dependsOn(copyDist) +task generateSite(type: JBakeTask) { + dependsOn convertPages + dependsOn convertDocs + dependsOn copyJavadoc + dependsOn copyDist + + input = file(siteBuildDir) + output = file(siteOutDir) + clearCache = true + + configuration['base_href'] = siteBaseHref() +} githubPages { repoUri = 'https://github.com/orgsync/orgsync-api-java.git'