[postgis-tickets] [SCM] PostGIS branch master updated. 3.3.0rc2-1089-g924567262

[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  9245672620f42ee45ce83526a5234771219c073e (commit)
      from  52b6274d323aa43719458537c7972f59591c439c (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 9245672620f42ee45ce83526a5234771219c073e
Author: Sandro Santilli <strk at kbt.io>
Date:   Fri Jun 30 16:41:26 2023 +0200

    Fix EPUB build (only in-tree builds)
    
    Moves all postgis_special entities to top-level file,
    symlink html images dir to make dbtoepub happy.
    
    Simplify debbie epub generation code
    
    Closes #5422

diff --git a/.gitignore b/.gitignore
index 196985896..d587553b6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -25,6 +25,7 @@ config.status
 configure
 de9i*.png
 doc/*.html
+doc/images
 doc/html/images/generator
 doc/html/images/Makefile
 doc/html/images/*.png
@@ -195,6 +196,7 @@ doc/sfcgal_comments.sql
 postgis/sfcgal.sql
 postgis/uninstall_sfcgal.sql
 *.pdf
+*.epub
 .idea/*
 .syntastic_c_config
 .vs/*
diff --git a/ci/debbie/postgis_release_docs.sh b/ci/debbie/postgis_release_docs.sh
index f35539323..40598590c 100644
--- a/ci/debbie/postgis_release_docs.sh
+++ b/ci/debbie/postgis_release_docs.sh
@@ -68,9 +68,6 @@ if [[ "$POSTGIS_MICRO_VERSION" == *"dev"* ]]; then
 fi
 
 make pdf
-rm -rf images
-mkdir images
-cp html/images/* images
 make epub
 make -e chunked-html-web 2>&1 | tee -a doc-errors.log
 
diff --git a/doc/Makefile.in b/doc/Makefile.in
index e668f5129..faa417ac1 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -355,6 +355,7 @@ ifeq ($(DBTOEPUB),)
 	@echo
 	@false
 else
+	ln -fs html/images .; # work around https://trac.osgeo.org/postgis/ticket/5422
 	$(DBTOEPUB) -c "${PWD}/html/style.css" \
 	 -o postgis-${POSTGIS_MAJOR_VERSION}.${POSTGIS_MINOR_VERSION}.${POSTGIS_MICRO_VERSION}$(DOCSUFFIX).epub \
 		$<
@@ -386,6 +387,7 @@ clean:
 	rm -f html/*.html
 	rm -f postgis-${POSTGIS_MAJOR_VERSION}.${POSTGIS_MINOR_VERSION}.${POSTGIS_MICRO_VERSION}.pdf
 	rm -f *.epub
+	rm images # work around https://trac.osgeo.org/postgis/ticket/5422
 	rm -f $(XML_GENERATED_SOURCES)
 	$(MAKE) -C html/images clean
 	rm -f postgis_gardentest_${POSTGIS_MAJOR_VERSION}${POSTGIS_MINOR_VERSION}.sql
diff --git a/doc/postgis.xml b/doc/postgis.xml
index 86325a73d..5ef46561b 100644
--- a/doc/postgis.xml
+++ b/doc/postgis.xml
@@ -73,8 +73,20 @@
 <!ENTITY index_aware SYSTEM "tag_index_aware.xml">
 <!ENTITY geography_transform SYSTEM "tag_geography_transform.xml">
 
-<!ENTITY % postgis_special SYSTEM "postgis_special.ent">
-%postgis_special;
+<!-- entity definitions for the postgis_special section -->
+<!ENTITY postgis_special SYSTEM "postgis_special.xml">
+<!ENTITY list_3d_functions SYSTEM "list_3d_functions.xsl.xml">
+<!ENTITY list_aggregates SYSTEM "list_aggregates.xsl.xml">
+<!ENTITY list_box_functions SYSTEM "list_box_functions.xsl.xml">
+<!ENTITY list_curved_geometry_functions SYSTEM "list_curved_geometry_functions.xsl.xml">
+<!ENTITY list_dump_functions SYSTEM "list_dump_functions.xsl.xml">
+<!ENTITY list_geography_functions SYSTEM "list_geography_functions.xsl.xml">
+<!ENTITY list_new_functions SYSTEM "list_new_functions.xsl.xml">
+<!ENTITY list_polyhedral_geometry_functions SYSTEM "list_curved_geometry_functions.xsl.xml">
+<!ENTITY list_raster_functions SYSTEM "list_raster_functions.xsl.xml">
+<!ENTITY list_sqlmm_functions SYSTEM "list_sqlmm_functions.xsl.xml">
+<!ENTITY list_window_functions SYSTEM "list_window_functions.xsl.xml">
+<!ENTITY table_body_function_support_matrix SYSTEM "table_body_function_support_matrix.xsl.xml">
 
 ]>
 
diff --git a/doc/postgis_special.ent b/doc/postgis_special.ent
deleted file mode 100644
index ae281e661..000000000
--- a/doc/postgis_special.ent
+++ /dev/null
@@ -1,16 +0,0 @@
-<!-- shared entity definitions for the postgis_special section -->
-
-<!ENTITY postgis_special SYSTEM "postgis_special.xml">
-
-<!ENTITY list_3d_functions SYSTEM "list_3d_functions.xsl.xml">
-<!ENTITY list_aggregates SYSTEM "list_aggregates.xsl.xml">
-<!ENTITY list_box_functions SYSTEM "list_box_functions.xsl.xml">
-<!ENTITY list_curved_geometry_functions SYSTEM "list_curved_geometry_functions.xsl.xml">
-<!ENTITY list_dump_functions SYSTEM "list_dump_functions.xsl.xml">
-<!ENTITY list_geography_functions SYSTEM "list_geography_functions.xsl.xml">
-<!ENTITY list_new_functions SYSTEM "list_new_functions.xsl.xml">
-<!ENTITY list_polyhedral_geometry_functions SYSTEM "list_curved_geometry_functions.xsl.xml">
-<!ENTITY list_raster_functions SYSTEM "list_raster_functions.xsl.xml">
-<!ENTITY list_sqlmm_functions SYSTEM "list_sqlmm_functions.xsl.xml">
-<!ENTITY list_window_functions SYSTEM "list_window_functions.xsl.xml">
-<!ENTITY table_body_function_support_matrix SYSTEM "table_body_function_support_matrix.xsl.xml">

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

Summary of changes:
 .gitignore                        |  2 ++
 ci/debbie/postgis_release_docs.sh |  3 ---
 doc/Makefile.in                   |  2 ++
 doc/postgis.xml                   | 16 ++++++++++++++--
 doc/postgis_special.ent           | 16 ----------------
 5 files changed, 18 insertions(+), 21 deletions(-)
 delete mode 100644 doc/postgis_special.ent


hooks/post-receive
-- 
PostGIS