[postgis-tickets] [SCM] PostGIS branch master updated. 3.3.0rc2-1125-g578f3f959

git at osgeo.org git at osgeo.org
Wed Jul 5 03:23:05 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  578f3f959dd2ffc38727a15d2ca2ef02226839c1 (commit)
      from  54f15306959a8274a2e33c9b8232282675845dd5 (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 578f3f959dd2ffc38727a15d2ca2ef02226839c1
Author: Sandro Santilli <strk at kbt.io>
Date:   Wed Jul 5 01:34:15 2023 +0200

    Reorganize html targets
    
      - Non-chunked will be html/postgis-<lang>.html
      - Chunked will be under html/postgis-<lang>/
      - Chunked web will be under html/postgis-web-<lang>/
      - Chunked web mobile will be under html/postgis-web-mobile-<lang>/
      - Images (all shared) will be under html/images
      - HTML install will honour --htmldir configure switch
      - Add html-assets-install and html-assets-uninstall targets
    
    References #5429
    References #5430

diff --git a/doc/Makefile.in b/doc/Makefile.in
index eac85d649..bfd78fbb5 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -32,11 +32,15 @@ top_builddir = @top_builddir@
 mandir = @mandir@
 abs_srcdir = @abs_srcdir@
 abs_builddir = @abs_builddir@
+docdir = @docdir@
+htmldir = @htmldir@
 
 POSTGIS_MAJOR_VERSION=@POSTGIS_MAJOR_VERSION@
 POSTGIS_MINOR_VERSION=@POSTGIS_MINOR_VERSION@
 POSTGIS_MICRO_VERSION=@POSTGIS_MICRO_VERSION@
 
+DOCSUFFIX=-en
+
 ifneq (,$(findstring dev,$(POSTGIS_MICRO_VERSION)))
   POSTGIS_DOWNLOAD_URL=http://postgis.net/stuff
 else
@@ -91,6 +95,9 @@ XSLTPROC_COMMONOPTS= \
 	--stringparam html.stylesheet style.css \
 	$(XSLTPROCFLAGS)
 
+XSLTPROC_CHUNKED_HTML_OPTS = \
+	--stringparam img.src.path ../
+
 
 HTML_DOCBOOK_XSL=$(XSLBASE)/html/docbook.xsl
 CHUNK_HTML_DOCBOOK_XSL=$(XSLBASE)/html/chunk.xsl
@@ -110,7 +117,6 @@ DBTOEPUB=@DBTOEPUB@
 
 # Directories for postgresql subdirectories
 PGSQL_DOCDIR=@PGSQL_DOCDIR@
-PGSQL_SHAREDIR=@PGSQL_SHAREDIR@
 
 BUILD_TARGET =
 
@@ -297,24 +303,26 @@ $(GENERATED_CHEATSHEET_FILES): html/%.html: xsl/%.html.xsl $(XML_INPUTS) postgis
 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: postgis-out.xml Makefile images $(XML_INPUTS)
+chunked-html: postgis-out.xml Makefile $(XML_INPUTS)
 	$(XSLTPROC) $(XSLTPROC_COMMONOPTS) \
-		--output html$(DOCSUFFIX)/ \
+		$(XSLTPROC_CHUNKED_HTML_OPTS) \
+		--output html/postgis$(DOCSUFFIX)/ \
 		$(CHUNK_HTML_DOCBOOK_XSL) \
 		$<
 
-chunked-html-web: postgis-out.xml Makefile images $(XML_INPUTS)
+chunked-html-web: postgis-out.xml Makefile $(XML_INPUTS)
 	$(XSLTPROC) $(XSLTPROC_COMMONOPTS) \
-		--output html/ \
+		$(XSLTPROC_CHUNKED_HTML_OPTS) \
+		--output html/postgis-web$(DOCSUFFIX)/ \
 		--stringparam html.script ga.js \
 		$(CHUNK_HTML_DOCBOOK_XSL) \
 		$<
 
 HTML_BITS = $(wildcard html/*.html)
-
-chunked-html-web-mobile: postgis-out.xml Makefile images $(XML_INPUTS)
+chunked-html-web-mobile: postgis-out.xml Makefile $(XML_INPUTS)
 	$(XSLTPROC) $(XSLTPROC_COMMONOPTS) \
-		--output html/ \
+		$(XSLTPROC_CHUNKED_HTML_OPTS) \
+		--output html/postgis-web-mobile$(DOCSUFFIX)/ \
 		--stringparam html.script ga.js \
 		$(CHUNK_HTML_DOCBOOK_XSL) \
 		$<
@@ -329,7 +337,7 @@ html-localized chunked-html-localized:
     $(MAKE) -C po/$$lang local-$$rule || exit 1; \
   done
 
-html/postgis$(DOCSUFFIX).html: postgis-out.xml Makefile images $(XML_INPUTS)
+html/postgis$(DOCSUFFIX).html: postgis-out.xml Makefile $(XML_INPUTS)
 	$(XSLTPROC) $(XSLTPROC_COMMONOPTS) \
 		--output html/postgis$(DOCSUFFIX).html \
 		$(HTML_DOCBOOK_XSL) \
@@ -389,15 +397,12 @@ doxygen.cfg: doxygen.cfg.in
 doxygen: doxygen.cfg
 	doxygen $<
 
-images:
-	$(MAKE) -C html/images images
-
-images-clean:
-	$(MAKE) -C html/images images-clean
+images images-install images-uninstall images-clean:
+	$(MAKE) -C html/images $@
 
 clean:
-	rm -f html/*.html
-	rm -f postgis-${POSTGIS_MAJOR_VERSION}.${POSTGIS_MINOR_VERSION}.${POSTGIS_MICRO_VERSION}.pdf
+	rm -rf html/postgis-*
+	rm -f *.pdf
 	rm -f *.epub
 	rm -f images # work around https://trac.osgeo.org/postgis/ticket/5422
 	rm -f $(XML_GENERATED_SOURCES)
@@ -454,17 +459,23 @@ man-uninstall:
 	rm -f $(DESTDIR)$(mandir)/man1/pgtopo_export.1
 	rm -f $(DESTDIR)$(mandir)/man1/pgtopo_import.1
 
-docs-install: html/postgis.html html/style.css
-	mkdir -p $(DESTDIR)$(PGSQL_DOCDIR)/postgis/images
-	$(INSTALL_DATA) html/postgis.html $(DESTDIR)$(PGSQL_DOCDIR)/postgis/
-	$(INSTALL_DATA) html/style.css $(DESTDIR)$(PGSQL_DOCDIR)/postgis/
-	$(INSTALL_DATA) html/images/*.png $(DESTDIR)$(PGSQL_DOCDIR)/postgis/images/
+html-install: html/postgis$(DOCSUFFIX).html
+	mkdir -p $(DESTDIR)$(htmldir)/postgis
+	$(INSTALL_DATA) html/postgis$(DOCSUFFIX).html $(DESTDIR)$(htmldir)/postgis/
+
+html-uninstall:
+	rm -f $(DESTDIR)$(htmldir)/postgis/postgis$(DOCSUFFIX).html
+
+html-assets-install: images-install
+	$(INSTALL_DATA) html/style.css $(DESTDIR)$(htmldir)/postgis/
+
+html-assets-uninstall: images-install
+	rm -f $(DESTDIR)$(htmldir)/postgis/style.css
+
+docs-install: html-install html-assets-install
 	$(INSTALL_DATA) ../README.postgis $(DESTDIR)$(PGSQL_DOCDIR)/postgis/README.postgis
 
-docs-uninstall:
-	rm -f $(DESTDIR)$(PGSQL_DOCDIR)/postgis/postgis.html
-	rm -f $(DESTDIR)$(PGSQL_DOCDIR)/postgis/style.css
-	rm -rf $(DESTDIR)$(PGSQL_DOCDIR)/postgis/images
+docs-uninstall: html-uninstall html-assets-uninstall
 	rm -f $(DESTDIR)$(PGSQL_DOCDIR)/postgis/README.postgis
 
 install: comments-install
diff --git a/doc/html/images/Makefile.in b/doc/html/images/Makefile.in
index c258318d7..89580bbdb 100644
--- a/doc/html/images/Makefile.in
+++ b/doc/html/images/Makefile.in
@@ -14,6 +14,10 @@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 srcdir = @srcdir@
+htmldir = @htmldir@
+
+INSTALL=@INSTALL@
+INSTALL_DATA=@INSTALL_DATA@
 
 CC=@CC@
 CFLAGS=@CFLAGS@ @PROJ_CPPFLAGS@
@@ -214,13 +218,25 @@ GENERATED_IMAGES_RESIZED= \
 	de9im12.png \
 	de9im13.png
 
+ALL_IMAGES = \
+	$(GENERATED_IMAGES) \
+	$(GENERATED_IMAGES_RESIZED) \
+	$(STATIC_IMAGES)
+
 OBJS=styles.o generator.o
 
 # Build the generator
 all: generator
 
 # generate the images
-images: $(GENERATED_IMAGES) $(GENERATED_IMAGES_RESIZED) $(STATIC_IMAGES)
+images: $(ALL_IMAGES)
+
+images-install: $(ALL_IMAGES)
+	mkdir -p $(DESTDIR)$(htmldir)/postgis/images
+	$(INSTALL_DATA) $(ALL_IMAGES) $(DESTDIR)$(htmldir)/postgis/images
+
+images-uninstall:
+	rm -f $(ALL_IMAGES:%=$(DESTDIR)$(htmldir)/postgis/images/%)
 
 # Command to build each of the .o files
 $(OBJS): %.o: %.c
@@ -258,6 +274,6 @@ distclean: clean
 	rm -f Makefile
 
 images-clean:
-	rm -f $(GENERATED_IMAGES) $(GENERATED_IMAGES_RESIZED) $(STATIC_IMAGES)
+	rm -f $(ALL_IMAGES)
 
 .NOTPARALLEL:
diff --git a/doc/po/de/Makefile.in b/doc/po/de/Makefile.in
index 31b255023..45674c100 100644
--- a/doc/po/de/Makefile.in
+++ b/doc/po/de/Makefile.in
@@ -1,3 +1,3 @@
-DOCSUFFIX=-de
 include @srcdir@/../Makefile.local
+DOCSUFFIX=-de
 srcdir=@srcdir@
diff --git a/doc/po/es/Makefile.in b/doc/po/es/Makefile.in
index 8aeaeb7ca..a2bbbc088 100644
--- a/doc/po/es/Makefile.in
+++ b/doc/po/es/Makefile.in
@@ -1,3 +1,3 @@
-DOCSUFFIX=-es
 include @srcdir@/../Makefile.local
+DOCSUFFIX=-es
 srcdir=@srcdir@
diff --git a/doc/po/fr/Makefile.in b/doc/po/fr/Makefile.in
index 71cba94cf..a9f01f7e7 100644
--- a/doc/po/fr/Makefile.in
+++ b/doc/po/fr/Makefile.in
@@ -1,3 +1,3 @@
-DOCSUFFIX=-fr
 include @srcdir@/../Makefile.local
+DOCSUFFIX=-fr
 srcdir=@srcdir@
diff --git a/doc/po/it_IT/Makefile.in b/doc/po/it_IT/Makefile.in
index 39baedf11..6d533871b 100644
--- a/doc/po/it_IT/Makefile.in
+++ b/doc/po/it_IT/Makefile.in
@@ -1,3 +1,3 @@
-DOCSUFFIX=-it
 include @srcdir@/../Makefile.local
+DOCSUFFIX=-it
 srcdir=@srcdir@
diff --git a/doc/po/ja/Makefile.in b/doc/po/ja/Makefile.in
index 7d732fb41..ed5866283 100644
--- a/doc/po/ja/Makefile.in
+++ b/doc/po/ja/Makefile.in
@@ -1,3 +1,3 @@
-DOCSUFFIX=-ja
 include @srcdir@/../Makefile.local
+DOCSUFFIX=-ja
 srcdir=@srcdir@
diff --git a/doc/po/ko_KR/Makefile.in b/doc/po/ko_KR/Makefile.in
index aedfe8c8e..d1cee468a 100644
--- a/doc/po/ko_KR/Makefile.in
+++ b/doc/po/ko_KR/Makefile.in
@@ -1,3 +1,3 @@
-DOCSUFFIX=-ko_KR
 include @srcdir@/../Makefile.local
+DOCSUFFIX=-ko_KR
 srcdir=@srcdir@
diff --git a/doc/po/pl/Makefile.in b/doc/po/pl/Makefile.in
index 82370f7e3..e0ef7f45b 100644
--- a/doc/po/pl/Makefile.in
+++ b/doc/po/pl/Makefile.in
@@ -1,3 +1,3 @@
-DOCSUFFIX=-pl
 include @srcdir@/../Makefile.local
+DOCSUFFIX=-pl
 srcdir=@srcdir@
diff --git a/doc/po/pt_BR/Makefile.in b/doc/po/pt_BR/Makefile.in
index 078a0c4f7..0dc6cd1cb 100644
--- a/doc/po/pt_BR/Makefile.in
+++ b/doc/po/pt_BR/Makefile.in
@@ -1,3 +1,3 @@
-DOCSUFFIX=-br
 include @srcdir@/../Makefile.local
+DOCSUFFIX=-br
 srcdir=@srcdir@
diff --git a/doc/po/ru/Makefile.in b/doc/po/ru/Makefile.in
index f771bc430..64f0eaf9f 100644
--- a/doc/po/ru/Makefile.in
+++ b/doc/po/ru/Makefile.in
@@ -1,3 +1,3 @@
-DOCSUFFIX=-ru
 include @srcdir@/../Makefile.local
+DOCSUFFIX=-ru
 srcdir=@srcdir@

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

Summary of changes:
 doc/Makefile.in             | 61 ++++++++++++++++++++++++++-------------------
 doc/html/images/Makefile.in | 20 +++++++++++++--
 doc/po/de/Makefile.in       |  2 +-
 doc/po/es/Makefile.in       |  2 +-
 doc/po/fr/Makefile.in       |  2 +-
 doc/po/it_IT/Makefile.in    |  2 +-
 doc/po/ja/Makefile.in       |  2 +-
 doc/po/ko_KR/Makefile.in    |  2 +-
 doc/po/pl/Makefile.in       |  2 +-
 doc/po/pt_BR/Makefile.in    |  2 +-
 doc/po/ru/Makefile.in       |  2 +-
 11 files changed, 63 insertions(+), 36 deletions(-)


hooks/post-receive
-- 
PostGIS

More information about the postgis-tickets mailing list