[postgis-tickets] r16314 - flip version to 2.3.7dev, add in 2.3.6 to upgrade path

[Regina Obe]

Author: robe
Date: 2018-01-15 22:33:20 -0800 (Mon, 15 Jan 2018)
New Revision: 16314

Modified:
   branches/2.3/Version.config
   branches/2.3/ci/debbie/postgis_make_dist.sh
   branches/2.3/ci/debbie/postgis_release_docs.sh
   branches/2.3/extensions/upgradeable_versions.mk
Log:
flip version to 2.3.7dev, add in 2.3.6 to upgrade path
backport changes to stamp timestamp
References #3991 for PostGIS 2.3.7dev

Modified: branches/2.3/Version.config
===================================================================
--- branches/2.3/Version.config	2018-01-16 05:53:40 UTC (rev 16313)
+++ branches/2.3/Version.config	2018-01-16 06:33:20 UTC (rev 16314)
@@ -5,7 +5,7 @@
 
 POSTGIS_MAJOR_VERSION=2
 POSTGIS_MINOR_VERSION=3
-POSTGIS_MICRO_VERSION=6
+POSTGIS_MICRO_VERSION=7dev
 
 # Liblwgeom interface versioning, reset to 0:0:0 (cur:age:rev)
 # when changing POSTGIS_MINOR_VERSION

Modified: branches/2.3/ci/debbie/postgis_make_dist.sh
===================================================================
--- branches/2.3/ci/debbie/postgis_make_dist.sh	2018-01-16 05:53:40 UTC (rev 16313)
+++ branches/2.3/ci/debbie/postgis_make_dist.sh	2018-01-16 06:33:20 UTC (rev 16314)
@@ -1,10 +1,13 @@
 #!/bin/bash
 set -e
 ## begin variables passed in by jenkins
-# export reference=$reference
 
 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
@@ -12,7 +15,6 @@
 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"
 
-echo "Reference Branch: $reference"
 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`
@@ -30,4 +32,4 @@
 echo "The package name is $package"
 
 cp $package $WEB_DIR
-sh ci/debbie/postgis_release_docs.sh
+bash ci/debbie/postgis_release_docs.sh

Modified: branches/2.3/ci/debbie/postgis_release_docs.sh
===================================================================
--- branches/2.3/ci/debbie/postgis_release_docs.sh	2018-01-16 05:53:40 UTC (rev 16313)
+++ branches/2.3/ci/debbie/postgis_release_docs.sh	2018-01-16 06:33:20 UTC (rev 16314)
@@ -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
@@ -23,7 +22,7 @@
 chmod -R 755 /var/www/postgis_docs/manual-${POSTGIS_MAJOR_VERSION}.${POSTGIS_MINOR_VERSION}
 echo $PATH
 
-sh autogen.sh
+#sh autogen.sh
 
 if [ -f GNUMakefile ]; then
   make distclean
@@ -41,28 +40,40 @@
 cd doc
 
 
-#mv postgis.xml postgis.xml.orig
+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
 
+echo "Micro: $POSTGIS_MICRO_VERSION"
+#inject a development time stamp if we are in development branch
+if [[ "$POSTGIS_MICRO_VERSION" == *"dev"* ]]; then
+  export GIT_TIMESTAMP=`git log -1 --pretty=format:%ct`
+  sed -e "s:</title>:</title><subtitle><subscript>DEV TIMESTAMP (<emphasis>${GIT_TIMESTAMP}</emphasis>)</subscript></subtitle>:" postgis.xml.orig > postgis.xml
+fi
+
 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
+
+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
 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

Modified: branches/2.3/extensions/upgradeable_versions.mk
===================================================================
--- branches/2.3/extensions/upgradeable_versions.mk	2018-01-16 05:53:40 UTC (rev 16313)
+++ branches/2.3/extensions/upgradeable_versions.mk	2018-01-16 06:33:20 UTC (rev 16314)
@@ -30,7 +30,7 @@
 	2.3.3 \
 	2.3.4 \
 	2.3.5 \
-	2.3.6dev
+	2.3.6
 
 # This is to avoid forcing "check-installed-upgrades" as a default
 # rule, see https://trac.osgeo.org/postgis/ticket/3420