[SCM] PostGIS branch master updated. 3.6.0rc2-627-g650756cd2
git at osgeo.org
git at osgeo.org
Fri Jun 19 14:18:46 PDT 2026
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "PostGIS".
The branch, master has been updated
via 650756cd29999db62384b98f1c2e876c6a61efc6 (commit)
from bdf4f57279395f82cc323c14f828cbd50b678444 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 650756cd29999db62384b98f1c2e876c6a61efc6
Author: Darafei Praliaskouski <me at komzpa.net>
Date: Sat Jun 20 01:03:13 2026 +0400
doc: validate manual with DocBook XMLSchema
Detect the DocBook 5 XMLSchema during configure and include XMLSchema validation in the documentation check target.
References #5532
Closes https://github.com/postgis/postgis/pull/967
diff --git a/NEWS b/NEWS
index 4012eedcf..6523cb57e 100644
--- a/NEWS
+++ b/NEWS
@@ -63,6 +63,8 @@ To take advantage of all postgis_sfcgal extension features SFCGAL 2.3+ is needed
reprojection support (Darafei Praliaskouski)
- #4749, Use point-in-polygon predicate fast paths for point-only
GeometryCollections (Darafei Praliaskouski)
+ - #5532, Validate the manual against DocBook XMLSchema in check-xml
+ (Darafei Praliaskouski)
* Bug Fixes *
diff --git a/configure.ac b/configure.ac
index 6d84d5568..57157d133 100644
--- a/configure.ac
+++ b/configure.ac
@@ -397,6 +397,19 @@ else
fi
AC_SUBST([DOCBOOK5_RNG])
+dnl
+dnl Ensure DocBook XMLSchema can be found
+dnl
+DOCBOOK5_XSD=http://docbook.org/xml/5.0/xsd/docbook.xsd
+if test "x$XMLCATALOG" = "x"; then
+ DOCBOOK5_XSD=
+else
+ if $XMLCATALOG '' "${DOCBOOK5_XSD}" > /dev/null; then :
+ else DOCBOOK5_XSD=
+ fi
+fi
+AC_SUBST([DOCBOOK5_XSD])
+
dnl
dnl Ensure DocBook DTD can be found
dnl
diff --git a/doc/Makefile.in b/doc/Makefile.in
index 6230b2031..1c792eb0d 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -64,6 +64,7 @@ XMLCATALOG=@XMLCATALOG@
XSLTPROC=@XSLTPROC@
XSLBASE=@XSLBASE@
DOCBOOK5_RNG=@DOCBOOK5_RNG@
+DOCBOOK5_XSD=@DOCBOOK5_XSD@
DOCBOOK5_DTD=@DOCBOOK5_DTD@
CAN_UPDATE_TRANSLATIONS=@CAN_UPDATE_TRANSLATIONS@
XMLLINT=@XMLLINT@
@@ -287,6 +288,11 @@ ifeq ($(DOCBOOK5_RNG),)
CAN_CHECK_XML = no
endif
+ifeq ($(DOCBOOK5_XSD),)
+check-xml: requirements_not_met_docbook5_xsd
+CAN_CHECK_XML = no
+endif
+
ifeq ($(DOCBOOK5_DTD),)
CAN_CHECK_XML = no
endif
@@ -624,6 +630,9 @@ check-xml: postgis-out.xml
--valid --loaddtd \
--relaxng $(DOCBOOK5_RNG) \
$<
+ $(XMLLINT) --noout --nonet \
+ --schema $(DOCBOOK5_XSD) \
+ $<
check-cheatsheets: cheatsheets
for f in $(html_builddir)/*_cheatsheet-en.html; do \
@@ -657,6 +666,13 @@ requirements_not_met_xmlcatalog:
@echo
@false
+requirements_not_met_docbook5_xsd:
+ @echo
+ @echo "configure was unable to locate DocBook XMLSchema (docbook.xsd)."
+ @echo "Install DocBook 5 schemas/catalog entries and then re-run configure."
+ @echo
+ @false
+
requirements_not_met_xslbase:
@echo
diff --git a/doc/README b/doc/README
index 905cbfef1..865190eb3 100644
--- a/doc/README
+++ b/doc/README
@@ -68,7 +68,8 @@ Make targets
XML files. See ``make check-localized``
``make check``
- check structural correctness of XML documentation
+ check structural correctness of XML documentation with DocBook DTD,
+ RelaxNG, and XMLSchema validation
``make check-localized``
check structural correctness of localized (translated)
-----------------------------------------------------------------------
Summary of changes:
NEWS | 2 ++
configure.ac | 13 +++++++++++++
doc/Makefile.in | 16 ++++++++++++++++
doc/README | 3 ++-
4 files changed, 33 insertions(+), 1 deletion(-)
hooks/post-receive
--
PostGIS
More information about the postgis-tickets
mailing list