[postgis-tickets] [SCM] PostGIS branch master updated. 3.4.0rc1-373-g5c9afde94

[git at osgeo.org]

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  5c9afde9488981915cece512e5214e91ad55860c (commit)
      from  a61cb95c8acafdc58f6f8cb88794ba6f10e5402f (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 5c9afde9488981915cece512e5214e91ad55860c
Author: Sandro Santilli <strk at kbt.io>
Date:   Mon Sep 11 16:32:14 2023 +0200

    Resolve XML entities only once

diff --git a/doc/Makefile.in b/doc/Makefile.in
index 9642d2e65..d1b7560c0 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -226,8 +226,7 @@ TAG_GENERATED_SOURCES = \
 	Z_support.tag
 
 XML_GENERATED_SOURCES = \
-	$(XSL_GENERATED_SOURCES) \
-	postgis-out.xml \
+	$(XSL_GENERATED_SOURCES)
 
 XML_INPUTS = $(XML_SOURCES) $(XML_GENERATED_SOURCES) $(TAG_GENERATED_SOURCES)
 
@@ -292,9 +291,6 @@ update-po: $(XML_INPUTS_POT)
   done
 endif
 
-postgis-nospecial.xml: postgis-out.xml
-	grep -v '\&postgis_special;' $< > $@
-
 ifeq ($(XSLTPROC),)
 $(XSL_GENERATED_SOURCES): requirements_not_met_xsltproc
 else
@@ -317,9 +313,14 @@ $(GENERATED_COMMENT_FILES): %.sql: xsl/%.sql.xsl $(XML_INPUTS) postgis-out.xml
 $(GENERATED_CHEATSHEET_FILES): $(html_builddir)/%$(DOCSUFFIX).html: xsl/%.html.xsl $(XML_INPUTS) postgis-out.xml xsl/common_cheatsheet.xsl xsl/common_utils.xsl
 	$(XSLTPROC) --novalid $(XSLTPROC_PATH_OPT) $(XSLTPROC_CUSTOM_VARS) -o $@ $< postgis-out.xml
 
+postgis-nospecial.xml: postgis.xml $(XML_SOURCES) $(TAG_GENERATED_SOURCES) Makefile
+	grep -v '\&postgis_special;' $< > $@.in
+	$(XMLLINT) $(XSLTPROC_PATH_OPT) --noent -o $@ $@.in
+
 # TODO: use a postgis_release_version variable passed via --stringparam
-postgis-out.xml: postgis.xml Makefile
-	$(PERL) -lpe "s'@@LAST_RELEASE_VERSION@@'${POSTGIS_MAJOR_VERSION}.${POSTGIS_MINOR_VERSION}.${POSTGIS_MICRO_VERSION}'g;s'@@POSTGIS_DOWNLOAD_URL@@'${POSTGIS_DOWNLOAD_URL}'g;" $< > $@
+postgis-out.xml: postgis.xml Makefile $(XML_INPUTS) Makefile
+	$(PERL) -lpe "s'@@LAST_RELEASE_VERSION@@'${POSTGIS_MAJOR_VERSION}.${POSTGIS_MINOR_VERSION}.${POSTGIS_MICRO_VERSION}'g;s'@@POSTGIS_DOWNLOAD_URL@@'${POSTGIS_DOWNLOAD_URL}'g;" $< > $@.in
+	$(XMLLINT) $(XSLTPROC_PATH_OPT) --noent -o $@ $@.in
 
 chunked-html: $(html_builddir)/postgis$(DOCSUFFIX)/docbook.css
 $(html_builddir)/postgis$(DOCSUFFIX)/docbook.css: postgis-out.xml Makefile $(XML_INPUTS)

-----------------------------------------------------------------------

Summary of changes:
 doc/Makefile.in | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)


hooks/post-receive
-- 
PostGIS