[postgis-tickets] [SCM] PostGIS branch master updated. 3.3.0rc2-1158-ge55666b2b

[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  e55666b2b0cb4cdcb3717635297fd9988259d81d (commit)
       via  f5fd56c66b9b960787f1555c50f0568d9de12654 (commit)
      from  4997d11b8291aacee7ce683539b61641252b5508 (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 e55666b2b0cb4cdcb3717635297fd9988259d81d
Author: Sandro Santilli <strk at kbt.io>
Date:   Thu Jul 6 00:28:18 2023 +0200

    Have woodie build cheatsheets

diff --git a/.woodpecker/docs.yml b/.woodpecker/docs.yml
index aee2639fd..36cf748c7 100644
--- a/.woodpecker/docs.yml
+++ b/.woodpecker/docs.yml
@@ -7,21 +7,25 @@ pipeline:
       - mkdir -p build-docs && cd build-docs
       - ../configure --without-pg
       - make postgis_revision.h
+  check-xml:
+      - cd build-docs
+      - make -C doc check
+      - make -C doc/ check-localized
   build-html:
     image: docker.osgeo.org/postgis/build-test:trisquel3
     commands:
       - cd build-docs
-      - make docs
-      - make -C doc check
-      - make docs-localized
-      - make -C doc/ check-localized
+      - make -C doc html
+      - make -C doc/ html-localized
   build-pdf:
     image: docker.osgeo.org/postgis/build-test:trisquel3
     commands:
       - cd build-docs
       - make -C doc/ pdf
+      - make -C doc/ pdf-localized
   build-cheatsheets:
     image: docker.osgeo.org/postgis/build-test:trisquel3
     commands:
       - cd build-docs
       - make -C doc/ cheatsheets
+      - make -C doc/ cheatsheets-localized

commit f5fd56c66b9b960787f1555c50f0568d9de12654
Author: Sandro Santilli <strk at kbt.io>
Date:   Thu Jul 6 00:24:13 2023 +0200

    Localize cheatsheets
    
    References #5435

diff --git a/doc/Makefile.in b/doc/Makefile.in
index 01b93c551..e28bf221f 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -227,8 +227,8 @@ GENERATED_COMMENT_FILES = $(patsubst \
 )
 
 GENERATED_CHEATSHEET_FILES = $(patsubst \
-	$(srcdir)/xsl/%.xsl, \
-	html/%, \
+	$(srcdir)/xsl/%.html.xsl, \
+	html/%$(DOCSUFFIX).html, \
 	$(wildcard $(srcdir)/xsl/*_cheatsheet.html.xsl) \
 )
 
@@ -298,7 +298,7 @@ endif
 $(GENERATED_COMMENT_FILES): %.sql: xsl/%.sql.xsl $(XML_INPUTS) postgis-out.xml
 	$(XSLTPROC) --novalid $(XSLTPROC_PATH_OPT) -o $@ $< postgis-out.xml
 
-$(GENERATED_CHEATSHEET_FILES): html/%.html: xsl/%.html.xsl $(XML_INPUTS) postgis-out.xml
+$(GENERATED_CHEATSHEET_FILES): html/%$(DOCSUFFIX).html: xsl/%.html.xsl $(XML_INPUTS) postgis-out.xml
 	$(XSLTPROC) --novalid $(XSLTPROC_PATH_OPT) -o $@ $< postgis-out.xml
 
 postgis-out.xml: postgis.xml Makefile
@@ -417,14 +417,16 @@ pdf-clean:
 epub-clean:
 	rm -f postgis*$(DOCSUFFIX).epub
 
-clean: images-clean html-clean html-clean-localized pdf-clean pdf-clean-localized epub-clean epub-clean-localized
+cheatsheet-clean:
+	rm -f $(GENERATED_CHEATSHEET_FILES)
+
+clean: images-clean html-clean html-clean-localized pdf-clean pdf-clean-localized epub-clean epub-clean-localized cheatsheet-clean cheatsheet-clean-localized
 	rm -f images # work around https://trac.osgeo.org/postgis/ticket/5422
 	rm -f $(XML_GENERATED_SOURCES)
 	rm -f $(TAG_GENERATED_SOURCES)
 	$(MAKE) -C html/images clean
 	rm -f postgis_gardentest_${POSTGIS_MAJOR_VERSION}${POSTGIS_MINOR_VERSION}.sql
 	rm -f raster_gardentest_${POSTGIS_MAJOR_VERSION}${POSTGIS_MINOR_VERSION}.sql
-	rm -f $(GENERATED_CHEATSHEET_FILES)
 	rm -f *.tmp
 	$(MAKE) clean-localized
 
@@ -441,7 +443,7 @@ else
 comments: postgis_comments.sql raster_comments.sql topology_comments.sql sfcgal_comments.sql tiger_geocoder_comments.sql
 endif
 
-cheatsheets: html/postgis_cheatsheet.html html/raster_cheatsheet.html html/topology_cheatsheet.html html/sfcgal_cheatsheet.html html/tiger_geocoder_cheatsheet.html
+cheatsheets: $(GENERATED_CHEATSHEET_FILES)
 
 ifneq ($(CAN_BUILD_COMMENTS),yes)
 comments-install:

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

Summary of changes:
 .woodpecker/docs.yml | 12 ++++++++----
 doc/Makefile.in      | 14 ++++++++------
 2 files changed, 16 insertions(+), 10 deletions(-)


hooks/post-receive
-- 
PostGIS