[SCM] PostGIS branch master updated. 3.7.0alpha1-627-gc86243a20
git at osgeo.org
git at osgeo.org
Sun Jul 19 04:11:55 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 c86243a205a0e5bb04442dc404c6acb86e8b8ee6 (commit)
via 9857bb67211f7611371e21598c9387e804eaa82b (commit)
via 556f8ac393e71694c1898df8e483a1713e96fa4f (commit)
via acab13994fea79079af8e139785647b5d6230cd2 (commit)
via 2101ee4ba20810a59bb9f2bed774e9f0ad6ddff0 (commit)
from 1af231a14f0f5c4e9352e2e5788ac12cf577c8c3 (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 c86243a205a0e5bb04442dc404c6acb86e8b8ee6
Merge: 1af231a14 9857bb672
Author: Darafei Praliaskouski <komzpa at gmail.com>
Date: Sun Jul 19 04:11:50 2026 -0700
Merge pull request 'doc: render localized HTML in parallel' (!401) from Komzpa/postgis:fix/docs-parallel-localized-html into master
Reviewed-on: https://gitea.osgeo.org/postgis/postgis/pulls/401
commit 9857bb67211f7611371e21598c9387e804eaa82b
Author: Darafei Praliaskouski <me at komzpa.net>
Date: Sun Jul 19 07:11:40 2026 +0400
ci: use available CPUs for localized HTML
diff --git a/ci/debbie/postgis_release_docs.sh b/ci/debbie/postgis_release_docs.sh
index cf3f3628f..414d5f316 100644
--- a/ci/debbie/postgis_release_docs.sh
+++ b/ci/debbie/postgis_release_docs.sh
@@ -15,6 +15,14 @@ export PGPATH=${PROJECTS}/pg/rel/pg${PG_VER}w${OS_BUILD}
export PATH="${PGPATH}/bin:$PATH"
export LD_LIBRARY_PATH="${PROJECTS}/gdal/rel-${GDAL_VER}w${OS_BUILD}/lib:${PROJECTS}/geos/rel-${GEOS_VER}w${OS_BUILD}/lib:${PGPATH}/lib"
+LOCALIZED_HTML_JOBS=${LOCALIZED_HTML_JOBS:-$(nproc)}
+case "${LOCALIZED_HTML_JOBS}" in
+ ''|*[!0-9]*|0)
+ echo "LOCALIZED_HTML_JOBS must be a positive integer" >&2
+ exit 1
+ ;;
+esac
+
release_docs_tmpdir=
release_docs_pgdata=
@@ -128,7 +136,7 @@ fi
make cheatsheets
make -e chunked-html # TODO: do we really want this too in the doc-html-*.tar.gz package ?
-make -j2 html-localized # TODO: do we really want this too in the doc-html-*.tar.gz package ?
+make -j"${LOCALIZED_HTML_JOBS}" html-localized # TODO: do we really want this too in the doc-html-*.tar.gz package ?
package="doc-html-${POSTGIS_MAJOR_VERSION}.${POSTGIS_MINOR_VERSION}.${POSTGIS_MICRO_VERSION}.tar.gz"
tar -czf "$package" --exclude='static' --exclude='wkt' --exclude '*.o' html
@@ -139,7 +147,7 @@ make html-assets-install
make html-install
make html-install-localized
make chunked-html-install
-make -j2 chunked-html-install-localized
+make -j"${LOCALIZED_HTML_JOBS}" chunked-html-install-localized
make cheatsheet-install
make cheatsheet-install-localized
commit 556f8ac393e71694c1898df8e483a1713e96fa4f
Author: Darafei Praliaskouski <me at komzpa.net>
Date: Sun Jul 19 04:18:43 2026 +0400
doc: parallelize localized chunked HTML installs
diff --git a/ci/debbie/postgis_release_docs.sh b/ci/debbie/postgis_release_docs.sh
index 884a46969..cf3f3628f 100644
--- a/ci/debbie/postgis_release_docs.sh
+++ b/ci/debbie/postgis_release_docs.sh
@@ -139,7 +139,7 @@ make html-assets-install
make html-install
make html-install-localized
make chunked-html-install
-make chunked-html-install-localized
+make -j2 chunked-html-install-localized
make cheatsheet-install
make cheatsheet-install-localized
diff --git a/doc/Makefile.in b/doc/Makefile.in
index 2155c64e7..4c257a886 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -500,12 +500,16 @@ review-html: html ## Compare this manual with REVIEW_HTML_BASE using synchronize
# directory. Build and validate those files once before recursive render
# targets can run in parallel.
localized_html_targets = $(addprefix html-localized-,$(translations))
+localized_chunked_install_targets = $(addprefix chunked-html-install-localized-,$(translations))
-.PHONY: html-localized localized-html-ready
+.PHONY: html-localized chunked-html-install-localized localized-html-ready
html-localized: $(localized_html_targets) ## Generate a single-file html/postgis-<lang>.html for supported languages
@:
+chunked-html-install-localized: $(localized_chunked_install_targets) ## Install multi-file html for supported languages
+ @:
+
# Localized builds share the English reference index installed alongside all
# manuals. Build it once before fan-out; recursive localized makes only read
# it and never race to replace it with a translated index.
@@ -516,6 +520,10 @@ html-localized-%: | localized-html-ready
@echo "Making html for language $*..."
$(MAKE) -C po/$* local-html
+chunked-html-install-localized-%: | $(HTML_REF_INDEX)
+ @echo "Making chunked-html-install for language $*..."
+ $(MAKE) -C po/$* local-chunked-html-install
+
%-localized:
rule=$(patsubst %-localized,%,$@); \
for lang in $(translations); do \
commit acab13994fea79079af8e139785647b5d6230cd2
Author: Darafei Praliaskouski <me at komzpa.net>
Date: Sun Jul 19 04:06:20 2026 +0400
doc: keep the shared reference index English
diff --git a/doc/Makefile.in b/doc/Makefile.in
index 1dcdb1c7b..2155c64e7 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -141,6 +141,11 @@ POSTGIS_BLOCK_LABELS_COMMON_XSL=$(abs_srcdir)/xsl/postgis-block-labels-common.xs
HTML_REF_INDEX_JSON=$(html_builddir)/postgis-ref-index.json
HTML_REF_INDEX_JS=$(html_builddir)/postgis-ref-index.js
HTML_REF_INDEX=$(HTML_REF_INDEX_JSON) $(HTML_REF_INDEX_JS)
+ifeq ($(DOCSUFFIX),-en)
+HTML_REF_INDEX_DEPS=$(HTML_REF_INDEX)
+else
+HTML_REF_INDEX_DEPS=
+endif
# DBLatex's dblatex script for PDF generation from DocBook
DBLATEX=@DBLATEX@
@@ -460,7 +465,7 @@ $(HTML_REF_INDEX_JS): $(HTML_REF_INDEX_JSON)
$(MAKE) $(HTML_REF_INDEX_JSON); \
fi
-$(html_builddir)/postgis$(DOCSUFFIX)/index.html: postgis-out.xml Makefile $(CHUNK_HTML_DOCBOOK_XSL) $(HTML_REF_INDEX) $(HTML_RUNTIME_ASSETS) | visual-examples
+$(html_builddir)/postgis$(DOCSUFFIX)/index.html: postgis-out.xml Makefile $(CHUNK_HTML_DOCBOOK_XSL) $(HTML_REF_INDEX_DEPS) $(HTML_RUNTIME_ASSETS) | visual-examples
$(XSLTPROC) $(XSLTPROC_COMMONOPTS) \
$(XSLTPROC_CHUNKED_HTML_OPTS) \
--stringparam postgis.visual.manifest "$(visual_examples_manifest)" \
@@ -496,18 +501,18 @@ review-html: html ## Compare this manual with REVIEW_HTML_BASE using synchronize
# targets can run in parallel.
localized_html_targets = $(addprefix html-localized-,$(translations))
-.PHONY: html-localized refresh-html-ref-index
+.PHONY: html-localized localized-html-ready
html-localized: $(localized_html_targets) ## Generate a single-file html/postgis-<lang>.html for supported languages
@:
-# Localized builds share one installed reference index. Keep its English
-# contents newer than the translated XML files so recursive builds only read
-# it while rendering in parallel.
-refresh-html-ref-index: check-localized $(HTML_REF_INDEX)
- touch $(HTML_REF_INDEX)
+# Localized builds share the English reference index installed alongside all
+# manuals. Build it once before fan-out; recursive localized makes only read
+# it and never race to replace it with a translated index.
+localized-html-ready: check-localized $(HTML_REF_INDEX)
+ @:
-html-localized-%: | refresh-html-ref-index
+html-localized-%: | localized-html-ready
@echo "Making html for language $*..."
$(MAKE) -C po/$* local-html
@@ -518,7 +523,7 @@ html-localized-%: | refresh-html-ref-index
$(MAKE) -C po/$$lang local-$$rule || exit 1; \
done
-$(html_builddir)/postgis$(DOCSUFFIX).html: postgis-out.xml Makefile $(HTML_DOCBOOK_XSL) $(HTML_REF_INDEX) $(HTML_RUNTIME_ASSETS) | visual-examples
+$(html_builddir)/postgis$(DOCSUFFIX).html: postgis-out.xml Makefile $(HTML_DOCBOOK_XSL) $(HTML_REF_INDEX_DEPS) $(HTML_RUNTIME_ASSETS) | visual-examples
$(XSLTPROC) $(XSLTPROC_COMMONOPTS) \
--stringparam html.stylesheet style.css?v=$(HTML_ASSET_VERSION) \
--stringparam html.script "postgis-ref-index.js?v=$(HTML_ASSET_VERSION) example-blocks.js?v=$(HTML_ASSET_VERSION)" \
commit 2101ee4ba20810a59bb9f2bed774e9f0ad6ddff0
Author: Darafei Praliaskouski <me at komzpa.net>
Date: Sun Jul 19 02:57:42 2026 +0400
doc: render localized HTML in parallel
diff --git a/ci/debbie/postgis_release_docs.sh b/ci/debbie/postgis_release_docs.sh
index 7887b1cb7..884a46969 100644
--- a/ci/debbie/postgis_release_docs.sh
+++ b/ci/debbie/postgis_release_docs.sh
@@ -128,7 +128,7 @@ fi
make cheatsheets
make -e chunked-html # TODO: do we really want this too in the doc-html-*.tar.gz package ?
-make html-localized # TODO: do we really want this too in the doc-html-*.tar.gz package ?
+make -j2 html-localized # TODO: do we really want this too in the doc-html-*.tar.gz package ?
package="doc-html-${POSTGIS_MAJOR_VERSION}.${POSTGIS_MINOR_VERSION}.${POSTGIS_MICRO_VERSION}.tar.gz"
tar -czf "$package" --exclude='static' --exclude='wkt' --exclude '*.o' html
diff --git a/doc/Makefile.in b/doc/Makefile.in
index 86fad47ac..1dcdb1c7b 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -494,7 +494,22 @@ review-html: html ## Compare this manual with REVIEW_HTML_BASE using synchronize
# Localized render targets share translated XML files in each language
# directory. Build and validate those files once before recursive render
# targets can run in parallel.
-html-localized: check-localized ## Generate a single-file html/postgis-<lang>.html for supported languages
+localized_html_targets = $(addprefix html-localized-,$(translations))
+
+.PHONY: html-localized refresh-html-ref-index
+
+html-localized: $(localized_html_targets) ## Generate a single-file html/postgis-<lang>.html for supported languages
+ @:
+
+# Localized builds share one installed reference index. Keep its English
+# contents newer than the translated XML files so recursive builds only read
+# it while rendering in parallel.
+refresh-html-ref-index: check-localized $(HTML_REF_INDEX)
+ touch $(HTML_REF_INDEX)
+
+html-localized-%: | refresh-html-ref-index
+ @echo "Making html for language $*..."
+ $(MAKE) -C po/$* local-html
%-localized:
rule=$(patsubst %-localized,%,$@); \
-----------------------------------------------------------------------
Summary of changes:
ci/debbie/postgis_release_docs.sh | 12 ++++++++++--
doc/Makefile.in | 34 +++++++++++++++++++++++++++++++---
2 files changed, 41 insertions(+), 5 deletions(-)
hooks/post-receive
--
PostGIS
More information about the postgis-tickets
mailing list