[postgis-tickets] r17859 - Allow overriding of versions so that we can use newer versions of things for gcc 8.1

[Regina Obe]

Author: robe
Date: 2019-10-06 08:53:55 -0700 (Sun, 06 Oct 2019)
New Revision: 17859

Modified:
   branches/2.5/ci/winnie/build_postgis.sh
   branches/2.5/ci/winnie/package_postgis.sh
   branches/2.5/ci/winnie/regress_postgis.sh
Log:
Allow overriding of versions so that we can use newer versions of things for gcc 8.1

Modified: branches/2.5/ci/winnie/build_postgis.sh
===================================================================
--- branches/2.5/ci/winnie/build_postgis.sh	2019-10-06 15:44:35 UTC (rev 17858)
+++ branches/2.5/ci/winnie/build_postgis.sh	2019-10-06 15:53:55 UTC (rev 17859)
@@ -12,6 +12,7 @@
 #POSTGIS_MINOR_VERSION=1
 #POSTGIS_MICRO_VERSION=0SVN
 #export GCC_TYPE=gcc48  #for pre-4.8.0 compiles this is blank
+if  [[ "${OVERRIDE}" == '' ]] ; then
 export SFCGAL_VER=1.3.2
 export GEOS_VER=3.7.2
 export GDAL_VER=2.2.4
@@ -21,10 +22,45 @@
 export PROTOBUF_VER=3.2.0
 export PROTOBUFC_VER=1.2.1
 export CGAL_VER=4.11
+export BOOST_VER=1.53.0
+	#BOOST_VER_WU=1_49_0
+export BOOST_VER_WU=1_53_0
+fi;
+export PROTOBUF_VER=3.2.0
+export PROTOBUFC_VER=1.2.1
+export JSON_VER=0.12
+export PCRE_VER=8.33
+if  [[ "${ICON_VER}" == '' ]] ; then
+  export ICON_VER=1.15
+fi;
 
+echo "ICON_VER ${ICON_VER}"
 
-export LIBXML_VER=2.7.8
+#set to something even if override is on but not set
+if  [[ "${ZLIB_VER}" == '' ]] ; then
+  export ZLIB_VER=1.2.11
+fi;
 
+if  [[ "${BOOST_VER}" == '' ]] ; then
+  export BOOST_VER=1.59.0
+  export BOOST_VER_WU=1_59_0
+fi;
+
+
+#set to something even if override is on but not set
+if  [[ "${LIBXML_VER}" == '' ]] ; then
+  export LIBXML_VER=2.7.8
+fi;
+
+#set to something even if override is on but not set
+if  [[ "${CGAL_VER}" == '' ]] ; then
+  export CGAL_VER=4.11
+fi;
+
+
+
+
+
 if [[ "${GCC_TYPE}" == *gcc48* ]] ; then
 	export PROJECTS=/projects
 	export MINGPROJECTS=/projects
@@ -107,9 +143,6 @@
 fi
 
 if [ -n "$SFCGAL_VER" ]; then
-	BOOST_VER=1.53.0
-	#BOOST_VER_WU=1_49_0
-	export BOOST_VER_WU=1_53_0
 	export PATH="${PROJECTS}/CGAL/rel-cgal-${CGAL_VER}w${OS_BUILD}${GCC_TYPE}/bin:${PROJECTS}/boost/rel-${BOOST_VER_WU}w${OS_BUILD}${GCC_TYPE}/lib:${PATH}"
 
 CPPFLAGS="-I${PGPATH}/include -I${MINGPROJECTS}/rel-libiconv-1.13.1w${OS_BUILD}${GCC_TYPE}/include" \

Modified: branches/2.5/ci/winnie/package_postgis.sh
===================================================================
--- branches/2.5/ci/winnie/package_postgis.sh	2019-10-06 15:44:35 UTC (rev 17858)
+++ branches/2.5/ci/winnie/package_postgis.sh	2019-10-06 15:53:55 UTC (rev 17859)
@@ -12,6 +12,7 @@
 #export OS_BUILD=32
 
 #export GCC_TYPE=
+if  [[ "${OVERRIDE}" == '' ]] ; then
 export SFCGAL_VER=1.3.2
 export GEOS_VER=3.7.2
 export GDAL_VER=2.2.4
@@ -21,7 +22,41 @@
 export PROTOBUF_VER=3.2.0
 export PROTOBUFC_VER=1.2.1
 export CGAL_VER=4.11
+export BOOST_VER=1.53.0
+	#BOOST_VER_WU=1_49_0
+export BOOST_VER_WU=1_53_0
+fi;
+export PROTOBUF_VER=3.2.0
+export PROTOBUFC_VER=1.2.1
+export JSON_VER=0.12
+export PCRE_VER=8.33
+if  [[ "${ICON_VER}" == '' ]] ; then
+  export ICON_VER=1.15
+fi;
 
+echo "ICON_VER ${ICON_VER}"
+
+#set to something even if override is on but not set
+if  [[ "${ZLIB_VER}" == '' ]] ; then
+  export ZLIB_VER=1.2.11
+fi;
+
+if  [[ "${BOOST_VER}" == '' ]] ; then
+  export BOOST_VER=1.59.0
+  export BOOST_VER_WU=1_59_0
+fi;
+
+
+#set to something even if override is on but not set
+if  [[ "${LIBXML_VER}" == '' ]] ; then
+  export LIBXML_VER=2.7.8
+fi;
+
+#set to something even if override is on but not set
+if  [[ "${CGAL_VER}" == '' ]] ; then
+  export CGAL_VER=4.11
+fi;
+
 if [[ "${GCC_TYPE}" == *gcc48* ]] ; then
 	export PROJECTS=/projects
 	export MINGPROJECTS=/projects

Modified: branches/2.5/ci/winnie/regress_postgis.sh
===================================================================
--- branches/2.5/ci/winnie/regress_postgis.sh	2019-10-06 15:44:35 UTC (rev 17858)
+++ branches/2.5/ci/winnie/regress_postgis.sh	2019-10-06 15:53:55 UTC (rev 17859)
@@ -1,5 +1,6 @@
 #!/bin/bash
 set -e
+if  [[ "${OVERRIDE}" == '' ]] ; then
 export SFCGAL_VER=1.3.2
 export GEOS_VER=3.7.2
 export GDAL_VER=2.2.4
@@ -9,7 +10,41 @@
 export PROTOBUF_VER=3.2.0
 export PROTOBUFC_VER=1.2.1
 export CGAL_VER=4.11
+export BOOST_VER=1.53.0
+	#BOOST_VER_WU=1_49_0
+export BOOST_VER_WU=1_53_0
+fi;
+export PROTOBUF_VER=3.2.0
+export PROTOBUFC_VER=1.2.1
+export JSON_VER=0.12
+export PCRE_VER=8.33
+if  [[ "${ICON_VER}" == '' ]] ; then
+  export ICON_VER=1.15
+fi;
 
+echo "ICON_VER ${ICON_VER}"
+
+#set to something even if override is on but not set
+if  [[ "${ZLIB_VER}" == '' ]] ; then
+  export ZLIB_VER=1.2.11
+fi;
+
+if  [[ "${BOOST_VER}" == '' ]] ; then
+  export BOOST_VER=1.59.0
+  export BOOST_VER_WU=1_59_0
+fi;
+
+
+#set to something even if override is on but not set
+if  [[ "${LIBXML_VER}" == '' ]] ; then
+  export LIBXML_VER=2.7.8
+fi;
+
+#set to something even if override is on but not set
+if  [[ "${CGAL_VER}" == '' ]] ; then
+  export CGAL_VER=4.11
+fi;
+
 export PROJECTS=/projects
 export MINGPROJECTS=/projects
 export PATHOLD=$PATH