[postgis-tickets] r17571 - optional cgal version

[Regina Obe]

Author: robe
Date: 2019-06-30 20:37:02 -0700 (Sun, 30 Jun 2019)
New Revision: 17571

Modified:
   trunk/ci/winnie/build_postgis.sh
   trunk/ci/winnie/package_postgis.sh
   trunk/ci/winnie/regress_postgis.sh
Log:
optional cgal version

Modified: trunk/ci/winnie/build_postgis.sh
===================================================================
--- trunk/ci/winnie/build_postgis.sh	2019-07-01 01:27:27 UTC (rev 17570)
+++ trunk/ci/winnie/build_postgis.sh	2019-07-01 03:37:02 UTC (rev 17571)
@@ -36,6 +36,11 @@
   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 GDAL_VER=2.4.0
 #export PROJ_VER=5.2.0
 
@@ -42,6 +47,7 @@
 echo "ZLIB_VER $ZLIB_VER"
 echo "PROJ_VER $PROJ_VER"
 echo "LIBXML_VER $LIBXML_VER"
+echo "CGAL_VER $CGAL_VER"
 export PROJECTS=/projects
 export MINGPROJECTS=/projects
 export PATHOLD=$PATH

Modified: trunk/ci/winnie/package_postgis.sh
===================================================================
--- trunk/ci/winnie/package_postgis.sh	2019-07-01 01:27:27 UTC (rev 17570)
+++ trunk/ci/winnie/package_postgis.sh	2019-07-01 03:37:02 UTC (rev 17571)
@@ -53,12 +53,16 @@
   export LIBXML_VER=2.7.8
 fi;
 
-#export GDAL_VER=2.4.0
-#export PROJ_VER=5.2.0
+#set to something even if override is on but not set
+if  [[ "${CGAL_VER}" == '' ]] ; then
+  export CGAL_VER=4.11
+fi;
 
 echo "ZLIB_VER $ZLIB_VER"
 echo "PROJ_VER $PROJ_VER"
 echo "LIBXML_VER $LIBXML_VER"
+echo "CGAL_VER $CGAL_VER"
+
 export PROJECTS=/projects
 export MINGPROJECTS=/projects
 export PATHOLD=$PATH

Modified: trunk/ci/winnie/regress_postgis.sh
===================================================================
--- trunk/ci/winnie/regress_postgis.sh	2019-07-01 01:27:27 UTC (rev 17570)
+++ trunk/ci/winnie/regress_postgis.sh	2019-07-01 03:37:02 UTC (rev 17571)
@@ -36,12 +36,18 @@
   export LIBXML_VER=2.7.8
 fi;
 
-#export GDAL_VER=2.4.0
-#export PROJ_VER=5.2.0
+#set to something even if override is on but not set
+if  [[ "${CGAL_VER}" == '' ]] ; then
+  export CGAL_VER=4.11
+fi;
 
 echo "ZLIB_VER $ZLIB_VER"
 echo "PROJ_VER $PROJ_VER"
 echo "LIBXML_VER $LIBXML_VER"
+echo "CGAL_VER $CGAL_VER"
+echo "ZLIB_VER $ZLIB_VER"
+echo "PROJ_VER $PROJ_VER"
+echo "LIBXML_VER $LIBXML_VER"
 export PROJECTS=/projects
 export MINGPROJECTS=/projects
 export PATHOLD=$PATH