Skip to content

Commit eaaa935

Browse files
authored
Switch to jyjeanne/dita-ot-gradle 2.3.2 (#645)
https://github.com/jyjeanne/dita-ot-gradle/releases/tag/v2.3.2 Signed-off-by: Roger Sheen <[email protected]>
1 parent a028882 commit eaaa935

File tree

1 file changed

+10
-4
lines changed

1 file changed

+10
-4
lines changed

build.gradle

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
plugins {
2-
id 'com.github.eerohele.dita-ot-gradle' version '0.7.1'
2+
id 'io.github.jyjeanne.dita-ot-gradle' version '2.3.2'
33
id 'com.github.eerohele.saxon-gradle' version '0.9.0-beta4'
44
}
55

@@ -18,7 +18,7 @@ dependencies {
1818
saxon 'net.sf.saxon:Saxon-HE:10.6'
1919
}
2020

21-
import com.github.eerohele.DitaOtTask
21+
import com.github.jyjeanne.DitaOtTask
2222
import com.github.eerohele.SaxonXsltTask
2323
import org.gradle.process.ExecOperations
2424

@@ -41,8 +41,6 @@ String toURI(String path) {
4141
file(path).toURI().toString()
4242
}
4343

44-
ditaOt.dir ditaHome
45-
4644
task messages(type: SaxonXsltTask) {
4745
input "${configDir}/messages.xml"
4846
output "${projectDirPath}/topics/error-messages.xml"
@@ -99,6 +97,8 @@ task autoGenerate(dependsOn: [messages, params, extensionPoints, generatePlatfor
9997
}
10098

10199
task pdf(type: DitaOtTask, dependsOn: autoGenerate) {
100+
// Set DITA-OT directory: pass as parameter -PditaHome or fall back to parent when run in core repo.
101+
ditaOt file(findProperty('ditaHome') ?: ditaHome)
102102
input "${projectDirPath}/userguide-book.ditamap"
103103
output outputDir
104104
transtype 'pdf'
@@ -114,6 +114,8 @@ task pdf(type: DitaOtTask, dependsOn: autoGenerate) {
114114
}
115115

116116
task html(type: DitaOtTask, dependsOn: autoGenerate) {
117+
// Set DITA-OT directory: pass as parameter -PditaHome or fall back to parent when run in core repo.
118+
ditaOt file(findProperty('ditaHome') ?: ditaHome)
117119
input "${projectDirPath}/userguide.ditamap"
118120
output outputDir
119121
transtype 'html5'
@@ -133,6 +135,8 @@ task html(type: DitaOtTask, dependsOn: autoGenerate) {
133135
}
134136

135137
task htmlhelp(type: DitaOtTask, dependsOn: autoGenerate) {
138+
// Set DITA-OT directory: pass as parameter -PditaHome or fall back to parent when run in core repo.
139+
ditaOt file(findProperty('ditaHome') ?: ditaHome)
136140
input "${projectDirPath}/userguide.ditamap"
137141
output outputDir
138142
transtype 'htmlhelp'
@@ -200,6 +204,8 @@ task gitMetadata {
200204
task site(type: DitaOtTask) {
201205
dependsOn 'messages', 'params', 'extensionPoints', 'gitMetadata'
202206

207+
// Set DITA-OT directory: pass as parameter -PditaHome or fall back to parent when run in core repo.
208+
ditaOt file(findProperty('ditaHome') ?: ditaHome)
203209
input file("${projectDirPath}/site.ditamap")
204210
output getPropertyOrDefault('outputDir', "${buildDir}/site")
205211
filter "${projectDirPath}/resources/site.ditaval"

0 commit comments

Comments
 (0)