[postgis-tickets] [SCM] PostGIS branch master updated. 3.3.0rc2-1137-g2de1941c3

[git at osgeo.org]

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  2de1941c3724543a2fb76d00ed82e9c7df101fe9 (commit)
      from  3bfa91c6ff748ca4150d9e6d64094851fee1ee3c (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 2de1941c3724543a2fb76d00ed82e9c7df101fe9
Author: Sandro Santilli <strk at kbt.io>
Date:   Wed Jul 5 15:42:39 2023 +0200

    [debbie] use the install targets for html

diff --git a/ci/debbie/postgis_release_docs.sh b/ci/debbie/postgis_release_docs.sh
index e28dc9e95..60bfff88e 100644
--- a/ci/debbie/postgis_release_docs.sh
+++ b/ci/debbie/postgis_release_docs.sh
@@ -14,6 +14,7 @@ export WEB_DIR=/var/www/postgis_stuff
 export PGPATH=${PROJECTS}/pg/rel/pg${PG_VER}w${OS_BUILD}
 export PATH="${PGPATH}/bin:$PATH"
 export LD_LIBRARY_PATH="${PROJECTS}/gdal/rel-${GDAL_VER}w${OS_BUILD}/lib:${PROJECTS}/geos/rel-${GEOS_VER}w${OS_BUILD}/lib:${PGPATH}/lib"
+
 ./autogen.sh
 
 
@@ -22,8 +23,9 @@ POSTGIS_MAJOR_VERSION=`grep ^POSTGIS_MAJOR_VERSION Version.config | cut -d= -f2`
 POSTGIS_MINOR_VERSION=`grep ^POSTGIS_MINOR_VERSION Version.config | cut -d= -f2`
 POSTGIS_MICRO_VERSION=`grep ^POSTGIS_MICRO_VERSION Version.config | cut -d= -f2`
 
-mkdir -p /var/www/postgis_docs/manual-${POSTGIS_MAJOR_VERSION}.${POSTGIS_MINOR_VERSION}
-chmod -R 755 /var/www/postgis_docs/manual-${POSTGIS_MAJOR_VERSION}.${POSTGIS_MINOR_VERSION}
+# TODO: take base as env variable ?
+HTML_DIR=/var/www/postgis_docs/manual-${POSTGIS_MAJOR_VERSION}.${POSTGIS_MINOR_VERSION}
+
 echo $PATH
 
 #sh autogen.sh
@@ -39,7 +41,8 @@ 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
+  --without-raster --without-protobuf \
+  --htmldir ${HTML_DIR}
 make clean
 
 # generating postgis_revision.h in case hasn't been generated
@@ -56,9 +59,9 @@ make cheatsheets
 #sed -e "s:</title>:</title><subtitle><subscript>SVN Revision (<emphasis>${POSTGIS_SVN_REVISION}</emphasis>)</subscript></subtitle>:" postgis.xml.orig > postgis.xml
 
 echo "Micro: $POSTGIS_MICRO_VERSION"
-cp postgis.xml postgis.xml.orig #we for dev will inject stuff into file, so backup original
 #inject a development time stamp if we are in development branch
 if [[ "$POSTGIS_MICRO_VERSION" == *"dev"* ]]; then
+  cp postgis.xml postgis.xml.orig #we for dev will inject stuff into file, so backup original
   export GIT_TIMESTAMP=`git log -1 --pretty=format:%ct`
   export GIT_TIMESTAMP="`date -d @$GIT_TIMESTAMP`" #convert to UTC date
   echo "GIT_TIMESTAMP: ${GIT_TIMESTAMP}"
@@ -70,23 +73,20 @@ fi
 make pdf
 make epub
 make -e chunked-html-web # TODO: do we really want this too in the doc-html-*.tar.gz package ?
-
 make html-localized # TODO: do we really want this too in the doc-html-*.tar.gz package ?
 
 package="doc-html-${POSTGIS_MAJOR_VERSION}.${POSTGIS_MINOR_VERSION}.${POSTGIS_MICRO_VERSION}.tar.gz"
 export outdir=html
 tar -czf "$package" --exclude='.svn' --exclude='.git' --exclude='image_src' "$outdir"
 
+# Install all html
+make html-assets-install
+make html-install
+make chunked-html-web-install
+make html-install-localized
+make chunked-html-web-install-localized
+chmod -R 755 ${HTML_DIR} # TODO: still needed ?
 
-cp postgis.xml.orig postgis.xml
-
-# TODO: Replace all of this by `make html-install` and friends
-mkdir -p /var/www/postgis_docs/manual-${POSTGIS_MAJOR_VERSION}.${POSTGIS_MINOR_VERSION}
-mkdir -p /var/www/postgis_docs/manual-${POSTGIS_MAJOR_VERSION}.${POSTGIS_MINOR_VERSION}/images
-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}
 
 
 # TODO: Replace all of this by `make *-install`
@@ -95,10 +95,16 @@ cp -R *.epub /var/www/postgis_stuff/
 
 cp -R $package /var/www/postgis_stuff/
 
-#rename the files without the micro if it's a development branch
+
 if [[ "$POSTGIS_MICRO_VERSION" == *"dev"* ]]; then
+
+  #rename the files without the micro if it's a development branch
   for f in ${WEB_DIR}/*${POSTGIS_MICRO_VERSION}; do
     newname=$(echo "$f" | sed "s/${POSTGIS_MICRO_VERSION}//");
     mv -vi $f $newname
   done
+
+  # restore the backedup xml file
+  cp postgis.xml.orig postgis.xml
+
 fi

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

Summary of changes:
 ci/debbie/postgis_release_docs.sh | 36 +++++++++++++++++++++---------------
 1 file changed, 21 insertions(+), 15 deletions(-)


hooks/post-receive
-- 
PostGIS