[postgis-tickets] r16203 - switch to have version of libs used be defined in script rather than the jenkins job

[Regina Obe]

Author: robe
Date: 2018-01-01 11:42:51 -0800 (Mon, 01 Jan 2018)
New Revision: 16203

Modified:
   trunk/ci/winnie/build_postgis.sh
   trunk/ci/winnie/package_postgis.sh
   trunk/ci/winnie/regress_postgis.sh
Log:
switch to have version of libs used be defined in script rather than the jenkins job

Modified: trunk/ci/winnie/build_postgis.sh
===================================================================
--- trunk/ci/winnie/build_postgis.sh	2018-01-01 19:13:31 UTC (rev 16202)
+++ trunk/ci/winnie/build_postgis.sh	2018-01-01 19:42:51 UTC (rev 16203)
@@ -7,8 +7,6 @@
 #export PGHOST=localhost
 #export PGPORT=8442
 #export PGUSER=postgres
-#export GEOS_VER=3.4.0dev
-#export GDAL_VER=1.9.1
 #POSTGIS_SVN_REVISION=passed_in_by_buildbot
 #POSTGIS_MAJOR_VERSION=2
 #POSTGIS_MINOR_VERSION=1
@@ -18,7 +16,15 @@
 #export SFCGAL_VER=1.0.4
 #export PROJ_VER=4.8.0
 
+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
 
 if [[ "${GCC_TYPE}" == *gcc48* ]] ; then

Modified: trunk/ci/winnie/package_postgis.sh
===================================================================
--- trunk/ci/winnie/package_postgis.sh	2018-01-01 19:13:31 UTC (rev 16202)
+++ trunk/ci/winnie/package_postgis.sh	2018-01-01 19:42:51 UTC (rev 16203)
@@ -9,13 +9,14 @@
 #POSTGIS_MAJOR_VERSION=2
 #POSTGIS_MINOR_VERSION=1
 #POSTGIS_MICRO_VERSION=0dev
-#export GEOS_VER=3.4.0dev
-#export GDAL_VER=2.0.0
 #export OS_BUILD=32
-#export PROJ_VER=4.9.1
+
 #export GCC_TYPE=
-#export SFCGAL_VER=1.1.0
-#export PCRE_VER
+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
 

Modified: trunk/ci/winnie/regress_postgis.sh
===================================================================
--- trunk/ci/winnie/regress_postgis.sh	2018-01-01 19:13:31 UTC (rev 16202)
+++ trunk/ci/winnie/regress_postgis.sh	2018-01-01 19:42:51 UTC (rev 16203)
@@ -14,7 +14,13 @@
 export PROJECTS=/projects
 export MINGPROJECTS=/projects
 export PATHOLD=$PATH
+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
 
 
 if [ "$OS_BUILD" == "64" ] ; then