[postgis-tickets] r17468 - Change default build to use GEOS 3.8 / PROJ 6.1.0 / GDAL 2.4.1, but allow overriding

[Regina Obe]

Author: robe
Date: 2019-06-03 15:23:29 -0700 (Mon, 03 Jun 2019)
New Revision: 17468

Modified:
   trunk/ci/winnie/build_postgis.sh
   trunk/ci/winnie/package_postgis.sh
   trunk/ci/winnie/regress_postgis.sh
Log:
Change default build to use GEOS 3.8 / PROJ 6.1.0 / GDAL 2.4.1, but allow overriding

Modified: trunk/ci/winnie/build_postgis.sh
===================================================================
--- trunk/ci/winnie/build_postgis.sh	2019-06-03 20:55:09 UTC (rev 17467)
+++ trunk/ci/winnie/build_postgis.sh	2019-06-03 22:23:29 UTC (rev 17468)
@@ -1,22 +1,20 @@
 #!/bin/bash
 set -e
-export GEOS_VER=3.8
-export SFCGAL_VER=1.3.2
+if  [[ "${OVERRIDE}" == '' ]] ;
+	export GEOS_VER=3.8
+	export GDAL_VER=2.4.1
+	export PROJ_VER=6.1.0
+	export SFCGAL_VER=1.3.2
+	export PROTOBUF_VER=3.2.0
+	export PROTOBUFC_VER=1.2.1
+	export CGAL_VER=4.11
+	export ICON_VER=1.15
+fi;
+
 export PCRE_VER=8.33
-export PROTOBUF_VER=3.2.0
-export PROTOBUFC_VER=1.2.1
-export CGAL_VER=4.11
+
 export LIBXML_VER=2.7.8
 #export GDAL_VER=2.4.0
-export GDAL_VER=2.2.4
-export PROJ_VER=4.9.3
-#export PROJ_VER=5.2.0
-export SFCGAL_VER=1.3.2
-export PCRE_VER=8.33
-export PROTOBUF_VER=3.2.0
-export PROTOBUFC_VER=1.2.1
-export CGAL_VER=4.11
-export ICON_VER=1.15
 
 export PROJECTS=/projects
 export MINGPROJECTS=/projects

Modified: trunk/ci/winnie/package_postgis.sh
===================================================================
--- trunk/ci/winnie/package_postgis.sh	2019-06-03 20:55:09 UTC (rev 17467)
+++ trunk/ci/winnie/package_postgis.sh	2019-06-03 22:23:29 UTC (rev 17468)
@@ -12,15 +12,20 @@
 #export OS_BUILD=32
 
 #export GCC_TYPE=
-export GEOS_VER=3.8
-export GDAL_VER=2.2.4
-export PROJ_VER=4.9.3
-export SFCGAL_VER=1.3.2
+#if no override is set - use these values
+#otherwise use the ones jenkins passes thru
+if  [[ "${OVERRIDE}" == '' ]] ;
+	export GEOS_VER=3.8
+	export GDAL_VER=2.4.1
+	export PROJ_VER=6.1.0
+	export SFCGAL_VER=1.3.2
+	export PROTOBUF_VER=3.2.0
+	export PROTOBUFC_VER=1.2.1
+	export CGAL_VER=4.11
+	export ICON_VER=1.15
+fi;
+
 export PCRE_VER=8.33
-export PROTOBUF_VER=3.2.0
-export PROTOBUFC_VER=1.2.1
-export CGAL_VER=4.11
-export ICON_VER=1.15
 
 if [[ "${GCC_TYPE}" == *gcc48* ]] ; then
 	export PROJECTS=/projects

Modified: trunk/ci/winnie/regress_postgis.sh
===================================================================
--- trunk/ci/winnie/regress_postgis.sh	2019-06-03 20:55:09 UTC (rev 17467)
+++ trunk/ci/winnie/regress_postgis.sh	2019-06-03 22:23:29 UTC (rev 17468)
@@ -1,23 +1,21 @@
 #!/bin/bash
 set -e
-export GEOS_VER=3.8
-export SFCGAL_VER=1.3.2
+if  [[ "${OVERRIDE}" == '' ]] ;
+	export GEOS_VER=3.8
+	export GDAL_VER=2.4.1
+	export PROJ_VER=6.1.0
+	export SFCGAL_VER=1.3.2
+	export PROTOBUF_VER=3.2.0
+	export PROTOBUFC_VER=1.2.1
+	export CGAL_VER=4.11
+	export ICON_VER=1.15
+fi;
 export PCRE_VER=8.33
-export PROTOBUF_VER=3.2.0
-export PROTOBUFC_VER=1.2.1
-export CGAL_VER=4.11
 export LIBXML_VER=2.7.8
 #export GDAL_VER=2.4.0
-export GDAL_VER=2.2.4
-export PROJ_VER=4.9.3
 #export PROJ_VER=5.2.0
-export SFCGAL_VER=1.3.2
-export PCRE_VER=8.33
-export PROTOBUF_VER=3.2.0
-export PROTOBUFC_VER=1.2.1
-export CGAL_VER=4.11
-export ICON_VER=1.15
 
+
 export PROJECTS=/projects
 export MINGPROJECTS=/projects
 export PATHOLD=$PATH