Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update version number in step libraries #621

Merged
merged 2 commits into from
Sep 2, 2024
Merged

Update version number in step libraries #621

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d963aa6
Update version number in step libraries
ndw Sep 1, 2024
bbcb895
Use the 3.1 grammars from the grammars repository
ndw Sep 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,18 +115,18 @@ task make_etc() {
// ======================================================================
// We need the core RNG grammars

task xproc_schemas(dependsOn: [ "download_core30" ]) {
task xproc_schemas(dependsOn: [ "download_core31" ]) {
// nop
}

task download_core30(type: Download) {
src "$schemaBaseUri/lib/core30.rng"
dest file("build/core30.rng")
task download_core31(type: Download) {
src "$schemaBaseUri/lib/core31.rng"
dest file("build/core31.rng")
}
download_core30.onlyIf { !file("$buildDir/core30.rng").exists() }
download_core31.onlyIf { !file("$buildDir/core31.rng").exists() }

[ "rnc", "rng" ].each { ext ->
["xproc", "xproc10", "xproc30"].each { base ->
["xproc", "xproc10", "xproc30", "xproc31"].each { base ->
Task t = task "download_${base}_${ext}"(type: Download) {
src "$schemaBaseUri/relax-ng/$base.$ext"
dest file("build/$base.$ext")
Expand Down
2 changes: 1 addition & 1 deletion tools/xsl/rngsyntax.xsl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@

<xsl:variable name="pattern" select="@name"/>

<xsl:variable name="schemafile" select="'../../build/xproc30.rng'"/>
<xsl:variable name="schemafile" select="'../../build/xproc31.rng'"/>

<xsl:variable name="theschema" as="document-node()">
<xsl:choose>
Expand Down
2 changes: 1 addition & 1 deletion tools/xsl/typed-pipeline-library.xsl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
</xsl:variable>

<xsl:template match="/">
<p:library version='3.0'>
<p:library version='3.1'>
<xsl:sequence select="$lib"/>

<xsl:for-each select="key('id','std-required')//p:declare-step">
Expand Down