[postgis-tickets] r16384 - move library version declare into shared script -- with plans to eventually have postgres start/stop from script as well.

[Regina Obe]

Author: robe
Date: 2018-02-19 09:39:56 -0800 (Mon, 19 Feb 2018)
New Revision: 16384

Added:
   trunk/ci/winnie/lib_envs.sh
Modified:
   trunk/ci/winnie/build_postgis.sh
   trunk/ci/winnie/package_postgis.sh
   trunk/ci/winnie/regress_postgis.sh
Log:
move library version declare into shared script -- with plans to eventually have postgres start/stop from script as well.

Modified: trunk/ci/winnie/build_postgis.sh
===================================================================
--- trunk/ci/winnie/build_postgis.sh	2018-02-17 08:46:20 UTC (rev 16383)
+++ trunk/ci/winnie/build_postgis.sh	2018-02-19 17:39:56 UTC (rev 16384)
@@ -20,14 +20,7 @@
 #export GDAL_VER=2.2.3
 #export PROJ_VER=4.9.3
 
-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 CGAL_VER=4.11
+bash lib_envs.sh
 
 export LIBXML_VER=2.7.8
 

Added: trunk/ci/winnie/lib_envs.sh
===================================================================
--- trunk/ci/winnie/lib_envs.sh	                        (rev 0)
+++ trunk/ci/winnie/lib_envs.sh	2018-02-19 17:39:56 UTC (rev 16384)
@@ -0,0 +1,21 @@
+#winnie passed in variables
+#export OS_BUILD=64
+#export GCC_TYPE=gcc48
+#export PG_VER=9.3
+#export PROJ_VER=4.8.0
+#export PROJSO=libproj-0.dll
+#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.2
+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 CGAL_VER=4.11

Modified: trunk/ci/winnie/package_postgis.sh
===================================================================
--- trunk/ci/winnie/package_postgis.sh	2018-02-17 08:46:20 UTC (rev 16383)
+++ trunk/ci/winnie/package_postgis.sh	2018-02-19 17:39:56 UTC (rev 16384)
@@ -12,14 +12,7 @@
 #export OS_BUILD=32
 
 #export GCC_TYPE=
-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 CGAL_VER=4.11
+bash lib_envs.sh
 
 if [[ "${GCC_TYPE}" == *gcc48* ]] ; then
 	export PROJECTS=/projects

Modified: trunk/ci/winnie/regress_postgis.sh
===================================================================
--- trunk/ci/winnie/regress_postgis.sh	2018-02-17 08:46:20 UTC (rev 16383)
+++ trunk/ci/winnie/regress_postgis.sh	2018-02-19 17:39:56 UTC (rev 16384)
@@ -1,22 +1,6 @@
 #!/bin/bash
 set -e
-#winnie passed in variables
-#export OS_BUILD=64
-#export GCC_TYPE=gcc48
-#export PG_VER=9.3
-#export PROJ_VER=4.8.0
-#export PROJSO=libproj-0.dll
-#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 CGAL_VER=4.11
+bash lib_envs.sh
 
 export PROJECTS=/projects
 export MINGPROJECTS=/projects
@@ -23,7 +7,6 @@
 export PATHOLD=$PATH
 
 
-
 if [ "$OS_BUILD" == "64" ] ; then
 	export MINGHOST=x86_64-w64-mingw32
 else