[postgis-tickets] [SCM] PostGIS branch master updated. 3.3.0rc2-1247-ge63ad7402
git at osgeo.org
git at osgeo.org
Fri Jul 14 00:50:12 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 e63ad7402c62de04e3cae32b12d980c230a80038 (commit)
via 1fba0a7e56b6f53756280dec4b6146853b43dcd6 (commit)
from ab511bf34c90759769e6782ac1a0915972191690 (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 e63ad7402c62de04e3cae32b12d980c230a80038
Author: Sandro Santilli <strk at kbt.io>
Date: Fri Jul 14 09:49:53 2023 +0200
Simplify symlink processing
diff --git a/doc/po/Makefile.local b/doc/po/Makefile.local
index 1113da625..cd2f464bd 100644
--- a/doc/po/Makefile.local
+++ b/doc/po/Makefile.local
@@ -13,11 +13,11 @@ local-clean: local-html-clean local-pdf-clean local-epub-clean local-cheatsheet-
local-distclean:
rm -f Makefile
-local-%: symlinks
+local-%: xsl
$(MAKE) $(patsubst local-%,%,$@) DOCSUFFIX=$(DOCSUFFIX)
-symlinks:
- test -e xsl || ln -sf $(srcdir)/../../xsl .
+xsl:
+ ln -sf $(srcdir)/../../xsl .
# for XML_SOURCES
include ../../Makefile
commit 1fba0a7e56b6f53756280dec4b6146853b43dcd6
Author: Sandro Santilli <strk at kbt.io>
Date: Fri Jul 14 09:30:40 2023 +0200
Use a variable for HTML output dir, stop using symlink for localized
diff --git a/doc/Makefile.in b/doc/Makefile.in
index 7650caf93..95a3b005b 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -45,6 +45,8 @@ POSTGIS_MINOR_VERSION=@POSTGIS_MINOR_VERSION@
POSTGIS_MICRO_VERSION=@POSTGIS_MICRO_VERSION@
DOCSUFFIX=-en
+# TODO: change this ?
+HTML_OUT_DIR=$(abs_builddir)/html
ifneq (,$(findstring dev,$(POSTGIS_MICRO_VERSION)))
POSTGIS_DOWNLOAD_URL=http://postgis.net/stuff
@@ -236,7 +238,7 @@ GENERATED_COMMENT_FILES = $(patsubst \
GENERATED_CHEATSHEET_FILES = $(patsubst \
$(abs_srcdir)/xsl/%.html.xsl, \
- html/%$(DOCSUFFIX).html, \
+ $(HTML_OUT_DIR)/%$(DOCSUFFIX).html, \
$(wildcard $(abs_srcdir)/xsl/*_cheatsheet.html.xsl) \
)
@@ -306,23 +308,23 @@ 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/%$(DOCSUFFIX).html: xsl/%.html.xsl $(XML_INPUTS) postgis-out.xml xsl/common_cheatsheet.xsl xsl/common_utils.xsl
+$(GENERATED_CHEATSHEET_FILES): $(HTML_OUT_DIR)/%$(DOCSUFFIX).html: xsl/%.html.xsl $(XML_INPUTS) postgis-out.xml xsl/common_cheatsheet.xsl xsl/common_utils.xsl
$(XSLTPROC) --novalid $(XSLTPROC_PATH_OPT) $(XSLTPROC_CUSTOM_VARS) -o $@ $< postgis-out.xml
# TODO: use a postgis_release_version variable passed via --stringparam
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;" $< > $@
-chunked-html: html/postgis$(DOCSUFFIX)/docbook.css
-html/postgis$(DOCSUFFIX)/docbook.css: postgis-out.xml Makefile $(XML_INPUTS)
+chunked-html: $(HTML_OUT_DIR)/postgis$(DOCSUFFIX)/docbook.css
+$(HTML_OUT_DIR)/postgis$(DOCSUFFIX)/docbook.css: postgis-out.xml Makefile $(XML_INPUTS)
$(XSLTPROC) $(XSLTPROC_COMMONOPTS) \
$(XSLTPROC_CHUNKED_HTML_OPTS) \
--output $(dir $@) \
$(CHUNK_HTML_DOCBOOK_XSL) \
$<
-chunked-html-web: html/postgis-web$(DOCSUFFIX)/docbook.css
-html/postgis-web$(DOCSUFFIX)/docbook.css: postgis-out.xml Makefile $(XML_INPUTS)
+chunked-html-web: $(HTML_OUT_DIR)/postgis-web$(DOCSUFFIX)/docbook.css
+$(HTML_OUT_DIR)/postgis-web$(DOCSUFFIX)/docbook.css: postgis-out.xml Makefile $(XML_INPUTS)
$(XSLTPROC) $(XSLTPROC_COMMONOPTS) \
$(XSLTPROC_CHUNKED_HTML_OPTS) \
--output $(dir $@) \
@@ -331,8 +333,8 @@ html/postgis-web$(DOCSUFFIX)/docbook.css: postgis-out.xml Makefile $(XML_INPUTS)
$<
HTML_BITS = $(wildcard html/*.html)
-chunked-html-web-mobile: html/postgis-web-mobile$(DOCSUFFIX)/docbook.css
-html/postgis-web-mobile$(DOCSUFFIX)/docbook.css: postgis-out.xml Makefile $(XML_INPUTS)
+chunked-html-web-mobile: $(HTML_OUT_DIR)/postgis-web-mobile$(DOCSUFFIX)/docbook.css
+$(HTML_OUT_DIR)/postgis-web-mobile$(DOCSUFFIX)/docbook.css: postgis-out.xml Makefile $(XML_INPUTS)
$(XSLTPROC) $(XSLTPROC_COMMONOPTS) \
$(XSLTPROC_CHUNKED_HTML_OPTS) \
--output $(dir $@) \
@@ -341,7 +343,7 @@ html/postgis-web-mobile$(DOCSUFFIX)/docbook.css: postgis-out.xml Makefile $(XML_
$<
$(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: $(HTML_OUT_DIR)/postgis$(DOCSUFFIX).html
%-localized:
rule=$(patsubst %-localized,%,$@); \
@@ -350,10 +352,10 @@ html: html/postgis$(DOCSUFFIX).html
$(MAKE) -C po/$$lang local-$$rule || exit 1; \
done
-html/postgis$(DOCSUFFIX).html: postgis-out.xml Makefile $(XML_INPUTS)
+$(HTML_OUT_DIR)/postgis$(DOCSUFFIX).html: postgis-out.xml Makefile $(XML_INPUTS)
$(XSLTPROC) $(XSLTPROC_COMMONOPTS) \
--stringparam html.stylesheet style.css \
- --output html/postgis$(DOCSUFFIX).html \
+ --output $(HTML_OUT_DIR)/postgis$(DOCSUFFIX).html \
$(HTML_DOCBOOK_XSL) \
$<
@@ -424,10 +426,10 @@ images images-install images-uninstall images-clean:
$(MAKE) -C html/images $@
html-clean:
- rm -f html/postgis$(DOCSUFFIX).html
- rm -rf html/postgis$(DOCSUFFIX)/
- rm -rf html/postgis-web$(DOCSUFFIX)/
- rm -rf html/postgis-web-mobile$(DOCSUFFIX)/
+ rm -f $(HTML_OUT_DIR)/postgis$(DOCSUFFIX).html
+ rm -rf $(HTML_OUT_DIR)/postgis$(DOCSUFFIX)/
+ rm -rf $(HTML_OUT_DIR)/postgis-web$(DOCSUFFIX)/
+ rm -rf $(HTML_OUT_DIR)/postgis-web-mobile$(DOCSUFFIX)/
pdf-clean:
rm -f postgis*$(DOCSUFFIX).pdf
@@ -496,30 +498,30 @@ man-uninstall:
rm -f $(DESTDIR)$(mandir)/man1/pgtopo_export.1
rm -f $(DESTDIR)$(mandir)/man1/pgtopo_import.1
-html-install: html/postgis$(DOCSUFFIX).html
+html-install: $(HTML_OUT_DIR)/postgis$(DOCSUFFIX).html
mkdir -p $(DESTDIR)$(htmldir)
- $(INSTALL_DATA) html/postgis$(DOCSUFFIX).html $(DESTDIR)$(htmldir)/
+ $(INSTALL_DATA) $(HTML_OUT_DIR)/postgis$(DOCSUFFIX).html $(DESTDIR)$(htmldir)/
html-uninstall:
rm -f $(DESTDIR)$(htmldir)/postgis$(DOCSUFFIX).html
chunked-html-install: chunked-html
mkdir -p $(DESTDIR)$(htmldir)
- cp -R html/postgis$(DOCSUFFIX) $(DESTDIR)$(htmldir)/
+ cp -R $(HTML_OUT_DIR)/postgis$(DOCSUFFIX) $(DESTDIR)$(htmldir)/
chunked-html-uninstall:
rm -rf $(DESTDIR)$(htmldir)/postgis$(DOCSUFFIX)/
chunked-html-web-install: chunked-html-web
mkdir -p $(DESTDIR)$(htmldir)
- cp -R html/postgis-web$(DOCSUFFIX) $(DESTDIR)$(htmldir)/
+ cp -R $(HTML_OUT_DIR)/postgis-web$(DOCSUFFIX) $(DESTDIR)$(htmldir)/
chunked-html-web-uninstall:
rm -rf $(DESTDIR)$(htmldir)/postgis-web$(DOCSUFFIX)/
chunked-html-web-mobile-install: chunked-html-web-mobile
mkdir -p $(DESTDIR)$(htmldir)
- cp -R html/postgis-web-mobile$(DOCSUFFIX) $(DESTDIR)$(htmldir)/
+ cp -R $(HTML_OUT_DIR)/postgis-web-mobile$(DOCSUFFIX) $(DESTDIR)$(htmldir)/
chunked-html-web-mobile-uninstall:
rm -rf $(DESTDIR)$(htmldir)/postgis-web-mobile$(DOCSUFFIX)/
@@ -562,7 +564,7 @@ check-xml: $(XML_INPUTS)
$(XMLLINT) --loaddtd $(XSLTPROC_PATH_OPT) --xinclude --valid postgis-out.xml --noout
check-cheatsheets: cheatsheets
- for f in $(abs_builddir)/html/*_cheatsheet-en.html; do \
+ for f in $(abs_builddir)/$(HTML_OUT_DIR)/*_cheatsheet-en.html; do \
$(abs_top_srcdir)/utils/check_localized_cheatsheets.sh $${f} en $(patsubst -%,%,$(DOCSUFFIX)) || exit 1; \
done
diff --git a/doc/po/Makefile.local b/doc/po/Makefile.local
index a282d0ce4..1113da625 100644
--- a/doc/po/Makefile.local
+++ b/doc/po/Makefile.local
@@ -7,7 +7,6 @@ local-all: local-html comments
local-clean: local-html-clean local-pdf-clean local-epub-clean local-cheatsheet-clean
rm -f images # work around https://trac.osgeo.org/postgis/ticket/5422
rm -f $(XML_INPUTS)
- rm -rf html
rm -rf xsl
# We do not want to recurse in parent dir here
@@ -18,7 +17,6 @@ local-%: symlinks
$(MAKE) $(patsubst local-%,%,$@) DOCSUFFIX=$(DOCSUFFIX)
symlinks:
- test -e html || ln -sf ../../html .
test -e xsl || ln -sf $(srcdir)/../../xsl .
# for XML_SOURCES
-----------------------------------------------------------------------
Summary of changes:
doc/Makefile.in | 44 +++++++++++++++++++++++---------------------
doc/po/Makefile.local | 8 +++-----
2 files changed, 26 insertions(+), 26 deletions(-)
hooks/post-receive
--
PostGIS
More information about the postgis-tickets
mailing list