From 556b3a5fddabdaaa596c5bb62bd54db2056baf0c Mon Sep 17 00:00:00 2001 From: Regina Obe Date: Sat, 13 Jan 2018 18:54:39 +0000 Subject: [PATCH] revise doc build to build html tar ball. Revise how to release to skip make dist and doc build, and to just have these downloaded from site References #3985 for PostGIS 2.5 (trunk) git-svn-id: http://svn.osgeo.org/postgis/trunk@16287 b70326c6-7e19-0410-871a-916f4a2858ee --- HOWTO_RELEASE | 10 ++++++---- ci/debbie/postgis_release_docs.sh | 12 +++++++++++- 2 files changed, 17 insertions(+), 5 deletions(-) diff --git a/HOWTO_RELEASE b/HOWTO_RELEASE index 4b70517c1..3d22fd118 100644 --- a/HOWTO_RELEASE +++ b/HOWTO_RELEASE @@ -86,9 +86,11 @@ Release procedure $ brev=x.x $ rev=x.x.x $ svn copy -m "Tagged release $rev" $base/branches/$brev $base/tags/$rev -- Run: sh make_dist.sh $rev (or use debbie for this) +- Run: sh make_dist.sh $rev (note, debbie should have already done this, + and the file will be waiting in postgis.net/stuff) +- Documentation should also have been built and should be in postgis.net/stuff - Build and test generated tarball (including extension upgrade) -- Copy tarball to web site and edit downloads page +- Copy tarball, pdf, doc-html.. to downloads.osgeo.org web site and edit downloads page - Announce on e-mail - postgis-users - postgis-devel @@ -96,9 +98,9 @@ Release procedure - osgeo-discuss - Update web sites - PostGIS News - - https://git.osgeo.org/gogs/postgis/postgis.net/src/master/_content/posts + - https://git.osgeo.org/gitea/postgis/postgis.net/src/master/_content/posts a) create a new Post for current year making sure the page name starts with mm-dd - b) Update links on https://git.osgeo.org/gogs/postgis/postgis.net/src/master/_content/pages/source.html + b) Update links on https://git.osgeo.org/gitea/postgis/postgis.net/src/master/_content/pages/source.html c) commit and wait 5 minutes to see changes on website - PostGIS doc release versioned doc - http://postgis.net/documentation/ (For building pdf, debbie has tagged jobs diff --git a/ci/debbie/postgis_release_docs.sh b/ci/debbie/postgis_release_docs.sh index fa0755b43..5e0b60847 100644 --- a/ci/debbie/postgis_release_docs.sh +++ b/ci/debbie/postgis_release_docs.sh @@ -1,5 +1,4 @@ #!/bin/bash -chmod -R 755 /var/www/postgis_docs/manual-${POSTGIS_MAJOR_VERSION}.${POSTGIS_MINOR_VERSION} export PG_VER=9.6 # export PGPORT=8442 export OS_BUILD=64 @@ -20,6 +19,8 @@ export LD_LIBRARY_PATH="${PROJECTS}/gdal/rel-${GDAL_VER}w${OS_BUILD}/lib:${PROJE 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` + +chmod -R 755 /var/www/postgis_docs/manual-${POSTGIS_MAJOR_VERSION}.${POSTGIS_MINOR_VERSION} echo $PATH sh autogen.sh @@ -49,6 +50,14 @@ mkdir images cp html/images/* images make epub make -e chunked-html 2>&1 | tee -a doc-errors.log +make update-po +make -C po/ja/ local-html +make -C po/de/ local-html +make -C po/pt_BR/ local-html +make -C po/ko_KR/ local-html +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" #make update-po #make -C po/it_IT/ local-html #make -C po/pt_BR/ local-html @@ -62,3 +71,4 @@ cp -R html/images/* /var/www/postgis_docs/manual-${POSTGIS_MAJOR_VERSION}.${POST chmod -R 755 /var/www/postgis_docs/manual-${POSTGIS_MAJOR_VERSION}.${POSTGIS_MINOR_VERSION} cp -R *.pdf /var/www/postgis_stuff/ cp -R *.epub /var/www/postgis_stuff/ +cp -R $package /var/www/postgis_stuff/ -- 2.40.0