Project

Profile

Help

Revision 10bc1344

Added by Debbie Lockett 8 months ago

Docs build: tidying

View differences:

build-doc.gradle
250 250
  from ("${projectDir}/src/userdoc") {
251 251
    // Excluded files are transformed by other tasks into "src" for the docbuild
252 252
    exclude "extensions/**"
253
    exclude "elements/**"
253 254
  }
254 255
}
255 256

  
......
397 398
  expath_doc.dependsOn t
398 399
}
399 400

  
400
task gen_expand_doc_sections_for_app(
401
task expand_userdoc_sections(
401 402
  type: JavaExec,
402
  dependsOn: ["gen_doc", "copy_changes_dir"],
403
  dependsOn: ["gen_doc"],
403 404
  description: "Expand documentation sections from inclusions for app"
404 405
) {
405 406
  inputs.file "${buildDir}/userdoc/src/catalog.xml"
407
  inputs.files fileTree(dir: "${buildDir}/userdoc/src")
406 408
  inputs.files fileTree(dir: "${projectDir}/tools/docs/userdoc")
407 409
  outputs.file "${buildDir}/userdoc/expanded/catalog.xml"
408 410
  classpath = configurations.documentation
......
414 416
    "output-uri=${buildDir}/userdoc/expanded/"
415 417
}
416 418

  
417
task copy_changes_dir(
418
  type: Copy,
419
  description: "Copy the change logs to build hierarchy"
420
) {
421
  into "${buildDir}/userdoc/src/changes"
422
  from "${projectDir}/src/userdoc/changes"
423
  doFirst {
424
    mkdir "${buildDir}/userdoc/src/changes"
425
  }
426
}
427

  
428 419
task userdoc_changes(
429 420
  type: JavaExec,
430
  dependsOn: ["gen_expand_doc_sections_for_app"],
421
  dependsOn: ["expand_userdoc_sections"],
431 422
  description: "Preprocess the changes.xml file to turn it into a standard article"
432 423
) {
433 424
  inputs.file "${buildDir}/userdoc/expanded/changes.xml"
......
442 433

  
443 434
task userdoc_functions(
444 435
  type: JavaExec,
445
  dependsOn: ["gen_expand_doc_sections_for_app"],
436
  dependsOn: ["expand_userdoc_sections"],
446 437
  description: "Preprocess the functions.xml file to turn it into a standard article"
447 438
) {
448 439
  inputs.file "${buildDir}/userdoc/expanded/functions.xml"
......
483 474

  
484 475
task userdoc_articles(
485 476
  type: JavaExec,
486
  dependsOn: ["gen_expand_doc_sections_for_app", "app_javadoc", "app_dotnetdoc",
477
  dependsOn: ["expand_userdoc_sections", "app_javadoc", "app_dotnetdoc",
487 478
              "userdoc_changes", "userdoc_functions"],
488 479
  description: "Process all the articles"
489 480
) {

Also available in: Unified diff