[postgis-tickets] [SCM] PostGIS branch master updated. 3.2.0-408-g8fb375fb1
git at osgeo.org
git at osgeo.org
Sun Jan 30 15:12:48 PST 2022
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 8fb375fb18d96ff0c11ec9a1fd55a5cdc0fc220f (commit)
via 98c1ed850a1a4adb8d1f921e39ef41036fa58d23 (commit)
from ff06be517be9aecf566cd00a7ca52c8878a5fbd4 (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 8fb375fb18d96ff0c11ec9a1fd55a5cdc0fc220f
Author: Sandro Santilli <strk at kbt.io>
Date: Sat Jan 29 13:35:49 2022 +0100
[drone] Build localized docs out-of-tree
diff --git a/.drone-1.0.yml b/.drone-1.0.yml
index e4c6b08cd..6e6f0ec4c 100644
--- a/.drone-1.0.yml
+++ b/.drone-1.0.yml
@@ -55,8 +55,9 @@ steps:
pull: never
commands:
- apt update -qq && apt install -y poxml libsfcgal-dev
- - mkdir /tmp/pgis-docs - && cp -a * /tmp/pgis-docs
- - cd /tmp/pgis-docs # out-of-build html-localized is broken...
- - ./configure
+ - mkdir -p /tmp/postgis-build/docs
+ - pwd > /tmp/postgis-build/docs/.srcdir
+ - cd /tmp/postgis-build/docs
+ - sh `cat .srcdir`/configure
- make docs-localized
depends_on: [ autogen ]
commit 98c1ed850a1a4adb8d1f921e39ef41036fa58d23
Author: Sandro Santilli <strk at kbt.io>
Date: Sat Jan 29 13:35:39 2022 +0100
Fix out-of-tree build of localized docs
Closes #5067
diff --git a/.gitignore b/.gitignore
index 2e1a65377..c69659617 100644
--- a/.gitignore
+++ b/.gitignore
@@ -31,6 +31,7 @@ doc/Makefile
doc/Makefile.comments
doc/po/*/*.xml
doc/po/*/html
+doc/po/*/Makefile
doc/po/*/xsl
doc/po/*/*_comments.sql
doc/postgis_aggs_mm.xml
diff --git a/configure.ac b/configure.ac
index 8764220de..07307a46f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1689,6 +1689,15 @@ dnl ===========================================================================
dnl Output the relevant files
dnl ===========================================================================
+TRANSLATIONS_MAKEFILE_LIST=`grep 'translations = ' ${srcdir}/doc/Makefile.in \
+ | cut -d= -f2 \
+ | tr ' ' '\n' \
+ | grep -v '^ *$' \
+ | sed 's|^|doc/po/|;s|$|/Makefile|'
+`
+
+dnl echo "TRANSLATIONS_MAKEFILE_LIST: ${TRANSLATIONS_MAKEFILE_LIST}"
+
AC_CONFIG_FILES([GNUmakefile
extensions/Makefile
extensions/postgis/Makefile
@@ -1717,6 +1726,7 @@ AC_CONFIG_FILES([GNUmakefile
regress/loader/Makefile
doc/Makefile
doc/Makefile.comments
+ $TRANSLATIONS_MAKEFILE_LIST
doc/html/image_src/Makefile
utils/Makefile
$RT_MAKEFILE_LIST
diff --git a/doc/Makefile.in b/doc/Makefile.in
index 7ce5fb714..a2f405aff 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -220,39 +220,39 @@ endif
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) $(srcdir)/xsl/postgis_aggs_mm.xml.xsl postgis-out.xml > $@
+postgis_aggs_mm.xml: xsl/postgis_aggs_mm.xml.xsl Makefile postgis-out.xml $(XML_SOURCES)
+ $(XSLTPROC) --novalid --path $(srcdir) $< postgis-out.xml > $@
endif
-postgis_comments.sql: ./xsl/postgis_comments.sql.xsl $(XML_INPUTS)
- $(XSLTPROC) --novalid --path $(srcdir) $(srcdir)/xsl/postgis_comments.sql.xsl postgis-out.xml > $@
+postgis_comments.sql: xsl/postgis_comments.sql.xsl $(XML_INPUTS)
+ $(XSLTPROC) --novalid --path $(srcdir) $< postgis-out.xml > $@
-postgis_cheatsheet.html: ./xsl/postgis_cheatsheet.html.xsl $(XML_INPUTS)
- $(XSLTPROC) --novalid --path $(srcdir) $(srcdir)/xsl/postgis_cheatsheet.html.xsl postgis-out.xml > $@
+postgis_cheatsheet.html: xsl/postgis_cheatsheet.html.xsl $(XML_INPUTS)
+ $(XSLTPROC) --novalid --path $(srcdir) $< postgis-out.xml > $@
-raster_comments.sql: ./xsl/raster_comments.sql.xsl $(XML_INPUTS)
- $(XSLTPROC) --novalid --path $(srcdir) $(srcdir)/xsl/raster_comments.sql.xsl postgis-out.xml > $@
+raster_comments.sql: xsl/raster_comments.sql.xsl $(XML_INPUTS)
+ $(XSLTPROC) --novalid --path $(srcdir) $< postgis-out.xml > $@
raster_cheatsheet.html: ./xsl/raster_cheatsheet.html.xsl $(XML_INPUTS)
- $(XSLTPROC) --novalid --path $(srcdir) $(srcdir)/xsl/raster_cheatsheet.html.xsl postgis-out.xml > $@
+ $(XSLTPROC) --novalid --path $(srcdir) $< postgis-out.xml > $@
-topology_comments.sql: ./xsl/topology_comments.sql.xsl $(XML_INPUTS)
- $(XSLTPROC) --novalid --path $(srcdir) $(srcdir)/xsl/topology_comments.sql.xsl postgis-out.xml > $@
+topology_comments.sql: xsl/topology_comments.sql.xsl $(XML_INPUTS)
+ $(XSLTPROC) --novalid --path $(srcdir) $< postgis-out.xml > $@
-topology_cheatsheet.html: ./xsl/topology_cheatsheet.html.xsl $(XML_INPUTS)
- $(XSLTPROC) --novalid --path $(srcdir) $(srcdir)/xsl/topology_cheatsheet.html.xsl postgis-out.xml > $@
+topology_cheatsheet.html: xsl/topology_cheatsheet.html.xsl $(XML_INPUTS)
+ $(XSLTPROC) --novalid --path $(srcdir) $< postgis-out.xml > $@
-sfcgal_comments.sql: ./xsl/sfcgal_comments.sql.xsl $(XML_INPUTS)
- $(XSLTPROC) --novalid --path $(srcdir) $(srcdir)/xsl/sfcgal_comments.sql.xsl postgis-out.xml > $@
+sfcgal_comments.sql: xsl/sfcgal_comments.sql.xsl $(XML_INPUTS)
+ $(XSLTPROC) --novalid --path $(srcdir) $< postgis-out.xml > $@
-sfcgal_cheatsheet.html: ./xsl/sfcgal_cheatsheet.html.xsl $(XML_INPUTS)
- $(XSLTPROC) --novalid --path $(srcdir) $(srcdir)/xsl/sfcgal_cheatsheet.html.xsl postgis-out.xml > $@
+sfcgal_cheatsheet.html: xsl/sfcgal_cheatsheet.html.xsl $(XML_INPUTS)
+ $(XSLTPROC) --novalid --path $(srcdir) $< postgis-out.xml > $@
-tiger_geocoder_comments.sql: ./xsl/tiger_geocoder_comments.sql.xsl $(XML_INPUTS)
- $(XSLTPROC) --novalid --path $(srcdir) $(srcdir)/xsl/tiger_geocoder_comments.sql.xsl postgis-out.xml > $@
+tiger_geocoder_comments.sql: xsl/tiger_geocoder_comments.sql.xsl $(XML_INPUTS)
+ $(XSLTPROC) --novalid --path $(srcdir) $< postgis-out.xml > $@
-tiger_geocoder_cheatsheet.html: ./xsl/tiger_geocoder_cheatsheet.html.xsl $(XML_INPUTS)
- $(XSLTPROC) --novalid --path $(srcdir) $(srcdir)/xsl/tiger_geocoder_cheatsheet.html.xsl postgis-out.xml > $@
+tiger_geocoder_cheatsheet.html: xsl/tiger_geocoder_cheatsheet.html.xsl $(XML_INPUTS)
+ $(XSLTPROC) --novalid --path $(srcdir) $< postgis-out.xml > $@
postgis-out.xml: postgis.xml Makefile
$(PERL) -lpe "s'@@LAST_RELEASE_VERSION@@'${POSTGIS_MAJOR_VERSION}.${POSTGIS_MINOR_VERSION}.${POSTGIS_MICRO_VERSION}'g;s'@@POSTGIS_DOWNLOAD_URL@@'${POSTGIS_DOWNLOAD_URL}'g;" $< > $@
@@ -280,7 +280,6 @@ chunked-html-web-mobile: postgis-out.xml Makefile images $(XML_INPUTS)
$<
$(PERL) -pi -e 's/<head>/<head><meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">/g' $(HTML_BITS)
-
html: html/postgis$(DOCSUFFIX).html
html-localized:
@@ -360,6 +359,9 @@ clean:
distclean: clean
$(MAKE) -C html/image_src distclean
rm -f Makefile Makefile.comments html/image_src/Makefile
+ for lang in $(translations); do \
+ rm -f po/$$lang/Makefile; \
+ done
maintainer-clean: clean images-clean
rm -f postgis_comments.sql raster_comments.sql topology_comments.sql tiger_geocoder_comments.sql sfcgal_comments.sql
@@ -438,7 +440,7 @@ endif
check-localized:
@for lang in $(translations); do \
echo "Creating html for language $$lang..."; \
- $(MAKE) -C po/$$lang local-check; \
+ $(MAKE) -C po/$$lang local-check || exit 1; \
done
diff --git a/doc/po/Makefile.local b/doc/po/Makefile.local
index 971fd4ddc..6c146bb50 100644
--- a/doc/po/Makefile.local
+++ b/doc/po/Makefile.local
@@ -1,5 +1,5 @@
-# This file should be included by the Makefile
-# in each language directory
+# This file should be installed in each
+# language directory
local-all: local-html comments
@@ -14,7 +14,7 @@ local-check: symlinks
symlinks:
rm -f html; ln -s ../../html html
- rm -f xsl; ln -s ../../xsl xsl
+ rm -f xsl; ln -s $(srcdir)/../../xsl xsl
# for XML_SOURCES
include ../../Makefile
@@ -23,5 +23,5 @@ include ../../Makefile
PO2XML=po2xml
$(XML_SOURCES): %.xml: %.xml.po
- $(PO2XML) ../../$@ $< > $@
+ $(PO2XML) $(srcdir)/../../$@ $< > $@
diff --git a/doc/po/de/Makefile b/doc/po/de/Makefile
deleted file mode 100644
index 6fe645ad4..000000000
--- a/doc/po/de/Makefile
+++ /dev/null
@@ -1,2 +0,0 @@
-DOCSUFFIX=-de
-include ../Makefile.local
diff --git a/doc/po/de/Makefile.in b/doc/po/de/Makefile.in
new file mode 100644
index 000000000..31b255023
--- /dev/null
+++ b/doc/po/de/Makefile.in
@@ -0,0 +1,3 @@
+DOCSUFFIX=-de
+include @srcdir@/../Makefile.local
+srcdir=@srcdir@
diff --git a/doc/po/es/Makefile b/doc/po/es/Makefile
deleted file mode 100644
index 654f17bcb..000000000
--- a/doc/po/es/Makefile
+++ /dev/null
@@ -1,2 +0,0 @@
-DOCSUFFIX=-es
-include ../Makefile.local
diff --git a/doc/po/es/Makefile.in b/doc/po/es/Makefile.in
new file mode 100644
index 000000000..8aeaeb7ca
--- /dev/null
+++ b/doc/po/es/Makefile.in
@@ -0,0 +1,3 @@
+DOCSUFFIX=-es
+include @srcdir@/../Makefile.local
+srcdir=@srcdir@
diff --git a/doc/po/fr/Makefile b/doc/po/fr/Makefile
deleted file mode 100644
index ad05643a1..000000000
--- a/doc/po/fr/Makefile
+++ /dev/null
@@ -1,2 +0,0 @@
-DOCSUFFIX=-fr
-include ../Makefile.local
diff --git a/doc/po/fr/Makefile.in b/doc/po/fr/Makefile.in
new file mode 100644
index 000000000..71cba94cf
--- /dev/null
+++ b/doc/po/fr/Makefile.in
@@ -0,0 +1,3 @@
+DOCSUFFIX=-fr
+include @srcdir@/../Makefile.local
+srcdir=@srcdir@
diff --git a/doc/po/it_IT/Makefile b/doc/po/it_IT/Makefile
deleted file mode 100644
index 8e7df5460..000000000
--- a/doc/po/it_IT/Makefile
+++ /dev/null
@@ -1,2 +0,0 @@
-DOCSUFFIX=-it
-include ../Makefile.local
diff --git a/doc/po/it_IT/Makefile.in b/doc/po/it_IT/Makefile.in
new file mode 100644
index 000000000..39baedf11
--- /dev/null
+++ b/doc/po/it_IT/Makefile.in
@@ -0,0 +1,3 @@
+DOCSUFFIX=-it
+include @srcdir@/../Makefile.local
+srcdir=@srcdir@
diff --git a/doc/po/ja/Makefile b/doc/po/ja/Makefile
deleted file mode 100644
index 8070cb1e0..000000000
--- a/doc/po/ja/Makefile
+++ /dev/null
@@ -1,2 +0,0 @@
-DOCSUFFIX=-ja
-include ../Makefile.local
diff --git a/doc/po/ja/Makefile.in b/doc/po/ja/Makefile.in
new file mode 100644
index 000000000..7d732fb41
--- /dev/null
+++ b/doc/po/ja/Makefile.in
@@ -0,0 +1,3 @@
+DOCSUFFIX=-ja
+include @srcdir@/../Makefile.local
+srcdir=@srcdir@
diff --git a/doc/po/ko_KR/Makefile b/doc/po/ko_KR/Makefile
deleted file mode 100644
index 1f181bcf1..000000000
--- a/doc/po/ko_KR/Makefile
+++ /dev/null
@@ -1,2 +0,0 @@
-DOCSUFFIX=-ko_KR
-include ../Makefile.local
diff --git a/doc/po/ko_KR/Makefile.in b/doc/po/ko_KR/Makefile.in
new file mode 100644
index 000000000..aedfe8c8e
--- /dev/null
+++ b/doc/po/ko_KR/Makefile.in
@@ -0,0 +1,3 @@
+DOCSUFFIX=-ko_KR
+include @srcdir@/../Makefile.local
+srcdir=@srcdir@
diff --git a/doc/po/pl/Makefile b/doc/po/pl/Makefile
deleted file mode 100644
index 0693327df..000000000
--- a/doc/po/pl/Makefile
+++ /dev/null
@@ -1,2 +0,0 @@
-DOCSUFFIX=-pl
-include ../Makefile.local
diff --git a/doc/po/pl/Makefile.in b/doc/po/pl/Makefile.in
new file mode 100644
index 000000000..82370f7e3
--- /dev/null
+++ b/doc/po/pl/Makefile.in
@@ -0,0 +1,3 @@
+DOCSUFFIX=-pl
+include @srcdir@/../Makefile.local
+srcdir=@srcdir@
diff --git a/doc/po/pt_BR/Makefile b/doc/po/pt_BR/Makefile
deleted file mode 100644
index b47258197..000000000
--- a/doc/po/pt_BR/Makefile
+++ /dev/null
@@ -1,2 +0,0 @@
-DOCSUFFIX=-br
-include ../Makefile.local
diff --git a/doc/po/pt_BR/Makefile.in b/doc/po/pt_BR/Makefile.in
new file mode 100644
index 000000000..078a0c4f7
--- /dev/null
+++ b/doc/po/pt_BR/Makefile.in
@@ -0,0 +1,3 @@
+DOCSUFFIX=-br
+include @srcdir@/../Makefile.local
+srcdir=@srcdir@
diff --git a/doc/po/ru/Makefile b/doc/po/ru/Makefile
deleted file mode 100644
index 51ec828d0..000000000
--- a/doc/po/ru/Makefile
+++ /dev/null
@@ -1,2 +0,0 @@
-DOCSUFFIX=-ru
-include ../Makefile.local
diff --git a/doc/po/ru/Makefile.in b/doc/po/ru/Makefile.in
new file mode 100644
index 000000000..f771bc430
--- /dev/null
+++ b/doc/po/ru/Makefile.in
@@ -0,0 +1,3 @@
+DOCSUFFIX=-ru
+include @srcdir@/../Makefile.local
+srcdir=@srcdir@
-----------------------------------------------------------------------
Summary of changes:
.drone-1.0.yml | 7 ++++---
.gitignore | 1 +
configure.ac | 10 ++++++++++
doc/Makefile.in | 48 +++++++++++++++++++++++++-----------------------
doc/po/Makefile.local | 8 ++++----
doc/po/de/Makefile | 2 --
doc/po/de/Makefile.in | 3 +++
doc/po/es/Makefile | 2 --
doc/po/es/Makefile.in | 3 +++
doc/po/fr/Makefile | 2 --
doc/po/fr/Makefile.in | 3 +++
doc/po/it_IT/Makefile | 2 --
doc/po/it_IT/Makefile.in | 3 +++
doc/po/ja/Makefile | 2 --
doc/po/ja/Makefile.in | 3 +++
doc/po/ko_KR/Makefile | 2 --
doc/po/ko_KR/Makefile.in | 3 +++
doc/po/pl/Makefile | 2 --
doc/po/pl/Makefile.in | 3 +++
doc/po/pt_BR/Makefile | 2 --
doc/po/pt_BR/Makefile.in | 3 +++
doc/po/ru/Makefile | 2 --
doc/po/ru/Makefile.in | 3 +++
23 files changed, 71 insertions(+), 48 deletions(-)
delete mode 100644 doc/po/de/Makefile
create mode 100644 doc/po/de/Makefile.in
delete mode 100644 doc/po/es/Makefile
create mode 100644 doc/po/es/Makefile.in
delete mode 100644 doc/po/fr/Makefile
create mode 100644 doc/po/fr/Makefile.in
delete mode 100644 doc/po/it_IT/Makefile
create mode 100644 doc/po/it_IT/Makefile.in
delete mode 100644 doc/po/ja/Makefile
create mode 100644 doc/po/ja/Makefile.in
delete mode 100644 doc/po/ko_KR/Makefile
create mode 100644 doc/po/ko_KR/Makefile.in
delete mode 100644 doc/po/pl/Makefile
create mode 100644 doc/po/pl/Makefile.in
delete mode 100644 doc/po/pt_BR/Makefile
create mode 100644 doc/po/pt_BR/Makefile.in
delete mode 100644 doc/po/ru/Makefile
create mode 100644 doc/po/ru/Makefile.in
hooks/post-receive
--
PostGIS
More information about the postgis-tickets
mailing list