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

Add both http and https entries to catalog.xml. #259

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add both http and https entries to catalog.xml. #259

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
23 changes: 17 additions & 6 deletions releasetools/make-catalog.xsl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<xsl:param name="BRANCH">
<xsl:value-of select="string(document('VERSION.xsl')//fm:Branch[1])"/>
</xsl:param>
<xsl:param name="URI_BASE">https://cdn.docbook.org/release</xsl:param>
<xsl:param name="URI_BASE">cdn.docbook.org/release</xsl:param>
<xsl:param name="DISTRO"/>
<xsl:param name="SUBDIR">current</xsl:param>

Expand All @@ -28,17 +28,28 @@
<xsl:text> </xsl:text>
</xsl:param>

<xsl:template name="generate-entries"
xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog">
<xsl:param name="scheme"/>
<rewriteURI uriStartString="{$scheme}://{$URI_BASE}/{$DISTRO}/{$SUBDIR}/" rewritePrefix="./"/>
<rewriteSystem systemIdStartString="{$scheme}://{$URI_BASE}/{$DISTRO}/{$SUBDIR}/" rewritePrefix="./"/>

<rewriteURI uriStartString="{$scheme}://{$URI_BASE}/{$DISTRO}/{$VERSION}/" rewritePrefix="./"/>
<rewriteSystem systemIdStartString="{$scheme}://{$URI_BASE}/{$DISTRO}/{$VERSION}/" rewritePrefix="./"/>
</xsl:template>

<xsl:template match="/">

<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog">
<xsl:text>&#10;</xsl:text>
<xsl:comment><xsl:value-of select="$COMMENT"/></xsl:comment>

<rewriteURI uriStartString="{$URI_BASE}/{$DISTRO}/{$SUBDIR}/" rewritePrefix="./"/>
<rewriteSystem systemIdStartString="{$URI_BASE}/{$DISTRO}/{$SUBDIR}/" rewritePrefix="./"/>

<rewriteURI uriStartString="{$URI_BASE}/{$DISTRO}/{$VERSION}/" rewritePrefix="./"/>
<rewriteSystem systemIdStartString="{$URI_BASE}/{$DISTRO}/{$VERSION}/" rewritePrefix="./"/>
<xsl:call-template name="generate-entries">
<xsl:with-param name="scheme">http</xsl:with-param>
</xsl:call-template>
<xsl:call-template name="generate-entries">
<xsl:with-param name="scheme">https</xsl:with-param>
</xsl:call-template>
</catalog>
<xsl:text>&#10;</xsl:text>

Expand Down
3 changes: 2 additions & 1 deletion xsl/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,8 @@ DISTRIB_PACKAGES = doc

# list of pathname+URIs to test for catalog support
URILIST = \
.\ https://cdn.docbook.org/release/xsl/current/
.\ https://cdn.docbook.org/release/xsl/current/ \
.\ http://cdn.docbook.org/release/xsl/current/

DIRS=common lib html fo manpages htmlhelp javahelp eclipse roundtrip slides website extensions xhtml xhtml-1_1 webhelp xhtml5 epub3

Expand Down