upgrade to use cgal 4.6.1 and boost 1.59.0

git-svn-id: http://svn.osgeo.org/postgis/trunk@13938 b70326c6-7e19-0410-871a-916f4a2858ee

diff --git a/ci/winnie/package_postgis.sh b/ci/winnie/package_postgis.sh
index 9a6b291cec3f0518951db9e126a5b1ba15d8b974..ee0d53ed77c528ed2d23de86c853772f0666cd25 100644 (file)
--- a/ci/winnie/package_postgis.sh
+++ b/ci/winnie/package_postgis.sh
@@ -131,9 +131,9 @@ fi;
 
 if [ -n "$SFCGAL_VER"  ]; then
        ## only copy cgal and sfcgal stuff if sfcgal is packaged
-       export CGAL_VER=4.2
-       export BOOST_VER=1.53.0
-       export BOOST_VER_WU=1_53_0
+       export CGAL_VER=4.6.1
+       export BOOST_VER=1.59.0
+       export BOOST_VER_WU=1_59_0
        export GMP_VER=5.1.2
        export MPFR_VER=3.1.2
        echo "CGAL VERSION: ${CGAL_VER} http://www.cgal.org" >> $verfile
@@ -189,7 +189,13 @@ cp -r ${RELDIR}/packaging_notes/* ${RELDIR}/${RELVERDIR}/
 echo "GEOS VERSION: ${GEOS_VER} http://trac.osgeo.org/geos" >> $verfile
 echo "GDAL VERSION: ${GDAL_VER} http://trac.osgeo.org/gdal" >> $verfile
 echo "PROJ VERSION: ${PROJ_VER} http://trac.osgeo.org/proj" >> $verfile
-echo "PAGC ADDRESS STANDARDIZER: http://sourceforge.net/p/pagc/code/HEAD/tree/branches/sew-refactor/postgresql " >> $verfile
+
+if [ -n "$SFCGAL_VER"  ]; then
+    echo "CGAL VERSION: ${CGAL_VER} http://www.cgal.org" >> $verfile
+    echo "BOOST VERSION: ${BOOST_VER} http://www.boost.org" >> $verfile
+    echo "SFCGAL VERSION: ${SFCGAL_VER} http://www.sfcgal.org https://github.com/Oslandia/SFCGAL" >> $verfile
+fi;
+#echo "PAGC ADDRESS STANDARDIZER: http://sourceforge.net/p/pagc/code/HEAD/tree/branches/sew-refactor/postgresql " >> $verfile
 cd ${RELDIR}
 zip -r $package ${RELVERDIR}
 #scp $package robe@www.refractions.net:${DWN}/${REL_PGVER}/buildbot/${RELVERDIR}.zip

diff --git a/ci/winnie/regress_postgis.sh b/ci/winnie/regress_postgis.sh
index 0057663df67e88d88eefc24066576d3ad8e6166a..8eae8f49846d262a1905c49e0598c220c705e6a9 100644 (file)
--- a/ci/winnie/regress_postgis.sh
+++ b/ci/winnie/regress_postgis.sh
@@ -81,10 +81,10 @@ fi
 
 if [ -n "$SFCGAL_VER" ]; then
        ##hard code versions of cgal etc. for now
-       export CGAL_VER=4.2
-       BOOST_VER=1.53.0
-       #BOOST_VER_WU=1_49_0
-       export BOOST_VER_WU=1_53_0
+       export CGAL_VER=4.6.1
+       BOOST_VER=1.59.0
+       
+       export BOOST_VER_WU=1_59_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}"
        
        #this is a major cludge but only building with pcre support if SFCGAL is built - can't figure out how to do this without passing PCRE