[postgis-tickets] [SCM] PostGIS branch master updated. 3.3.0rc2-1007-g4db6905eb

git at osgeo.org git at osgeo.org
Mon Jun 26 09:09:25 PDT 2023


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  4db6905ebed90ece2492a51a6e32beb48d6aab6a (commit)
      from  ee857ca7006d14c12c7700f8f2b05eb12e36e6ed (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 4db6905ebed90ece2492a51a6e32beb48d6aab6a
Author: Sandro Santilli <strk at kbt.io>
Date:   Mon Jun 26 18:03:29 2023 +0200

    Improve robustness of postgis_aggs_mm.xml building rule
    
    Do not produce an empty file in case of failure,
    avoid potential circular dependency (strip entity before parse)

diff --git a/doc/Makefile.in b/doc/Makefile.in
index 047a91104..8500fccc6 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -221,7 +221,8 @@ ifeq ($(XSLTPROC),)
 postgis_aggs_mm.xml: requirements_not_met_xsltproc
 else
 postgis_aggs_mm.xml: xsl/postgis_aggs_mm.xml.xsl Makefile postgis-out.xml $(XML_SOURCES)
-	$(XSLTPROC) --novalid --path $(srcdir) $< postgis-out.xml > $@
+	grep -v '\&postgis_aggs_mm;' postgis-out.xml | $(XSLTPROC) --novalid --path $(srcdir) $< - > $@.tmp
+	mv $@.tmp $@
 endif
 
 postgis_comments.sql: xsl/postgis_comments.sql.xsl $(XML_INPUTS)
@@ -355,6 +356,7 @@ clean:
 	rm -f $(XML_GENERATED_SOURCES)
 	rm -f postgis_gardentest_${POSTGIS_MAJOR_VERSION}${POSTGIS_MINOR_VERSION}.sql
 	rm -f raster_gardentest_${POSTGIS_MAJOR_VERSION}${POSTGIS_MINOR_VERSION}.sql
+	rm -f *.tmp
 
 distclean: clean
 	$(MAKE) -C html/image_src distclean

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

Summary of changes:
 doc/Makefile.in | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
PostGIS


More information about the postgis-tickets mailing list