From: Regina Obe <lr@pcorp.us>
Date: Sun, 21 Jan 2018 07:12:17 +0000 (+0000)
Subject: change scripts back to versions of things to compile against (GDAL, PROJ, SCGAL,... 
X-Git-Tag: 2.4.4~30
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=502c1d17c0917ad7b2a9b70787c6b1e954fc3b5b;p=postgis

change scripts back to versions of things to compile against (GDAL, PROJ, SCGAL, GEOS) being set at job level until we have the stop and start postgres in repo as well.

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

diff --git a/ci/winnie/build_postgis.sh b/ci/winnie/build_postgis.sh
index 86357fefb..f8597cf9f 100644
--- a/ci/winnie/build_postgis.sh
+++ b/ci/winnie/build_postgis.sh
@@ -8,15 +8,15 @@ set -e
 #export PGPORT=8442
 #POSTGIS_SVN_REVISION=passed_in_by_buildbot
 
-export GEOS_VER=3.7.0dev
-export GDAL_VER=2.2.2
-export PROJ_VER=4.9.3
-export SFCGAL_VER=1.3
-export PCRE_VER=8.33
-export PROTOBUF_VER=3.2.0
-export PROTOBUFC_VER=1.2.1
-
-export PROTOBUF_VER=3.2.0
+# export GEOS_VER=3.7.0dev
+# export GDAL_VER=2.2.3
+# export PROJ_VER=4.9.3
+# export SFCGAL_VER=1.3.2
+# export PCRE_VER=8.33
+# export PROTOBUF_VER=3.2.0
+# export PROTOBUFC_VER=1.2.1
+
+# export PROTOBUF_VER=3.2.0
 export LIBXML_VER=2.7.8
 
 if [[ "${GCC_TYPE}" == *gcc48* ]] ; then
@@ -95,7 +95,7 @@ fi
 
 if [ -n "$SFCGAL_VER" ]; then
 	##hard code versions of cgal etc. for now
-	export CGAL_VER=4.6.1
+	export CGAL_VER=4.11
 	BOOST_VER=1.53.0
 	#BOOST_VER_WU=1_49_0
 	export BOOST_VER_WU=1_53_0
diff --git a/ci/winnie/package_postgis.sh b/ci/winnie/package_postgis.sh
index 76c4c6fc6..e52ab9990 100644
--- a/ci/winnie/package_postgis.sh
+++ b/ci/winnie/package_postgis.sh
@@ -9,18 +9,18 @@
 #POSTGIS_MAJOR_VERSION=2
 #POSTGIS_MINOR_VERSION=1
 #POSTGIS_MICRO_VERSION=0dev
-export GEOS_VER=3.6.2
-export GDAL_VER=2.2.2
-export PROJ_VER=4.9.3
-export SFCGAL_VER=1.3
-export PCRE_VER=8.33
-export PROTOBUF_VER=3.2.0
-export PROTOBUFC_VER=1.2.1
-
-export PROTOBUF_VER=3.2.0
-export LIBXML_VER=2.7.8
-export PROTOBUF_VER=3.2.0
-export PROTOBUFC_VER=1.2.1
+# export GEOS_VER=3.6.2
+# export GDAL_VER=2.2.2
+# export PROJ_VER=4.9.3
+# export SFCGAL_VER=1.3
+# export PCRE_VER=8.33
+# export PROTOBUF_VER=3.2.0
+# export PROTOBUFC_VER=1.2.1
+
+# export PROTOBUF_VER=3.2.0
+# export LIBXML_VER=2.7.8
+# export PROTOBUF_VER=3.2.0
+# export PROTOBUFC_VER=1.2.1
 
 if [[ "${GCC_TYPE}" == *gcc48* ]] ; then
 	export PROJECTS=/projects
diff --git a/ci/winnie/regress_postgis.sh b/ci/winnie/regress_postgis.sh
index 2379a7fb6..a7e6f25df 100644
--- a/ci/winnie/regress_postgis.sh
+++ b/ci/winnie/regress_postgis.sh
@@ -7,21 +7,21 @@ set -e
 #export POSTGIS_MAJOR_VERSION=2
 #export POSTGIS_MINOR_VERSION=2
 #export POSTGIS_MICRO_VERSION=0dev
-export GEOS_VER=3.7.0dev
-export GDAL_VER=2.2.2
-export PROJ_VER=4.9.3
-export SFCGAL_VER=1.3
-export PCRE_VER=8.33
-export PROTOBUF_VER=3.2.0
-export PROTOBUFC_VER=1.2.1
-
-export PROTOBUF_VER=3.2.0
-export LIBXML_VER=2.7.8
+# export GEOS_VER=3.7.0dev
+# export GDAL_VER=2.2.3
+# export PROJ_VER=4.9.3
+# export SFCGAL_VER=1.3.2
+# export PCRE_VER=8.33
+# export PROTOBUF_VER=3.2.0
+# export PROTOBUFC_VER=1.2.1
+
+# export PROTOBUF_VER=3.2.0
+# export LIBXML_VER=2.7.8
 
 export PROJECTS=/projects
 export MINGPROJECTS=/projects
 export PATHOLD=$PATH
-export PROTOBUF_VER=3.2.0
+
 export MAKE_EXTENSION=1