[postgis-tickets] [SCM] PostGIS branch master updated. 3.4.0rc1-562-g1e71cf1c0
git at osgeo.org
git at osgeo.org
Thu Sep 14 19:13:50 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 1e71cf1c0abab47163c85f60d87c6826b2ac2525 (commit)
via dfdc9c4f6f9e05f9b43222b1e2f1d0c51919a0cf (commit)
via e7a349cd7eea5db9bf3094028074655de9c3d51d (commit)
from 506e27a69dace92684a7a44b6e965d3cdfcecc2b (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 1e71cf1c0abab47163c85f60d87c6826b2ac2525
Author: Sandro Santilli <strk at kbt.io>
Date: Fri Sep 15 04:12:08 2023 +0200
Try XSL base uri https://cdn.docbook.org/release/xsl/current too
Might be needed for MacOS:
https://github.com/Homebrew/homebrew-core/blob/b90647c158fb3a37fce5417b2348190ef77259a3/Formula/d/docbook-xsl.rb#L88
See how existing uris and directories did not help:
https://cirrus-ci.com/task/4704652273385472?logs=test#L1022
diff --git a/configure.ac b/configure.ac
index 36f954ef8..0fd6d5d6b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -288,6 +288,7 @@ if test "x$XSLBASE" = "x"; then
dnl that matches from the following list
SEARCHPATH="
http://cdn.docbook.org/release/xsl/current
+ https://cdn.docbook.org/release/xsl/current
http://docbook.sourceforge.net/release/xsl-ns/current
/usr/share/sgml/docbook/xsl-stylesheets
/usr/share/xml/docbook/stylesheet/docbook-xsl-ns
commit dfdc9c4f6f9e05f9b43222b1e2f1d0c51919a0cf
Author: Sandro Santilli <strk at kbt.io>
Date: Fri Sep 15 04:08:38 2023 +0200
Do not override .po files if no messages changed in template file
References #5455
diff --git a/configure.ac b/configure.ac
index 99ce20667..36f954ef8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -226,6 +226,11 @@ if test "x$MSGCAT" = "x"; then
AC_MSG_WARN([msgcat is not installed so translation templates cannot be updated])
fi
+AC_PATH_PROG([MSGCOMM], [msgcomm], [])
+if test "x$MSGCOMM" = "x"; then
+ AC_MSG_WARN([msgcomm is not installed so translations cannot be updated])
+fi
+
AC_PATH_PROG([MSGATTRIB], [msgattrib], [])
if test "x$MSGATTRIB" = "x"; then
AC_MSG_WARN([msgattrib is not installed so translations cannot be updated])
diff --git a/doc/Makefile.in b/doc/Makefile.in
index 2d1a9f21a..aaf3e4e53 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -7,7 +7,7 @@
#
# PostGIS documentation build Makefile
#
-# Copyright 2003-2022 Sandro Santilli <strk at kbt.io>
+# Copyright 2003-2023 Sandro Santilli <strk at kbt.io>
# Copyright 2004-2012 Paul Ramsey <pramsey at cleverelephant.ca>
# Copyright 2009-2022 Regina Obe <lr at pcorp.us>
# Copyright 2008-2010 Mark Cave-Ayland
@@ -121,6 +121,7 @@ DBLATEX=@DBLATEX@
# Gettext for translated documentation
MSGCAT=@MSGCAT@
+MSGCOMM=@MSGCOMM@
MSGMERGE=@MSGMERGE@
MSGINIT=@MSGINIT@
MSGATTRIB=@MSGATTRIB@
@@ -256,13 +257,33 @@ GENERATED_CHEATSHEET_FILES = $(patsubst \
VPATH = $(srcdir)
+ifeq ($(MSGMERGE),)
+$(PO_FILES): requirements_not_met_msgmerge
+endif
+
+ifeq ($(MSGATTRIB),)
+$(PO_FILES): requirements_not_met_msgattrib
+endif
+
+ifeq ($(MSGCOMM),)
+$(PO_FILES): requirements_not_met_msgcomm
+endif
+
+ifeq ($(MSGCAT),)
+$(XML_UNIFIED_POT): requirements_not_met_msgcat
+endif
+
+ifeq ($(MSGINIT),)
+$(PO_FILES): requirements_not_met_msginit
+endif
+
ifeq ($(XML2POT),)
$(XML_SOURCE_POTS): requirements_not_met_xml2pot
-else
+endif
+
$(XML_SOURCE_POTS): %.xml.pot: %.xml
$(XML2POT) $< > $@
$(abs_srcdir)/po/strip_untranslatable.sh $@
-endif
# Update translation template
update-pot: $(XML_UNIFIED_POT)
@@ -286,20 +307,23 @@ $(XML_UNIFIED_POT): $(XML_SOURCE_POTS)
# Creates or updates translation files
update-po: $(PO_FILES)
-ifeq ($(MSGMERGE),)
-$(PO_FILES): requirements_not_met_msgmerge
-endif
-
$(PO_FILES): $(XML_UNIFIED_POT)
@mkdir -p `dirname $@`
@lang=`basename $$(dirname $@)`; \
if test -f $@; then \
- echo "Updating po file for language $$lang..." ; \
- $(MSGMERGE) --no-fuzzy-matching --update $@ $(XML_UNIFIED_POT) && \
- $(MSGATTRIB) --no-obsolete -o $@ $@ || exit 1; \
+ $(MSGMERGE) --no-fuzzy-matching -q -o $@.tmp $@ $(XML_UNIFIED_POT) || exit 1; \
+ $(MSGATTRIB) --no-obsolete -o $@.tmp $@.tmp || exit 1; \
+ if test -n "$$($(MSGCOMM) --unique $@.tmp $@ | tail -1)"; then \
+ mv $@.tmp $@; \
+ echo "$@ updated"; \
+ else \
+ echo "$@ unchanged"; \
+ touch $@; \
+ rm -f $@.tmp; \
+ fi; \
else \
- echo "Creating po file for language $$lang..." ; \
$(MSGINIT) -i $(XML_UNIFIED_POT) -o $@ -l $$lang --no-translator || exit 1; \
+ echo "$@ created"; \
fi;
ifeq ($(XSLTPROC),)
@@ -651,11 +675,17 @@ requirements_not_met_xslbase:
@echo " http://postgis.net/documentation"
@echo
+requirements_not_met_msginit: requirements_not_met_gettext
+requirements_not_met_msgattrib: requirements_not_met_gettext
+requirements_not_met_msgcat: requirements_not_met_gettext
+requirements_not_met_msgcomm: requirements_not_met_gettext
+requirements_not_met_msgmerge: requirements_not_met_gettext
requirements_not_met_gettext:
@echo
- @echo "configure was unable to find both gettext's 'msgmerge' utility program."
+ @echo "configure was unable to find gettext utility programs."
@echo "To update the translation templates, install gettext and then re-run configure."
@echo
+ @false
requirements_not_met_xml2pot:
@echo
commit e7a349cd7eea5db9bf3094028074655de9c3d51d
Author: Sandro Santilli <strk at kbt.io>
Date: Fri Sep 15 02:36:28 2023 +0200
Allow parallel po update
diff --git a/doc/Makefile.in b/doc/Makefile.in
index 27c615289..2d1a9f21a 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -236,6 +236,12 @@ XML_SOURCE_POTS = $(XML_SOURCES:%.xml=%.xml.pot)
XML_UNIFIED_POT = $(srcdir)/po/templates/postgis-manual.pot
+PO_FILES = $(patsubst \
+ %, \
+ $(srcdir)/po/%/postgis-manual.po, \
+ $(translations) \
+)
+
GENERATED_COMMENT_FILES = $(patsubst \
$(srcdir)/xsl/%.xsl, \
%, \
@@ -278,24 +284,24 @@ $(XML_UNIFIED_POT): $(XML_SOURCE_POTS)
@if test -e $@.tmp; then mv $@.tmp $@; fi
# Creates or updates translation files
+update-po: $(PO_FILES)
+
ifeq ($(MSGMERGE),)
-update-po: requirements_not_met_msgmerge
-else
-update-po: $(XML_UNIFIED_POT)
- @for lang in $(translations); do \
- mkdir -p $(srcdir)/po/$$lang; \
- po=$(srcdir)/po/$$lang/`basename $(XML_UNIFIED_POT) .pot`.po; \
- if test -f $$po; then \
- echo "Updating po file for language $$lang..." ; \
- $(MSGMERGE) --no-fuzzy-matching --update $$po $(XML_UNIFIED_POT) && \
- $(MSGATTRIB) --no-obsolete -o $$po $$po || exit 1; \
- else \
- echo "Creating po file for language $$lang..." ; \
- $(MSGINIT) -i $(XML_UNIFIED_POT) -o $$po -l $$lang --no-translator || exit 1; \
- fi; \
- done
+$(PO_FILES): requirements_not_met_msgmerge
endif
+$(PO_FILES): $(XML_UNIFIED_POT)
+ @mkdir -p `dirname $@`
+ @lang=`basename $$(dirname $@)`; \
+ if test -f $@; then \
+ echo "Updating po file for language $$lang..." ; \
+ $(MSGMERGE) --no-fuzzy-matching --update $@ $(XML_UNIFIED_POT) && \
+ $(MSGATTRIB) --no-obsolete -o $@ $@ || exit 1; \
+ else \
+ echo "Creating po file for language $$lang..." ; \
+ $(MSGINIT) -i $(XML_UNIFIED_POT) -o $@ -l $$lang --no-translator || exit 1; \
+ fi;
+
ifeq ($(XSLTPROC),)
$(XSL_GENERATED_SOURCES): requirements_not_met_xsltproc
else
-----------------------------------------------------------------------
Summary of changes:
configure.ac | 6 +++++
doc/Makefile.in | 74 ++++++++++++++++++++++++++++++++++++++++++---------------
2 files changed, 61 insertions(+), 19 deletions(-)
hooks/post-receive
--
PostGIS
More information about the postgis-tickets
mailing list