fix typo in make_dist.sh

Add doc building,
update How To release to reflect tar ball and docs start building as soon as work is committed.
References #3985 for PostGIS 2.4

git-svn-id: http://svn.osgeo.org/postgis/branches/2.4@16288 b70326c6-7e19-0410-871a-916f4a2858ee

diff --git a/HOWTO_RELEASE b/HOWTO_RELEASE
index 6c2d02ac723df9449fab5150baea380f71d947c2..f7fa664acd70b34f5e6ebcae6654e466a8a51f59 100644 (file)
--- a/HOWTO_RELEASE
+++ b/HOWTO_RELEASE
@@ -82,13 +82,15 @@ Release procedure
           Go to: ​https://trac.osgeo.org/postgis/ edit the matrix to reflect new branch
 
 - Tag branch:  (replace x.x and x.x.x with minor and micro version e.g 2.3, 2.3.1
-   $ base=https://svn.osgeo.org/postgis
-   $ brev=2.4
-   $ rev=2.4.x
+   $ base=http://svn.osgeo.org/postgis/
+   $ 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)
-- Build and test generated tarball (including extension upgrade)
-- Copy tarball to web site and edit downloads page
+- 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
+- Test generated tarball (including extension upgrade)
+- 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_make_dist.sh b/ci/debbie/postgis_make_dist.sh
index 4f45c9dd6cd18e9093b08670f1933cf83d7dabd6..94c76768641b9055f0d534b2f816251006ffca1b 100644 (file)
--- a/ci/debbie/postgis_make_dist.sh
+++ b/ci/debbie/postgis_make_dist.sh
@@ -32,3 +32,4 @@ export package=${newoutdir}.tar.gz
 echo "The package name is $package"
 
 cp $package $WEB_DIR
+sh ci/debbie/postgis_release_docs.sh

diff --git a/ci/debbie/postgis_release_docs.sh b/ci/debbie/postgis_release_docs.sh
new file mode 100644 (file)
index 0000000..0738493
--- /dev/null
+++ b/ci/debbie/postgis_release_docs.sh
@@ -0,0 +1,74 @@
+#!/bin/bash
+export PG_VER=9.6
+# export PGPORT=8442
+export OS_BUILD=64
+# export POSTGIS_MAJOR_VERSION=2
+# export POSTGIS_MINOR_VERSION=2
+# export POSTGIS_MICRO_VERSION=0dev
+export PROJECTS=/var/lib/jenkins/workspace
+export GEOS_VER=3.6
+export GDAL_VER=2.2
+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
+
+
+
+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
+
+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
+make clean
+cd doc
+
+
+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 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  #we do this only for trunk because transifex only follows trunk
+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
+#make pdf-localized
+
+mv postgis.xml.orig postgis.xml
+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}
+cp -R *.pdf /var/www/postgis_stuff/
+cp -R *.epub /var/www/postgis_stuff/
+cp -R $package /var/www/postgis_stuff/

diff --git a/make_dist.sh b/make_dist.sh
index f1a61c4d9dd4d5f9b26a08b4bce1a6bc3e765ac6..91f1ccb97f412ee6353b14f2509eea97823a1f23 100755 (executable)
--- a/make_dist.sh
+++ b/make_dist.sh
@@ -62,11 +62,6 @@ if [ -n "$1" ]; then
   fi
 fi
 
-if [ -v "$outdir" ]; then
-       echo "Output directory $outdir already exists."
-       exit 1
-fi
-
 outdir="postgis-$version"
 
 if [ -d "$outdir" ]; then