Skip to content

Commit

Permalink
Merge pull request #1099 from ndw/build-fixes
Browse files Browse the repository at this point in the history 
Build fixes
  • Loading branch information
@ndw
ndw authored Mar 19, 2024
2 parents c6c1857 + c859613 commit 147d7ac
Show file tree
Hide file tree
Showing 2 changed files with 53 additions and 51 deletions.
101 changes: 50 additions & 51 deletions build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ task publish(dependsOn: ["publish-xpath-functions-40",
"publish-xslt-40",
"publish-datamodel-40",
"publish-xslt-xquery-serialization-40"]) {
inputs.files fileTree(dir: "${buildDir}/www")
inputs.dir "${buildDir}/www"
outputs.file "${buildDir}/www/index.html"

doLast {
Expand Down Expand Up @@ -184,9 +184,8 @@ task fo_merge(
description: "Expand the FO sources into a single XML file",
dependsOn: ["common_sources", "saxon_config"]
) {
inputs.files fileTree(dir: "${projectDir}/specifications/xpath-functions-40/src")
inputs.files fileTree(dir: "${projectDir}/specifications/xpath-functions-40/style")
inputs.files fileTree(dir: "${projectDir}/specifications/xpath-functions-40/images")
inputs.dir "${projectDir}/specifications/xpath-functions-40/src"
inputs.dir "${projectDir}/specifications/xpath-functions-40/style"
outputs.file "${buildDir}/expanded/xpath-functions-40/xpath-functions-40.xml"

doLast {
Expand All @@ -205,7 +204,7 @@ task fo_xml(
group: "Spec XML",
description: "Create the XML version of the specification"
) {
inputs.files fileTree(dir: "${projectDir}/style/identity.xsl")
inputs.file "${projectDir}/style/identity.xsl"
inputs.file fo_merge.outputs.getFiles().getSingleFile()
outputs.file "${buildDir}/www/xpath-functions-40/xpath-functions-40.xml"

Expand All @@ -221,8 +220,8 @@ task fo_html(
group: "Spec HTML",
description: "Create the HTML and XHTML versions of the specification"
) {
inputs.files fileTree(dir: "${projectDir}/style")
inputs.files fileTree(dir: "${projectDir}/specifications/xpath-functions-40/style")
inputs.dir "${projectDir}/style"
inputs.dir "${projectDir}/specifications/xpath-functions-40/style"
inputs.file fo_merge.outputs.getFiles().getSingleFile()
outputs.file "${buildDir}/www/xpath-functions-40/Overview.xml"
outputs.file "${buildDir}/www/xpath-functions-40/Overview.html"
Expand All @@ -244,8 +243,8 @@ task fo_html_diff(
group: "Spec HTML (diff)",
description: "Create the HTML and XHTML versions of the specification (with diff markup)"
) {
inputs.files fileTree(dir: "${projectDir}/style")
inputs.files fileTree(dir: "${projectDir}/specifications/xpath-functions-40/style")
inputs.dir "${projectDir}/style"
inputs.dir "${projectDir}/specifications/xpath-functions-40/style"
inputs.file fo_merge.outputs.getFiles().getSingleFile()
outputs.file "${buildDir}/www/xpath-functions-40/Overview-diff.xml"
outputs.file "${buildDir}/www/xpath-functions-40/Overview-diff.html"
Expand Down Expand Up @@ -339,7 +338,7 @@ task xpath_keyword_tests(
task grammar_40(
dependsOn: ["saxon_config"]
) {
inputs.files fileTree(dir: "${projectDir}/specifications/grammar-40")
inputs.dir "${projectDir}/specifications/grammar-40"
inputs.file "${projectDir}/style/grammar-identity.xsl"
outputs.file "${buildDir}/grammar-40/xpath-grammar.xml"

Expand Down Expand Up @@ -372,10 +371,10 @@ task xslt_grammar(
dependsOn: ["grammar_40", "saxon_config"],
description: "Build the grammar files for XSLT 4.0"
) {
inputs.files fileTree(dir: "${projectDir}/style")
inputs.files fileTree(dir: "${projectDir}/specifications/xslt-40/src")
inputs.files fileTree(dir: "${projectDir}/specifications/xslt-40/style")
inputs.files fileTree(dir: "${projectDir}/specifications/grammar-40")
inputs.dir "${projectDir}/style"
inputs.dir "${projectDir}/specifications/xslt-40/src"
inputs.dir "${projectDir}/specifications/xslt-40/style"
inputs.dir "${projectDir}/specifications/grammar-40"
outputs.file "${buildDir}/xslt-40/src/xslt-40-assembled.xml"

doLast {
Expand Down Expand Up @@ -412,9 +411,9 @@ task xslt_grammar(
task xslt_merge_catalog(
dependsOn: ["xslt_grammar", "saxon_config"]
) {
inputs.files fileTree(dir: "${projectDir}/style")
inputs.files fileTree(dir: "${projectDir}/specifications/xslt-40/src")
inputs.files fileTree(dir: "${projectDir}/specifications/xslt-40/style")
inputs.dir "${projectDir}/style"
inputs.dir "${projectDir}/specifications/xslt-40/src"
inputs.dir "${projectDir}/specifications/xslt-40/style"
inputs.file xslt_grammar.outputs.getFiles().getSingleFile()
outputs.file "${buildDir}/xslt-40/src/xslt-expanded.xml"

Expand Down Expand Up @@ -492,8 +491,8 @@ task xslt_make_svg(
dependsOn: ["xslt_merge_catalog", "saxon_config"],
description: "Create SVG images with GraphViz"
) {
inputs.files fileTree(dir: "${projectDir}/style")
inputs.files fileTree(dir: "${projectDir}/specifications/xslt-40/style")
inputs.dir "${projectDir}/style"
inputs.dir "${projectDir}/specifications/xslt-40/style"
inputs.file xslt_merge_catalog.outputs.getFiles().getSingleFile()
outputs.file "${buildDir}/xslt-40/img/fig1.svg"

Expand Down Expand Up @@ -526,8 +525,8 @@ task xslt_make_svg(
task xslt_copy_svg(
description: "Copy SVG images"
) {
inputs.files fileTree(dir: "${projectDir}/style")
inputs.files fileTree(dir: "${projectDir}/specifications/xslt-40/style")
inputs.dir "${projectDir}/style"
inputs.dir "${projectDir}/specifications/xslt-40/style"
outputs.file "${buildDir}/xslt-40/img/fig1.svg"

doLast {
Expand Down Expand Up @@ -652,7 +651,7 @@ task xslt_xml(
dependsOn: ["xslt_merge_catalog", "saxon_config"],
description: "Create the XML version of the specification"
) {
inputs.files fileTree(dir: "${projectDir}/style/identity.xsl")
inputs.file "${projectDir}/style/identity.xsl"
inputs.file xslt_merge_catalog.outputs.getFiles().getSingleFile()
outputs.file "${buildDir}/www/xslt-40/xslt-40.xml"

Expand Down Expand Up @@ -710,10 +709,10 @@ task shared_40(
dependsOn: ["grammar_40", "saxon_config"],
description: "Build the grammar files for the ${shortName} specification"
) {
inputs.files fileTree(dir: "${projectDir}/style")
inputs.files fileTree(dir: "${projectDir}/specifications/xquery-40/src")
inputs.files fileTree(dir: "${projectDir}/specifications/xquery-40/style")
inputs.files fileTree(dir: "${projectDir}/specifications/grammar-40")
inputs.dir "${projectDir}/style"
inputs.dir "${projectDir}/specifications/xquery-40/src"
inputs.dir "${projectDir}/specifications/xquery-40/style"
inputs.dir "${projectDir}/specifications/grammar-40"
outputs.file "${buildDir}/xquery-40/tokens-${shortName}.xml"
outputs.file "${buildDir}/xquery-40/temp-${shortName}-grammar.xml"

Expand Down Expand Up @@ -744,10 +743,10 @@ task shared_40(
dependsOn: ["xquery_${shortName}_grammar", "saxon_config"],
description: "Assemble the sources for the ${shortName} specification"
) {
inputs.files fileTree(dir: "${projectDir}/style")
inputs.files fileTree(dir: "${projectDir}/specifications/xquery-40/src")
inputs.files fileTree(dir: "${projectDir}/specifications/xquery-40/style")
inputs.files fileTree(dir: "${projectDir}/specifications/grammar-40")
inputs.dir "${projectDir}/style"
inputs.dir "${projectDir}/specifications/xquery-40/src"
inputs.dir "${projectDir}/specifications/xquery-40/style"
inputs.dir "${projectDir}/specifications/grammar-40"
inputs.file "${buildDir}/xquery-40/tokens-${shortName}.xml"
outputs.file "${buildDir}/xquery-40/src/${shortName}-assembled.xml"

Expand Down Expand Up @@ -782,9 +781,9 @@ task shared_40(
dependsOn: ["xquery_assemble_${shortName}", "setup_crossref_indexes", "saxon_config"],
description: "Create the HTML and XHTML versions of the ${shortName} specification"
) {
inputs.files fileTree(dir: "${projectDir}/style")
inputs.files fileTree(dir: "${projectDir}/specifications/xquery-40/src")
inputs.files fileTree(dir: "${projectDir}/specifications/xquery-40/style")
inputs.dir "${projectDir}/style"
inputs.dir "${projectDir}/specifications/xquery-40/src"
inputs.dir "${projectDir}/specifications/xquery-40/style"
inputs.file "${buildDir}/xquery-40/src/${shortName}-assembled.xml"
outputs.file "${buildDir}/www/xquery-40/${shortName}-40.html"

Expand Down Expand Up @@ -819,9 +818,9 @@ task shared_40(
dependsOn: ["xquery_assemble_${shortName}", "saxon_config"],
description: "Create the HTML and XHTML versions of the ${shortName} specification"
) {
inputs.files fileTree(dir: "${projectDir}/style")
inputs.files fileTree(dir: "${projectDir}/specifications/xquery-40/src")
inputs.files fileTree(dir: "${projectDir}/specifications/xquery-40/style")
inputs.dir "${projectDir}/style"
inputs.dir "${projectDir}/specifications/xquery-40/src"
inputs.dir "${projectDir}/specifications/xquery-40/style"
inputs.file "${buildDir}/xquery-40/src/${shortName}-assembled.xml"
outputs.file "${buildDir}/www/xquery-40/${shortName}-40.html"

Expand Down Expand Up @@ -913,8 +912,8 @@ task datamodel_40(
task datamodel_merge(
dependsOn: ["common_sources", "saxon_config"]
) {
inputs.files fileTree(dir: "${projectDir}/specifications/xpath-datamodel-40/src")
inputs.files fileTree(dir: "${projectDir}/specifications/xpath-datamodel-40/style")
inputs.dir "${projectDir}/specifications/xpath-datamodel-40/src"
inputs.dir "${projectDir}/specifications/xpath-datamodel-40/style"
outputs.files "${buildDir}/expanded/xpath-datamodel-40/xpath-datamodel.xml"

doLast {
Expand Down Expand Up @@ -963,8 +962,8 @@ task datamodel_xml(
description: "Create the XML version of the specification"
) {
inputs.file datamodel_merge.outputs.getFiles().getSingleFile()
inputs.files fileTree(dir: "${projectDir}/specifications/xpath-datamodel-40/style")
inputs.files fileTree(dir: "${projectDir}/style/identity.xsl")
inputs.dir "${projectDir}/specifications/xpath-datamodel-40/style"
inputs.file "${projectDir}/style/identity.xsl"
outputs.file "${buildDir}/www/xpath-datamodel-40/xpath-datamodel-40.xml"

doLast {
Expand All @@ -979,9 +978,9 @@ task datamodel_html(
dependsOn: ["datamodel_xml", "setup_crossref_indexes", "saxon_config"],
description: "Create the HTML and XHTML versions of the specification"
) {
inputs.files fileTree(dir: "${projectDir}/style")
inputs.dir "${projectDir}/style"
inputs.files fileTree(dir: buildDir, include: "*.svg")
inputs.files fileTree(dir: "${projectDir}/specifications/xpath-datamodel-40/style")
inputs.dir "${projectDir}/specifications/xpath-datamodel-40/style"
inputs.file datamodel_merge.outputs.getFiles().getSingleFile()
outputs.file "${buildDir}/www/xpath-datamodel-40/Overview.xml"
outputs.file "${buildDir}/www/xpath-datamodel-40/Overview.html"
Expand All @@ -1003,8 +1002,8 @@ task datamodel_html_diff(
group: "Spec HTML (diff)",
description: "Create the HTML and XHTML versions of the specification (with diff markup)"
) {
inputs.files fileTree(dir: "${projectDir}/style")
inputs.files fileTree(dir: "${projectDir}/specifications/xpath-datamodel-40/style")
inputs.dir "${projectDir}/style"
inputs.dir "${projectDir}/specifications/xpath-datamodel-40/style"
inputs.file datamodel_merge.outputs.getFiles().getSingleFile()
outputs.file "${buildDir}/www/xpath-datamodel-40/Overview-diff.xml"
outputs.file "${buildDir}/www/xpath-datamodel-40/Overview-diff.html"
Expand Down Expand Up @@ -1096,9 +1095,9 @@ task serialization_xml(
description: "Create the XML version of the specification",
dependsOn: ["saxon_config"]
) {
inputs.files fileTree(dir: "${projectDir}/specifications/xslt-xquery-serialization-40/src")
inputs.files fileTree(dir: "${projectDir}/specifications/xslt-xquery-serialization-40/style")
inputs.files fileTree(dir: "${projectDir}/style/identity.xsl")
inputs.dir "${projectDir}/specifications/xslt-xquery-serialization-40/src"
inputs.dir "${projectDir}/specifications/xslt-xquery-serialization-40/style"
inputs.file "${projectDir}/style/identity.xsl"
outputs.file "${buildDir}/www/xslt-xquery-serialization-40/xslt-xquery-serialization-40.xml"

doLast {
Expand All @@ -1117,8 +1116,8 @@ task serialization_html(
dependsOn: ["serialization_xml", "setup_crossref_indexes", "saxon_config"],
description: "Create the HTML and XHTML versions of the specification"
) {
inputs.files fileTree(dir: "${projectDir}/style")
inputs.files fileTree(dir: "${projectDir}/specifications/xslt-xquery-serialization-40/style")
inputs.dir "${projectDir}/style"
inputs.dir "${projectDir}/specifications/xslt-xquery-serialization-40/style"
inputs.file serialization_src
outputs.file "${buildDir}/www/xslt-xquery-serialization-40/Overview.xml"
outputs.file "${buildDir}/www/xslt-xquery-serialization-40/Overview.html"
Expand All @@ -1140,8 +1139,8 @@ task serialization_html_diff(
description: "Create the HTML and XHTML versions of the specification (with diff markup)",
dependsOn: ["saxon_config"]
) {
inputs.files fileTree(dir: "${projectDir}/style")
inputs.files fileTree(dir: "${projectDir}/specifications/xslt-xquery-serialization-40/style")
inputs.dir "${projectDir}/style"
inputs.dir "${projectDir}/specifications/xslt-xquery-serialization-40/style"
inputs.file serialization_src
outputs.file "${buildDir}/www/xslt-xquery-serialization-40/Overview-diff.xml"
outputs.file "${buildDir}/www/xslt-xquery-serialization-40/Overview-diff.html"
Expand Down
3 changes: 3 additions & 0 deletions schema/xsl-query.dtd
View file
Original file line number Diff line number Diff line change
Expand Up @@ -149,6 +149,9 @@

<!-- Allow a 'code' element to contain a 'var' element for italicised code -->
<!ELEMENT code (%tech.pcd.mix;|var|emph)*>
<!ATTLIST code
nobreak (true|false) "false"
>

<!ATTLIST issue
id ID #REQUIRED
Expand Down

0 comments on commit 147d7ac

Please sign in to comment.