change scripts back to versions of things to compile against (GDAL, PROJ, SCGAL,...

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 86357fefb29cff1fac9bfbc553b5639285be9a1f..f8597cf9fcb325b3f1341fd8290be36d8807dab8 100644 (file)
--- 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 76c4c6fc601b3595dc6465cf64a2d0e031c008be..e52ab99903e28c3d6071d93ed585194c1c4737e5 100644 (file)
--- 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 2379a7fb64d82272e8bd35e091bc21f1d7c5a717..a7e6f25df2fe71e92c43c7c6cb36f00d66d7c1c1 100644 (file)
--- 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