Change default build to use GEOS 3.8 / PROJ 6.1.0 / GDAL 2.4.1, but allow overriding

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

diff --git a/ci/winnie/build_postgis.sh b/ci/winnie/build_postgis.sh
index d87e1015196207a5fb20e848b8d80de0db6a14a8..0148f0f9a9fba84ad13c2dc74466cef66afbc17f 100644 (file)
--- a/ci/winnie/build_postgis.sh
+++ b/ci/winnie/build_postgis.sh
@@ -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

diff --git a/ci/winnie/package_postgis.sh b/ci/winnie/package_postgis.sh
index 79de0d20391e7bc7aeadf0808f3eb00672d019b5..b48bb4649b6b4c965114035899699a0cd1c76655 100644 (file)
--- a/ci/winnie/package_postgis.sh
+++ b/ci/winnie/package_postgis.sh
@@ -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

diff --git a/ci/winnie/regress_postgis.sh b/ci/winnie/regress_postgis.sh
index 110cddfd51ea572242e304d7a235550165bfbfcb..4395d0b5747475e981f5409a8e69325c5691af70 100644 (file)
--- a/ci/winnie/regress_postgis.sh
+++ b/ci/winnie/regress_postgis.sh
@@ -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