diff --git a/settings.gradle b/settings.gradle index 316fa06..779c980 100644 --- a/settings.gradle +++ b/settings.gradle @@ -24,7 +24,7 @@ if (target.exists()) { .replaceAll('%LANG%', language) .replaceAll('%TYPE%', docFormat) ) - def projectIdentifier = "${language}:${docFormat}" + def projectIdentifier = ("${f.parentFile.path}" - "${layout.rootDirectory.asFile.path}/").replaceAll("/",":") logger.info "include subproject ${projectIdentifier} in ${parentFilePath}" include(projectIdentifier) project(":${projectIdentifier}").projectDir = new File(parentFilePath) diff --git a/subBuild.gradle b/subBuild.gradle index f043569..9971175 100644 --- a/subBuild.gradle +++ b/subBuild.gradle @@ -87,8 +87,8 @@ task generateHTML ( type: AsciidoctorTask, dependsOn: [copyImages, copyAsciidoc], description: 'use html5 as asciidoc backend') { + sourceDir = file("src") sources { - file("src") include 'arc42-template.adoc' } outputDir = new File( localBuildDir.html ) @@ -101,8 +101,8 @@ task generateDocbook ( type: AsciidoctorTask, dependsOn: [copyImages, copyAsciidoc], description: 'use docbook as asciidoc backend') { + sourceDir = file("src") sources { - file("src") include 'arc42-template.adoc' } if (localBuildDir.docbook) {