Spring/spring-restdocs
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '1.0.x'

Browse Source
This commit is contained in:
Andy Wilkinson
2016-01-17 20:26:40 +00:00
parent 202b75637e 194e62bde3
commit 8914ab5767
2 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
build.gradle
View File

@@ -155,11 +155,11 @@ samples {
dependOn 'spring-restdocs-mockmvc:install'
restNotesSpringHateoas {
workingDir 'samples/rest-notes-spring-hateoas'
workingDir "$projectDir/samples/rest-notes-spring-hateoas"
}
restNotesSpringDataRest {
workingDir 'samples/rest-notes-spring-data-rest'
workingDir "$projectDir/samples/rest-notes-spring-data-rest"
}
}

18
buildSrc/src/main/groovy/org/springframework/restdocs/build/SampleBuildConfigurer.groovy
View File

@@ -38,17 +38,21 @@ public class SampleBuildConfigurer {
}
Task createTask(Project project, Object... dependencies) {
File sampleDir = new File(this.workingDir).absoluteFile
Task verifyIncludes
if (new File(this.workingDir, 'build.gradle').isFile()) {
if (new File(sampleDir, 'build.gradle').isFile()) {
Task gradleBuild = createGradleBuild(project, dependencies)
verifyIncludes = createVerifyIncludes(project, new File(this.workingDir, 'build/asciidoc'))
verifyIncludes = createVerifyIncludes(project, new File(sampleDir, 'build/asciidoc'))
verifyIncludes.dependsOn gradleBuild
}
if (new File(this.workingDir, 'pom.xml').isFile()) {
Task mavenBuild = createMavenBuild(project, dependencies)
verifyIncludes = createVerifyIncludes(project, new File(this.workingDir, 'target/generated-docs'))
else if (new File(sampleDir, 'pom.xml').isFile()) {
Task mavenBuild = createMavenBuild(project, sampleDir, dependencies)
verifyIncludes = createVerifyIncludes(project, new File(sampleDir, 'target/generated-docs'))
verifyIncludes.dependsOn(mavenBuild)
}
else {
throw new IllegalStateException("No pom.xml or build.gradle was found in $sampleDir")
}
Task sampleBuild = project.tasks.create name
sampleBuild.description = "Builds the ${name} sample"
sampleBuild.group = "Build"
@@ -56,12 +60,12 @@ public class SampleBuildConfigurer {
return sampleBuild
}
private Task createMavenBuild(Project project, Object... dependencies) {
private Task createMavenBuild(Project project, File sampleDir, Object... dependencies) {
Task mavenBuild = project.tasks.create("${name}Maven", Exec)
mavenBuild.description = "Builds the ${name} sample with Maven"
mavenBuild.group = "Build"
mavenBuild.workingDir = this.workingDir
mavenBuild.commandLine = [isWindows() ? "${new File(this.workingDir).absolutePath}/mvnw.cmd" : './mvnw', 'clean', 'package']
mavenBuild.commandLine = [isWindows() ? "${sampleDir.absolutePath}/mvnw.cmd" : './mvnw', 'clean', 'package']
mavenBuild.dependsOn dependencies
mavenBuild.doFirst {