[postgis-tickets] r16527 - Flip version to 2.4.5dev, revise winnie to be able to use source_folder if passed in (will allow tagged builds to be built from dev branch for testing)

[Regina Obe]

Author: robe
Date: 2018-04-05 22:21:46 -0700 (Thu, 05 Apr 2018)
New Revision: 16527

Modified:
   branches/2.4/Version.config
   branches/2.4/ci/winnie/build_postgis.sh
   branches/2.4/ci/winnie/regress_postgis.sh
   branches/2.4/extensions/upgradeable_versions.mk
Log:
Flip version to 2.4.5dev, revise winnie to be able to use source_folder if passed in (will allow tagged builds to be built from dev branch for testing)

Modified: branches/2.4/Version.config
===================================================================
--- branches/2.4/Version.config	2018-04-06 05:05:23 UTC (rev 16526)
+++ branches/2.4/Version.config	2018-04-06 05:21:46 UTC (rev 16527)
@@ -5,7 +5,7 @@
 
 POSTGIS_MAJOR_VERSION=2
 POSTGIS_MINOR_VERSION=4
-POSTGIS_MICRO_VERSION=4
+POSTGIS_MICRO_VERSION=5dev
 
 # Liblwgeom interface versioning, reset to 0:0:0 (cur:age:rev)
 # when changing POSTGIS_MINOR_VERSION

Modified: branches/2.4/ci/winnie/build_postgis.sh
===================================================================
--- branches/2.4/ci/winnie/build_postgis.sh	2018-04-06 05:05:23 UTC (rev 16526)
+++ branches/2.4/ci/winnie/build_postgis.sh	2018-04-06 05:21:46 UTC (rev 16527)
@@ -58,11 +58,16 @@
 
 export POSTGIS_MICRO_VER=${POSTGIS_MAJOR_VERSION}.${POSTGIS_MINOR_VERSION}.${POSTGIS_MICRO_VERSION}
 echo POSTGIS_MICRO_VERSION: $POSTGIS_VER
-if [[ "$POSTGIS_MICRO_VERSION"  == *SVN* || "$POSTGIS_MICRO_VERSION"  == *dev* ]] ; then
-	export POSTGIS_SRC=${PROJECTS}/postgis/branches/${POSTGIS_VER}
+
+if [ -n "$SOURCE_FOLDER" ]; then
+  export POSTGIS_SRC=$SOURCE_FOLDER
 else
-	#tagged version -- official release
-	export POSTGIS_SRC=${PROJECTS}/postgis/tags/${POSTGIS_VER}.${POSTGIS_MICRO_VERSION}
+  if [[ "$POSTGIS_MICRO_VERSION"  == *SVN* || "$POSTGIS_MICRO_VERSION"  == *dev* ]] ; then
+    export POSTGIS_SRC=${PROJECTS}/postgis/branches/${POSTGIS_VER}
+  else
+    #tagged version -- official release
+    export POSTGIS_SRC=${PROJECTS}/postgis/tags/${POSTGIS_VER}.${POSTGIS_MICRO_VERSION}
+  fi;
 fi;
 
 #export POSTGIS_SRC=${PROJECTS}/postgis/trunk

Modified: branches/2.4/ci/winnie/regress_postgis.sh
===================================================================
--- branches/2.4/ci/winnie/regress_postgis.sh	2018-04-06 05:05:23 UTC (rev 16526)
+++ branches/2.4/ci/winnie/regress_postgis.sh	2018-04-06 05:21:46 UTC (rev 16527)
@@ -38,12 +38,18 @@
 
 export POSTGIS_VER=${POSTGIS_MAJOR_VERSION}.${POSTGIS_MINOR_VERSION}
 export POSTGIS_MICRO_VER=${POSTGIS_MAJOR_VERSION}.${POSTGIS_MINOR_VERSION}.${POSTGIS_MICRO_VERSION}
-if [[ "$POSTGIS_MICRO_VERSION"  == *SVN* || "$POSTGIS_MICRO_VERSION"  == *dev* ]] ; then
-	export POSTGIS_SRC=${PROJECTS}/postgis/branches/${POSTGIS_VER}
+
+if [ -n "$SOURCE_FOLDER" ]; then
+  export POSTGIS_SRC=$SOURCE_FOLDER
 else
-	#tagged version -- official release
-	export POSTGIS_SRC=${PROJECTS}/postgis/tags/${POSTGIS_VER}.${POSTGIS_MICRO_VERSION}
+  if [[ "$POSTGIS_MICRO_VERSION"  == *SVN* || "$POSTGIS_MICRO_VERSION"  == *dev* ]] ; then
+    export POSTGIS_SRC=${PROJECTS}/postgis/branches/${POSTGIS_VER}
+  else
+    #tagged version -- official release
+    export POSTGIS_SRC=${PROJECTS}/postgis/tags/${POSTGIS_VER}.${POSTGIS_MICRO_VERSION}
+  fi;
 fi;
+
 export LIBXML_VER=2.7.8
 #export POSTGIS_SRC=${PROJECTS}/postgis/trunk
 export GDAL_DATA="${PROJECTS}/gdal/rel-${GDAL_VER}w${OS_BUILD}${GCC_TYPE}/share/gdal"

Modified: branches/2.4/extensions/upgradeable_versions.mk
===================================================================
--- branches/2.4/extensions/upgradeable_versions.mk	2018-04-06 05:05:23 UTC (rev 16526)
+++ branches/2.4/extensions/upgradeable_versions.mk	2018-04-06 05:21:46 UTC (rev 16527)
@@ -37,5 +37,5 @@
 	2.4.1 \
 	2.4.2 \
 	2.4.3 \
-	2.4.4dev
+	2.4.4