From 112ceb3f131c1c0de3ebc10f9199fc349e825585 Mon Sep 17 00:00:00 2001 From: Regina Obe Date: Mon, 15 Jan 2018 21:38:08 +0000 Subject: [PATCH] Get rid of SVN number and revise to not build local html except for trunk git-svn-id: http://svn.osgeo.org/postgis/branches/2.4@16305 b70326c6-7e19-0410-871a-916f4a2858ee --- ci/debbie/postgis_release_docs.sh | 34 +++++++++++++++++-------------- 1 file changed, 19 insertions(+), 15 deletions(-) diff --git a/ci/debbie/postgis_release_docs.sh b/ci/debbie/postgis_release_docs.sh index 073849370..244b44534 100644 --- a/ci/debbie/postgis_release_docs.sh +++ b/ci/debbie/postgis_release_docs.sh @@ -2,9 +2,8 @@ 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 +#this is passed in via postgis_make_dist.sh via jenkins +#export reference= export PROJECTS=/var/lib/jenkins/workspace export GEOS_VER=3.6 export GDAL_VER=2.2 @@ -41,8 +40,8 @@ make clean cd doc -mv postgis.xml postgis.xml.orig -sed -e "s::SVN Revision (${POSTGIS_SVN_REVISION}):" postgis.xml.orig > postgis.xml +#mv postgis.xml postgis.xml.orig +#sed -e "s::SVN Revision (${POSTGIS_SVN_REVISION}):" postgis.xml.orig > postgis.xml make pdf rm -rf images @@ -50,20 +49,25 @@ 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 + +if [[ "$reference" == *trunk* ]] ; then #only do this for trunk because only trunk follows transifex + make update-po + make -C po/it_IT/ local-html + make -C po/pt_BR/ local-html + 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 + #make pdf-localized +fi; + 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 + + +#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} -- 2.50.1