flip version to 2.4.4dev, add 2.4.3 to upgrade versions

add timestamp to dev docs
closes #3991 for PostGIS 2.4.4dev

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

diff --git a/Version.config b/Version.config
index fb03d05cc27ba0f16656110dfa39fcd73f3eba31..7d02a885ad5e4594c2c8425ecdbf3a2b94891110 100644 (file)
--- a/Version.config
+++ b/Version.config
@@ -5,7 +5,7 @@
 
 POSTGIS_MAJOR_VERSION=2
 POSTGIS_MINOR_VERSION=4
-POSTGIS_MICRO_VERSION=3
+POSTGIS_MICRO_VERSION=4dev
 
 # Liblwgeom interface versioning, reset to 0:0:0 (cur:age:rev)
 # when changing POSTGIS_MINOR_VERSION

diff --git a/ci/debbie/postgis_doc_translations.sh b/ci/debbie/postgis_doc_translations.sh
index 1b26eabaaac0ff7c8b68047257c306b02ec639fc..87a4046f865bd306ceea5a3444e5398eaf8687f6 100644 (file)
--- a/ci/debbie/postgis_doc_translations.sh
+++ b/ci/debbie/postgis_doc_translations.sh
@@ -49,10 +49,10 @@ make check-localized
 #make pdf
 rm -rf images
 mkdir images
-cp html/images/* images 
+cp html/images/* images
 #make epub
 #make -e chunked-html 2>&1 | tee -a doc-errors.log
-#make update-po
+#make update-po  #we only do this for trunk, cause transifex only follows trunk
 make html-localized
 # make -C po/es/ local-html
 # make -C po/fr/ local-html

diff --git a/ci/debbie/postgis_make_dist.sh b/ci/debbie/postgis_make_dist.sh
index d3f49aea53b0d13600d0ee4086565768419a3ea4..0a3e8e849fd348e3805c375f52b766ccd0a90fc8 100644 (file)
--- a/ci/debbie/postgis_make_dist.sh
+++ b/ci/debbie/postgis_make_dist.sh
@@ -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 WEB_DIR=/var/www/postgis_stuff
 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 @@ export package=${newoutdir}.tar.gz
 echo "The package name is $package"
 
 cp $package $WEB_DIR
-sh ci/debbie/postgis_release_docs.sh
+bash ci/debbie/postgis_release_docs.sh

diff --git a/ci/debbie/postgis_release_docs.sh b/ci/debbie/postgis_release_docs.sh
index 244b4453435613c274bb8d130f07d9a319adc50f..a76b896b59e4ea80f89fe059d07a125c55614b08 100644 (file)
--- a/ci/debbie/postgis_release_docs.sh
+++ b/ci/debbie/postgis_release_docs.sh
@@ -22,7 +22,7 @@ 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
+#sh autogen.sh
 
 if [ -f GNUMakefile ]; then
   make distclean
@@ -40,9 +40,16 @@ make clean
 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
@@ -50,7 +57,7 @@ cp html/images/* images
 make epub
 make -e chunked-html 2>&1 | tee -a doc-errors.log
 
-if [[ "$reference"  == *trunk* ]] ; then  #only do this for trunk because only trunk follows transifex
+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
@@ -59,7 +66,7 @@ if [[ "$reference"  == *trunk* ]] ; then  #only do this for trunk because only t
   make -C po/pt_BR/ local-html
   make -C po/ko_KR/ local-html
   #make pdf-localized
-fi;
+fi
 
 package="doc-html-${POSTGIS_MAJOR_VERSION}.${POSTGIS_MINOR_VERSION}.${POSTGIS_MICRO_VERSION}.tar.gz"
 export outdir=html
@@ -67,7 +74,7 @@ tar -czf "$package" --exclude='.svn' --exclude='.git' --exclude='image_src' "$ou
 
 
 
-#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}

diff --git a/extensions/upgradeable_versions.mk b/extensions/upgradeable_versions.mk
index 28c3bb31af2ee7a6907952fd2bba4169c74e7dd8..5a4606dd6fb6b403d45129e130fab2c36810466d 100644 (file)
--- a/extensions/upgradeable_versions.mk
+++ b/extensions/upgradeable_versions.mk
@@ -33,5 +33,6 @@ UPGRADEABLE_VERSIONS = \
        2.3.6 \
        2.4.0 \
        2.4.1 \
-       2.4.2
+       2.4.2 \
+       2.4.3