[postgis-tickets] r16304 - add missing 2.3.5, 2.3.6, 2.4.3 to extensions upgrade,

[Regina Obe]

Author: robe
Date: 2018-01-15 13:24:32 -0800 (Mon, 15 Jan 2018)
New Revision: 16304

Modified:
   trunk/HOWTO_RELEASE
   trunk/ci/debbie/postgis_release_docs.sh
   trunk/extensions/upgradeable_versions.mk
Log:
add missing 2.3.5, 2.3.6, 2.4.3 to extensions upgrade, 
revise doc build to not have SVN placeholder (may bring back later)

Modified: trunk/HOWTO_RELEASE
===================================================================
--- trunk/HOWTO_RELEASE	2018-01-15 21:01:41 UTC (rev 16303)
+++ trunk/HOWTO_RELEASE	2018-01-15 21:24:32 UTC (rev 16304)
@@ -77,7 +77,6 @@
 	   a) Replace PostGIS_* string params with new version
 	   b) Replace repository url with new branch repo url
 	   c) Update the PostGIS_trunk by updating the PostGIS_* string params
-	   d) create a new tagged branch job from latest tagged (and repeat a, b for this new tagged)
 
 	   Go to: ​https://trac.osgeo.org/postgis/ edit the matrix to reflect new branch
 
@@ -87,8 +86,10 @@
    $ rev=x.x.x
    $ svn copy -m "Tagged release $rev" $base/branches/$brev $base/tags/$rev
 - Run: sh make_dist.sh $rev (note, debbie should have already done this,
-      and the file will be waiting in postgis.net/stuff)
+      and the file will be waiting in postgis.net/stuff.  You might need to wait a few minutes to see it.)
+      If impatient check status of job - https://debbie.postgis.net/job/PostGIS_Make_Dist/
 - Documentation should also have been built and should be in postgis.net/stuff
+  (this sometimes takes sometime so wait 15 minutes)
 - Test generated tarball (including extension upgrade)
 - Copy tarball, pdf, doc-html.. to http://download.osgeo.org/postgis/ web site and edit postgis.net/source page
 - Announce on e-mail

Modified: trunk/ci/debbie/postgis_release_docs.sh
===================================================================
--- trunk/ci/debbie/postgis_release_docs.sh	2018-01-15 21:01:41 UTC (rev 16303)
+++ trunk/ci/debbie/postgis_release_docs.sh	2018-01-15 21:24:32 UTC (rev 16304)
@@ -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 @@
 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
+#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
@@ -50,7 +49,7 @@
 cp html/images/* images
 make epub
 make -e chunked-html 2>&1 | tee -a doc-errors.log
-make update-po
+#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
@@ -58,12 +57,15 @@
 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
+if [[ "$reference"  == *trunk* ]] ; then  #only due 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 pdf-localized
+fi;
+
+#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}

Modified: trunk/extensions/upgradeable_versions.mk
===================================================================
--- trunk/extensions/upgradeable_versions.mk	2018-01-15 21:01:41 UTC (rev 16303)
+++ trunk/extensions/upgradeable_versions.mk	2018-01-15 21:24:32 UTC (rev 16304)
@@ -29,7 +29,10 @@
 	2.3.2 \
 	2.3.3 \
 	2.3.4 \
+	2.3.5 \
+	2.3.6 \
 	2.4.0 \
 	2.4.1 \
 	2.4.2 \
-	2.4.3dev
+	2.4.3 \
+	2.4.4dev