[postgis-tickets] r16347 - 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.

[Regina Obe]

Author: robe
Date: 2018-01-20 23:12:17 -0800 (Sat, 20 Jan 2018)
New Revision: 16347

Modified:
   branches/2.4/ci/winnie/build_postgis.sh
   branches/2.4/ci/winnie/package_postgis.sh
   branches/2.4/ci/winnie/regress_postgis.sh
Log:
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.

Modified: branches/2.4/ci/winnie/build_postgis.sh
===================================================================
--- branches/2.4/ci/winnie/build_postgis.sh	2018-01-20 12:58:39 UTC (rev 16346)
+++ branches/2.4/ci/winnie/build_postgis.sh	2018-01-21 07:12:17 UTC (rev 16347)
@@ -8,15 +8,15 @@
 #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 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 PROTOBUF_VER=3.2.0
 export LIBXML_VER=2.7.8
 
 if [[ "${GCC_TYPE}" == *gcc48* ]] ; then
@@ -95,7 +95,7 @@
 
 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

Modified: branches/2.4/ci/winnie/package_postgis.sh
===================================================================
--- branches/2.4/ci/winnie/package_postgis.sh	2018-01-20 12:58:39 UTC (rev 16346)
+++ branches/2.4/ci/winnie/package_postgis.sh	2018-01-21 07:12:17 UTC (rev 16347)
@@ -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 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 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

Modified: branches/2.4/ci/winnie/regress_postgis.sh
===================================================================
--- branches/2.4/ci/winnie/regress_postgis.sh	2018-01-20 12:58:39 UTC (rev 16346)
+++ branches/2.4/ci/winnie/regress_postgis.sh	2018-01-21 07:12:17 UTC (rev 16347)
@@ -7,21 +7,21 @@
 #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 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 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