[postgis-tickets] r16386 - Get rid of lib_envs.sh back to declaring everything locally

[Regina Obe]

Author: robe
Date: 2018-02-19 14:36:45 -0800 (Mon, 19 Feb 2018)
New Revision: 16386

Removed:
   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:
Get rid of lib_envs.sh back to declaring everything locally

Modified: trunk/ci/winnie/build_postgis.sh
===================================================================
--- trunk/ci/winnie/build_postgis.sh	2018-02-19 22:06:20 UTC (rev 16385)
+++ trunk/ci/winnie/build_postgis.sh	2018-02-19 22:36:45 UTC (rev 16386)
@@ -12,16 +12,17 @@
 #POSTGIS_MINOR_VERSION=1
 #POSTGIS_MICRO_VERSION=0SVN
 #export GCC_TYPE=gcc48  #for pre-4.8.0 compiles this is blank
-#export JSON_VER=0.9
-#export SFCGAL_VER=1.3
-#export PROJ_VER=4.8.0
+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
 
-#export GEOS_VER=3.7.0dev
-#export GDAL_VER=2.2.3
-#export PROJ_VER=4.9.3
 
-bash lib_envs.sh
-
 export LIBXML_VER=2.7.8
 
 if [[ "${GCC_TYPE}" == *gcc48* ]] ; then

Deleted: trunk/ci/winnie/lib_envs.sh
===================================================================
--- trunk/ci/winnie/lib_envs.sh	2018-02-19 22:06:20 UTC (rev 16385)
+++ trunk/ci/winnie/lib_envs.sh	2018-02-19 22:36:45 UTC (rev 16386)
@@ -1,21 +0,0 @@
-#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-19 22:06:20 UTC (rev 16385)
+++ trunk/ci/winnie/package_postgis.sh	2018-02-19 22:36:45 UTC (rev 16386)
@@ -12,7 +12,15 @@
 #export OS_BUILD=32
 
 #export GCC_TYPE=
-bash lib_envs.sh
+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
 
 if [[ "${GCC_TYPE}" == *gcc48* ]] ; then
 	export PROJECTS=/projects

Modified: trunk/ci/winnie/regress_postgis.sh
===================================================================
--- trunk/ci/winnie/regress_postgis.sh	2018-02-19 22:06:20 UTC (rev 16385)
+++ trunk/ci/winnie/regress_postgis.sh	2018-02-19 22:36:45 UTC (rev 16386)
@@ -1,6 +1,14 @@
 #!/bin/bash
 set -e
-bash lib_envs.sh
+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
 
 export PROJECTS=/projects
 export MINGPROJECTS=/projects