[postgis-tickets] [SCM] PostGIS branch master updated. 3.3.0rc2-1133-gbe40ce36e

Wed Jul 5 06:07:41 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  be40ce36e6e26f9875c08810c97ecf0e961d0e93 (commit)
       via  c1dcfb099017c11fda924b63b4620ed11c847210 (commit)
      from  4ea1204dc513e4fdc35023078f7c643e354830ba (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 be40ce36e6e26f9875c08810c97ecf0e961d0e93
Author: Sandro Santilli <strk at kbt.io>
Date:   Wed Jul 5 15:07:14 2023 +0200

    Remove debbie-unused file, to avoid confusion

diff --git a/ci/debbie/postgis_doc_translations.sh b/ci/debbie/postgis_doc_translations.sh
deleted file mode 100644
index 30e157863..000000000
--- a/ci/debbie/postgis_doc_translations.sh
+++ /dev/null
@@ -1,81 +0,0 @@
-#!/usr/bin/env bash
-set -e
-## begin variables passed in by jenkins
-
-# export PG_VER=9.2
-# export PGPORT=8442
-# export OS_BUILD=64
-# export POSTGIS_MAJOR_VERSION=2
-# export POSTGIS_MINOR_VERSION=2
-# export POSTGIS_MICRO_VERSION=0dev
-# export JENKINS_HOME=/var/lib/jenkins/workspace
-# export GEOS_VER=3.4.3
-# export GDAL_VER=2.0
-# export MAKE_GARDEN=1
-# export MAKE_EXTENSION=1
-
-export PG_VER=13
-# export PGPORT=8442
-export OS_BUILD=64
-#this is passed in via postgis_make_dist.sh via jenkins
-#export reference=
-export GEOS_VER=3.10
-export GDAL_VER=3.4
-
-## end variables passed in by jenkins
-
-export PROJECTS=${JENKINS_HOME}/workspace
-export PGPATH=${PROJECTS}/pg/rel/pg${PG_VER}w${OS_BUILD}
-export PATH=${PATH}:${PROJECTS}/gdal/rel-${GDAL_VER}w${OS_BUILD}/bin
-export POSTGIS_SVN_REVISION=${SVN_REVISION}
-echo $PATH
-cd ${WORKSPACE}/docs/branches/${POSTGIS_MAJOR_VERSION}.${POSTGIS_MINOR_VERSION}_translations
-
-sh autogen.sh
-
-if [ -f GNUMakefile ]; then
-  make distclean
-fi
-
-#  --with-gdalconfig=${PROJECTS}/gdal/rel-${GDAL_VER}w${OS_BUILD}/bin/gdal-config
-#  --without-raster
-
-CPPFLAGS="-I${PGPATH}/include"  \
-LDFLAGS="-L${PGPATH}/lib"  ./configure \
-  --with-pgconfig=${PGPATH}/bin/pg_config \
-  --with-geosconfig=${PROJECTS}/geos/rel-${GEOS_VER}w${OS_BUILD}/bin/geos-config \
-  --without-raster --without-protobuf
-make clean
-cd doc
-make update-pot
-make pull-tx
-
-mv postgis.xml postgis.xml.orig
-sed -e "s:</title>:</title><subtitle><subscript>SVN Revision (<emphasis>${POSTGIS_SVN_REVISION}</emphasis>)</subscript></subtitle>:" postgis.xml.orig > postgis.xml
-
-make check-localized
-
-#make pdf
-rm -rf images
-mkdir images
-cp html/images/* images
-#make epub
-#make -e chunked-html 2>&1 | tee -a doc-errors.log
-#make update-po
-make html-localized
-# make -C po/es/ local-html
-# make -C po/fr/ local-html
-# make -C po/it_IT/ local-html
-# make -C po/pt_BR/ local-html
-# make -C po/pl/ local-html
-# make -C po/ko_KR/ local-html
-
-cp -R html/*.*  /var/www/postgis_docs/manual-${POSTGIS_MAJOR_VERSION}.${POSTGIS_MINOR_VERSION}
-cp -R html/images/* /var/www/postgis_docs/manual-${POSTGIS_MAJOR_VERSION}.${POSTGIS_MINOR_VERSION}/images
-chmod -R 755 /var/www/postgis_docs/manual-${POSTGIS_MAJOR_VERSION}.${POSTGIS_MINOR_VERSION}
-
-#add back make pdf but after html copy so will work even if pdf generation fails
-make pdf-localized
-cp -R po/*/*.pdf /var/www/postgis_stuff/
-chmod -R 755 /var/www/postgis_docs/manual-${POSTGIS_MAJOR_VERSION}.${POSTGIS_MINOR_VERSION}
-chmod -R 755 /var/www/postgis_stuff/postgis-${POSTGIS_MAJOR_VERSION}.${POSTGIS_MINOR_VERSION}*.pdf

commit c1dcfb099017c11fda924b63b4620ed11c847210
Author: Sandro Santilli <strk at kbt.io>
Date:   Wed Jul 5 15:05:38 2023 +0200

    Fix chunked install/uninstall targets

diff --git a/doc/Makefile.in b/doc/Makefile.in
index 7778a96c7..69c918b42 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -482,18 +482,18 @@ chunked-html-uninstall:
 	rm -rf $(DESTDIR)$(htmldir)/postgis/postgis$(DOCSUFFIX)/
 
 chunked-html-web-install: chunked-html-web
-	mkdir -p $(DESTDIR)$(html-webdir)/postgis
-	cp -R html-web/postgis-web$(DOCSUFFIX) $(DESTDIR)$(html-webdir)/postgis/
+	mkdir -p $(DESTDIR)$(htmldir)/postgis
+	cp -R html/postgis-web$(DOCSUFFIX) $(DESTDIR)$(htmldir)/postgis/
 
 chunked-html-web-uninstall:
-	rm -rf $(DESTDIR)$(html-webdir)/postgis/postgis-web$(DOCSUFFIX)/
+	rm -rf $(DESTDIR)$(htmldir)/postgis/postgis-web$(DOCSUFFIX)/
 
 chunked-html-web-mobile-install: chunked-html-web-mobile
-	mkdir -p $(DESTDIR)$(html-web-mobiledir)/postgis
-	cp -R html-web-mobile/postgis-web-mobile$(DOCSUFFIX) $(DESTDIR)$(html-web-mobiledir)/postgis/
+	mkdir -p $(DESTDIR)$(htmldir)/postgis
+	cp -R html/postgis-web-mobile$(DOCSUFFIX) $(DESTDIR)$(htmldir)/postgis/
 
 chunked-html-web-mobile-uninstall:
-	rm -rf $(DESTDIR)$(html-web-mobiledir)/postgis/postgis-web-mobile$(DOCSUFFIX)/
+	rm -rf $(DESTDIR)$(htmldir)/postgis/postgis-web-mobile$(DOCSUFFIX)/
 
 html-assets-install: images-install
 	$(INSTALL_DATA) html/style.css $(DESTDIR)$(htmldir)/postgis/

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

Summary of changes:
 ci/debbie/postgis_doc_translations.sh | 81 -----------------------------------
 doc/Makefile.in                       | 12 +++---
 2 files changed, 6 insertions(+), 87 deletions(-)
 delete mode 100644 ci/debbie/postgis_doc_translations.sh


hooks/post-receive
-- 
PostGIS
