RELNOTESng infrastructure fixes:
1. There is now only one RELNOTESng stylesheet; the architecture-specific stylesheets (to handle different values of the arch= attribute) are gone. 2. Several Makefile variable definitions were factored into doc.relnotes.mk. Submitted by: dd
This commit is contained in:
parent
c9cd7283cf
commit
1eb55ff65d
@ -18,10 +18,17 @@ DOC_PREFIX Makefile variable. RELNOTESng also requires the DocProj
|
||||
build tools, which can easily be installed with the textproc/docproj
|
||||
port in the Ports Collection.
|
||||
|
||||
share/sgml/*.dsl
|
||||
Architecture-dependent stylesheets. These stylesheets support
|
||||
the arch= attribute on (all?) DocBook elements. Currently-
|
||||
supported values are: i386, alpha.
|
||||
share/mk/doc.relnotes.mk
|
||||
Common Makefile definitions for RELNOTESng. These definitions
|
||||
mostly accomodate the fact that we're building DocProj-like
|
||||
documents outside the doc/ tree.
|
||||
share/sgml/release.dsl
|
||||
Language-neutral stylesheet. This stylesheet supports
|
||||
the arch= attribute on (all?) DocBook elements; elements with
|
||||
an arch= attribute are only included in the output if their
|
||||
value is equal to the value of the &arch; entity. In the
|
||||
future, arch= could be a list of possible &arch; entity values
|
||||
that match, such as "i386,alpha".
|
||||
share/sgml/release.ent
|
||||
Release information. Need to update the entry definitions in
|
||||
this file when rolling new revisions; these should take effect
|
||||
|
@ -6,7 +6,6 @@ DOC?= article
|
||||
FORMATS?= html
|
||||
INSTALL_COMPRESSED?= gz
|
||||
INSTALL_ONLY_COMPRESSED?=
|
||||
EXTRA_CATALOGS+= ${RELN_ROOT}/share/sgml/catalog
|
||||
|
||||
# SGML content
|
||||
SRCS+= article.sgml
|
||||
|
@ -6,7 +6,6 @@ DOC?= article
|
||||
FORMATS?= html
|
||||
INSTALL_COMPRESSED?= gz
|
||||
INSTALL_ONLY_COMPRESSED?=
|
||||
EXTRA_CATALOGS+= ${RELN_ROOT}/share/sgml/catalog
|
||||
|
||||
# SGML content
|
||||
SRCS+= article.sgml
|
||||
@ -16,9 +15,5 @@ SRCS+= ../common/artheader.sgml
|
||||
SRCS+= ../common/dev.sgml
|
||||
SRCS+= ../common/config.sgml
|
||||
|
||||
# Use the appropriate architecture-dependent RELNOTESng stylesheet
|
||||
DSLHTML?= ${RELN_ROOT}/share/sgml/release-alpha.dsl
|
||||
DSLPRINT?= ${RELN_ROOT}/share/sgml/release-alpha.dsl
|
||||
|
||||
.include "${RELN_ROOT}/share/mk/doc.relnotes.mk"
|
||||
.include "${DOC_PREFIX}/share/mk/doc.project.mk"
|
||||
|
@ -6,7 +6,6 @@ DOC?= article
|
||||
FORMATS?= html
|
||||
INSTALL_COMPRESSED?= gz
|
||||
INSTALL_ONLY_COMPRESSED?=
|
||||
EXTRA_CATALOGS+= ${RELN_ROOT}/share/sgml/catalog
|
||||
|
||||
# SGML content
|
||||
SRCS+= article.sgml
|
||||
@ -16,9 +15,5 @@ SRCS+= ../common/artheader.sgml
|
||||
SRCS+= ../common/dev.sgml
|
||||
SRCS+= ../common/config.sgml
|
||||
|
||||
# Use the appropriate architecture-dependent RELNOTESng stylesheet
|
||||
DSLHTML?= ${RELN_ROOT}/share/sgml/release-i386.dsl
|
||||
DSLPRINT?= ${RELN_ROOT}/share/sgml/release-i386.dsl
|
||||
|
||||
.include "${RELN_ROOT}/share/mk/doc.relnotes.mk"
|
||||
.include "${DOC_PREFIX}/share/mk/doc.project.mk"
|
||||
|
@ -6,7 +6,6 @@ DOC?= article
|
||||
FORMATS?= html
|
||||
INSTALL_COMPRESSED?= gz
|
||||
INSTALL_ONLY_COMPRESSED?=
|
||||
EXTRA_CATALOGS+= ${RELN_ROOT}/share/sgml/catalog
|
||||
|
||||
# SGML content
|
||||
SRCS+= article.sgml
|
||||
@ -17,9 +16,5 @@ SRCS+= ../common/layout.sgml
|
||||
SRCS+= ../common/trouble.sgml
|
||||
SRCS+= ../common/upgrade.sgml
|
||||
|
||||
# Use the appropriate architecture-dependent RELNOTESng stylesheet
|
||||
DSLHTML?= ${RELN_ROOT}/share/sgml/release-alpha.dsl
|
||||
DSLPRINT?= ${RELN_ROOT}/share/sgml/release-alpha.dsl
|
||||
|
||||
.include "${RELN_ROOT}/share/mk/doc.relnotes.mk"
|
||||
.include "${DOC_PREFIX}/share/mk/doc.project.mk"
|
||||
|
@ -6,7 +6,6 @@ DOC?= article
|
||||
FORMATS?= html
|
||||
INSTALL_COMPRESSED?= gz
|
||||
INSTALL_ONLY_COMPRESSED?=
|
||||
EXTRA_CATALOGS+= ${RELN_ROOT}/share/sgml/catalog
|
||||
|
||||
# SGML content
|
||||
SRCS+= article.sgml
|
||||
@ -17,9 +16,5 @@ SRCS+= ../common/layout.sgml
|
||||
SRCS+= ../common/trouble.sgml
|
||||
SRCS+= ../common/upgrade.sgml
|
||||
|
||||
# Use the appropriate architecture-dependent RELNOTESng stylesheet
|
||||
DSLHTML?= ${RELN_ROOT}/share/sgml/release-i386.dsl
|
||||
DSLPRINT?= ${RELN_ROOT}/share/sgml/release-i386.dsl
|
||||
|
||||
.include "${RELN_ROOT}/share/mk/doc.relnotes.mk"
|
||||
.include "${DOC_PREFIX}/share/mk/doc.project.mk"
|
||||
|
@ -6,7 +6,6 @@ DOC?= article
|
||||
FORMATS?= html
|
||||
INSTALL_COMPRESSED?= gz
|
||||
INSTALL_ONLY_COMPRESSED?=
|
||||
EXTRA_CATALOGS+= ${RELN_ROOT}/share/sgml/catalog
|
||||
|
||||
#
|
||||
# SRCS lists the individual SGML files that make up the document. Changes
|
||||
|
@ -6,7 +6,6 @@ DOC?= article
|
||||
FORMATS?= html
|
||||
INSTALL_COMPRESSED?= gz
|
||||
INSTALL_ONLY_COMPRESSED?=
|
||||
EXTRA_CATALOGS+= ${RELN_ROOT}/share/sgml/catalog
|
||||
|
||||
# SGML content
|
||||
SRCS+= article.sgml
|
||||
@ -15,9 +14,5 @@ SRCS+= ../common/artheader.sgml
|
||||
SRCS+= ../common/new.sgml
|
||||
SRCS+= ../common/upgrading.sgml
|
||||
|
||||
# Use the appropriate architecture-dependent RELNOTESng stylesheet
|
||||
DSLHTML?= ${RELN_ROOT}/share/sgml/release-alpha.dsl
|
||||
DSLPRINT?= ${RELN_ROOT}/share/sgml/release-alpha.dsl
|
||||
|
||||
.include "${RELN_ROOT}/share/mk/doc.relnotes.mk"
|
||||
.include "${DOC_PREFIX}/share/mk/doc.project.mk"
|
||||
|
@ -6,7 +6,6 @@ DOC?= article
|
||||
FORMATS?= html
|
||||
INSTALL_COMPRESSED?= gz
|
||||
INSTALL_ONLY_COMPRESSED?=
|
||||
EXTRA_CATALOGS+= ${RELN_ROOT}/share/sgml/catalog
|
||||
|
||||
# SGML content
|
||||
SRCS+= article.sgml
|
||||
@ -15,9 +14,5 @@ SRCS+= ../common/artheader.sgml
|
||||
SRCS+= ../common/new.sgml
|
||||
SRCS+= ../common/upgrading.sgml
|
||||
|
||||
# Use the appropriate architecture-dependent RELNOTESng stylesheet
|
||||
DSLHTML?= ${RELN_ROOT}/share/sgml/release-i386.dsl
|
||||
DSLPRINT?= ${RELN_ROOT}/share/sgml/release-i386.dsl
|
||||
|
||||
.include "${RELN_ROOT}/share/mk/doc.relnotes.mk"
|
||||
.include "${DOC_PREFIX}/share/mk/doc.project.mk"
|
||||
|
@ -6,7 +6,6 @@ DOC?= article
|
||||
FORMATS?= html
|
||||
INSTALL_COMPRESSED?= gz
|
||||
INSTALL_ONLY_COMPRESSED?=
|
||||
EXTRA_CATALOGS+= ${RELN_ROOT}/share/sgml/catalog
|
||||
|
||||
# SGML content
|
||||
SRCS+= article.sgml
|
||||
|
@ -6,7 +6,6 @@ DOC?= article
|
||||
FORMATS?= html
|
||||
INSTALL_COMPRESSED?= gz
|
||||
INSTALL_ONLY_COMPRESSED?=
|
||||
EXTRA_CATALOGS+= ${RELN_ROOT}/share/sgml/catalog
|
||||
|
||||
# SGML content
|
||||
SRCS+= article.sgml
|
||||
@ -16,9 +15,5 @@ SRCS+= ../common/artheader.sgml
|
||||
SRCS+= ../common/dev.sgml
|
||||
SRCS+= ../common/config.sgml
|
||||
|
||||
# Use the appropriate architecture-dependent RELNOTESng stylesheet
|
||||
DSLHTML?= ${RELN_ROOT}/share/sgml/release-alpha.dsl
|
||||
DSLPRINT?= ${RELN_ROOT}/share/sgml/release-alpha.dsl
|
||||
|
||||
.include "${RELN_ROOT}/share/mk/doc.relnotes.mk"
|
||||
.include "${DOC_PREFIX}/share/mk/doc.project.mk"
|
||||
|
@ -6,7 +6,6 @@ DOC?= article
|
||||
FORMATS?= html
|
||||
INSTALL_COMPRESSED?= gz
|
||||
INSTALL_ONLY_COMPRESSED?=
|
||||
EXTRA_CATALOGS+= ${RELN_ROOT}/share/sgml/catalog
|
||||
|
||||
# SGML content
|
||||
SRCS+= article.sgml
|
||||
@ -16,9 +15,5 @@ SRCS+= ../common/artheader.sgml
|
||||
SRCS+= ../common/dev.sgml
|
||||
SRCS+= ../common/config.sgml
|
||||
|
||||
# Use the appropriate architecture-dependent RELNOTESng stylesheet
|
||||
DSLHTML?= ${RELN_ROOT}/share/sgml/release-i386.dsl
|
||||
DSLPRINT?= ${RELN_ROOT}/share/sgml/release-i386.dsl
|
||||
|
||||
.include "${RELN_ROOT}/share/mk/doc.relnotes.mk"
|
||||
.include "${DOC_PREFIX}/share/mk/doc.project.mk"
|
||||
|
@ -6,7 +6,6 @@ DOC?= article
|
||||
FORMATS?= html
|
||||
INSTALL_COMPRESSED?= gz
|
||||
INSTALL_ONLY_COMPRESSED?=
|
||||
EXTRA_CATALOGS+= ${RELN_ROOT}/share/sgml/catalog
|
||||
|
||||
# SGML content
|
||||
SRCS+= article.sgml
|
||||
@ -17,9 +16,5 @@ SRCS+= ../common/layout.sgml
|
||||
SRCS+= ../common/trouble.sgml
|
||||
SRCS+= ../common/upgrade.sgml
|
||||
|
||||
# Use the appropriate architecture-dependent RELNOTESng stylesheet
|
||||
DSLHTML?= ${RELN_ROOT}/share/sgml/release-alpha.dsl
|
||||
DSLPRINT?= ${RELN_ROOT}/share/sgml/release-alpha.dsl
|
||||
|
||||
.include "${RELN_ROOT}/share/mk/doc.relnotes.mk"
|
||||
.include "${DOC_PREFIX}/share/mk/doc.project.mk"
|
||||
|
@ -6,7 +6,6 @@ DOC?= article
|
||||
FORMATS?= html
|
||||
INSTALL_COMPRESSED?= gz
|
||||
INSTALL_ONLY_COMPRESSED?=
|
||||
EXTRA_CATALOGS+= ${RELN_ROOT}/share/sgml/catalog
|
||||
|
||||
# SGML content
|
||||
SRCS+= article.sgml
|
||||
@ -17,9 +16,5 @@ SRCS+= ../common/layout.sgml
|
||||
SRCS+= ../common/trouble.sgml
|
||||
SRCS+= ../common/upgrade.sgml
|
||||
|
||||
# Use the appropriate architecture-dependent RELNOTESng stylesheet
|
||||
DSLHTML?= ${RELN_ROOT}/share/sgml/release-i386.dsl
|
||||
DSLPRINT?= ${RELN_ROOT}/share/sgml/release-i386.dsl
|
||||
|
||||
.include "${RELN_ROOT}/share/mk/doc.relnotes.mk"
|
||||
.include "${DOC_PREFIX}/share/mk/doc.project.mk"
|
||||
|
@ -6,7 +6,6 @@ DOC?= article
|
||||
FORMATS?= html
|
||||
INSTALL_COMPRESSED?= gz
|
||||
INSTALL_ONLY_COMPRESSED?=
|
||||
EXTRA_CATALOGS+= ${RELN_ROOT}/share/sgml/catalog
|
||||
|
||||
#
|
||||
# SRCS lists the individual SGML files that make up the document. Changes
|
||||
|
@ -6,7 +6,6 @@ DOC?= article
|
||||
FORMATS?= html
|
||||
INSTALL_COMPRESSED?= gz
|
||||
INSTALL_ONLY_COMPRESSED?=
|
||||
EXTRA_CATALOGS+= ${RELN_ROOT}/share/sgml/catalog
|
||||
|
||||
# SGML content
|
||||
SRCS+= article.sgml
|
||||
@ -15,9 +14,5 @@ SRCS+= ../common/artheader.sgml
|
||||
SRCS+= ../common/new.sgml
|
||||
SRCS+= ../common/upgrading.sgml
|
||||
|
||||
# Use the appropriate architecture-dependent RELNOTESng stylesheet
|
||||
DSLHTML?= ${RELN_ROOT}/share/sgml/release-alpha.dsl
|
||||
DSLPRINT?= ${RELN_ROOT}/share/sgml/release-alpha.dsl
|
||||
|
||||
.include "${RELN_ROOT}/share/mk/doc.relnotes.mk"
|
||||
.include "${DOC_PREFIX}/share/mk/doc.project.mk"
|
||||
|
@ -6,7 +6,6 @@ DOC?= article
|
||||
FORMATS?= html
|
||||
INSTALL_COMPRESSED?= gz
|
||||
INSTALL_ONLY_COMPRESSED?=
|
||||
EXTRA_CATALOGS+= ${RELN_ROOT}/share/sgml/catalog
|
||||
|
||||
# SGML content
|
||||
SRCS+= article.sgml
|
||||
@ -15,9 +14,5 @@ SRCS+= ../common/artheader.sgml
|
||||
SRCS+= ../common/new.sgml
|
||||
SRCS+= ../common/upgrading.sgml
|
||||
|
||||
# Use the appropriate architecture-dependent RELNOTESng stylesheet
|
||||
DSLHTML?= ${RELN_ROOT}/share/sgml/release-i386.dsl
|
||||
DSLPRINT?= ${RELN_ROOT}/share/sgml/release-i386.dsl
|
||||
|
||||
.include "${RELN_ROOT}/share/mk/doc.relnotes.mk"
|
||||
.include "${DOC_PREFIX}/share/mk/doc.project.mk"
|
||||
|
@ -2,5 +2,12 @@
|
||||
|
||||
DOC_PREFIX?= ${RELN_ROOT}/../../../doc
|
||||
|
||||
# Find the RELNOTESng document catalog
|
||||
EXTRA_CATALOGS+= ${RELN_ROOT}/share/sgml/catalog
|
||||
|
||||
# Use the appropriate architecture-dependent RELNOTESng stylesheet
|
||||
DSLHTML?= ${RELN_ROOT}/share/sgml/release.dsl
|
||||
DSLPRINT?= ${RELN_ROOT}/share/sgml/release.dsl
|
||||
|
||||
# XXX using /release/doc as anchor!
|
||||
DESTDIR?= ${DOCDIR}/${.CURDIR:C/^.*\/release\/doc//}
|
||||
|
@ -1,32 +0,0 @@
|
||||
<!-- $FreeBSD$ -->
|
||||
|
||||
<!DOCTYPE style-sheet PUBLIC "-//James Clark//DTD DSSSL Style Sheet//EN" [
|
||||
<!ENTITY freebsd.dsl PUBLIC "-//FreeBSD//DOCUMENT DocBook Stylesheet//EN" CDATA DSSSL>
|
||||
]>
|
||||
|
||||
<style-sheet>
|
||||
<style-specification use="docbook">
|
||||
<style-specification-body>
|
||||
|
||||
; The architecture we're building for. We really need to pull this out of a
|
||||
; entity somewhere, so it can be defined without needing to munge the
|
||||
; stylesheet. Or do we?
|
||||
(define for-arch "i386")
|
||||
|
||||
(default
|
||||
(let* ((arch (attribute-string (normalize "arch"))))
|
||||
(if (or (equal? arch #f)
|
||||
(equal? arch ""))
|
||||
(next-match)
|
||||
; We can do a lot more flexible things here. Like it'd be nice to
|
||||
; tokenize the arch= attribute and do comparisons of for-arch against
|
||||
; different substrings.
|
||||
(cond ((equal? arch for-arch) (next-match))
|
||||
(else (empty-sosofo))))))
|
||||
|
||||
</style-specification-body>
|
||||
</style-specification>
|
||||
|
||||
<external-specification id="docbook" document="freebsd.dsl">
|
||||
</style-sheet>
|
||||
|
@ -8,13 +8,13 @@
|
||||
<style-specification use="docbook">
|
||||
<style-specification-body>
|
||||
|
||||
; The architecture we're building for. We really need to pull this out of a
|
||||
; entity somewhere, so it can be defined without needing to munge the
|
||||
; stylesheet. Or do we?
|
||||
(define for-arch "alpha")
|
||||
; The architecture we're building for. We need to define this as a
|
||||
; procedure, because we may not be able to evaluate it until we are
|
||||
; at a point in formatting where (current-node) is defined.
|
||||
|
||||
(default
|
||||
(let* ((arch (attribute-string (normalize "arch"))))
|
||||
(let* ((arch (attribute-string (normalize "arch")))
|
||||
(for-arch (entity-text "arch")))
|
||||
(if (or (equal? arch #f)
|
||||
(equal? arch ""))
|
||||
(next-match)
|
Loading…
Reference in New Issue
Block a user