[postgis-tickets] r16397 - backport regress changes from 2.5
Regina Obe
lr at pcorp.us
Tue Feb 20 02:35:17 PST 2018
Author: robe
Date: 2018-02-20 14:35:16 -0800 (Tue, 20 Feb 2018)
New Revision: 16397
Modified:
branches/2.4/ci/winnie/build_postgis.sh
branches/2.4/ci/winnie/package_postgis.sh
branches/2.4/ci/winnie/regress_postgis.sh
Log:
backport regress changes from 2.5
Modified: branches/2.4/ci/winnie/build_postgis.sh
===================================================================
--- branches/2.4/ci/winnie/build_postgis.sh 2018-02-20 22:33:29 UTC (rev 16396)
+++ branches/2.4/ci/winnie/build_postgis.sh 2018-02-20 22:35:16 UTC (rev 16397)
@@ -6,17 +6,23 @@
#export PG_VER=9.2beta2
#export PGHOST=localhost
#export PGPORT=8442
+#export PGUSER=postgres
#POSTGIS_SVN_REVISION=passed_in_by_buildbot
+#POSTGIS_MAJOR_VERSION=2
+#POSTGIS_MINOR_VERSION=1
+#POSTGIS_MICRO_VERSION=0SVN
+#export GCC_TYPE=gcc48 #for pre-4.8.0 compiles this is blank
+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
-# export SFCGAL_VER=1.3.2
-# export PCRE_VER=8.33
-# export PROTOBUF_VER=3.2.0
-# export PROTOBUFC_VER=1.2.1
-# export PROTOBUF_VER=3.2.0
export LIBXML_VER=2.7.8
if [[ "${GCC_TYPE}" == *gcc48* ]] ; then
@@ -44,6 +50,7 @@
echo PATH BEFORE: $PATH
+
export PGPATH=${PROJECTS}/postgresql/rel/pg${PG_VER}w${OS_BUILD}${GCC_TYPE}
#export PROJSO=libproj-0.dll
@@ -50,6 +57,7 @@
export POSTGIS_VER=${POSTGIS_MAJOR_VERSION}.${POSTGIS_MINOR_VERSION}
export POSTGIS_MICRO_VER=${POSTGIS_MAJOR_VERSION}.${POSTGIS_MINOR_VERSION}.${POSTGIS_MICRO_VERSION}
+echo POSTGIS_MICRO_VERSION: $POSTGIS_VER
if [[ "$POSTGIS_MICRO_VERSION" == *SVN* || "$POSTGIS_MICRO_VERSION" == *dev* ]] ; then
export POSTGIS_SRC=${PROJECTS}/postgis/branches/${POSTGIS_VER}
else
@@ -72,7 +80,7 @@
echo PATH AFTER: $PATH
-export PKG_CONFIG_PATH=${PROJECTS}/protobuf/rel-${PROTOBUF_VER}w${OS_BUILD}${GCC_TYPE}/lib/pkgconfig;
+export PKG_CONFIG_PATH=${PROJECTS}/protobuf/rel-${PROTOBUF_VER}w${OS_BUILD}${GCC_TYPE}/lib/pkgconfig
cd ${POSTGIS_SRC}
if [ -e ./GNUMakefile ]; then
@@ -94,8 +102,6 @@
fi
if [ -n "$SFCGAL_VER" ]; then
- ##hard code versions of cgal etc. for now
- export CGAL_VER=4.11
BOOST_VER=1.53.0
#BOOST_VER_WU=1_49_0
export BOOST_VER_WU=1_53_0
@@ -102,6 +108,7 @@
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" \
+CFLAGS="-Wall -fno-omit-frame-pointer" \
LDFLAGS="-L${PGPATH}/lib -L${PROJECTS}/gdal/rel-${GDAL_VER}w${OS_BUILD}${GCC_TYPE}/lib -L${MINGPROJECTS}/rel-libiconv-1.13.1w${OS_BUILD}${GCC_TYPE}/lib" ./configure \
--host=${MINGHOST} --with-xml2config=${PROJECTS}/libxml/rel-libxml2-${LIBXML_VER}w${OS_BUILD}${GCC_TYPE}/bin/xml2-config \
--with-pgconfig=${PGPATH}/bin/pg_config \
@@ -114,9 +121,12 @@
--with-gui --with-gettext=no \
--with-protobufdir=${PROJECTS}/protobuf/rel-${PROTOBUF_VER}w${OS_BUILD}${GCC_TYPE} \
--with-sfcgal=${PROJECTS}/CGAL/rel-sfcgal-${SFCGAL_VER}w${OS_BUILD}${GCC_TYPE}/bin/sfcgal-config \
- --with-pcredir=${PROJECTS}/pcre/rel-${PCRE_VER}w${OS_BUILD}${GCC_TYPE}
-elif [ "$POSTGIS_MAJOR_VERSION" == "2" ] ; then
+ --with-pcredir=${PROJECTS}/pcre/rel-${PCRE_VER}w${OS_BUILD}${GCC_TYPE} \
+ --without-interrupt-tests \
+ --prefix=${PROJECTS}/postgis/liblwgeom-${POSTGIS_VER}w${OS_BUILD}${GCC_TYPE}
+else
CPPFLAGS="-I${PGPATH}/include -I${MINGPROJECTS}/rel-libiconv-1.13.1w${OS_BUILD}${GCC_TYPE}/include" \
+CFLAGS="-Wall -fno-omit-frame-pointer" \
LDFLAGS="-L${PGPATH}/lib -L${PROJECTS}/gdal/rel-${GDAL_VER}w${OS_BUILD}${GCC_TYPE}/lib -L${MINGPROJECTS}/rel-libiconv-1.13.1w${OS_BUILD}${GCC_TYPE}/lib" ./configure \
--host=${MINGHOST} --with-xml2config=${PROJECTS}/libxml/rel-libxml2-${LIBXML_VER}w${OS_BUILD}${GCC_TYPE}/bin/xml2-config \
--with-pgconfig=${PGPATH}/bin/pg_config \
@@ -128,28 +138,15 @@
--with-jsondir=${MINGPROJECTS}/json-c/rel-${JSON_VER}w${OS_BUILD}${GCC_TYPE} \
--with-libiconv=${PROJECTS}/rel-libiconv-1.13.1w${OS_BUILD}${GCC_TYPE} \
--with-xsldir=${PROJECTS}/docbook/docbook-xsl-1.76.1 \
-else
-CPPFLAGS="-I${PGPATH}/include -I${MINGPROJECTS}/rel-libiconv-1.13.1w${OS_BUILD}${GCC_TYPE}/include" \
- LDFLAGS="-L${PGPATH}/lib -L${PROJECTS}/gdal/rel-${GDAL_VER}w${OS_BUILD}${GCC_TYPE}/lib -L${MINGPROJECTS}/rel-libiconv-1.13.1w${OS_BUILD}${GCC_TYPE}/lib" ./configure \
- --host=${MINGHOST} --with-xml2config=${PROJECTS}/libxml/rel-libxml2-${LIBXML_VER}w${OS_BUILD}${GCC_TYPE}/bin/xml2-config \
- --with-pgconfig=${PGPATH}/bin/pg_config \
- --with-geosconfig=${PROJECTS}/geos/rel-${GEOS_VER}w${OS_BUILD}${GCC_TYPE}/bin/geos-config \
- --with-projdir=${MINGPROJECTS}/proj/rel-${PROJ_VER}w${OS_BUILD}${GCC_TYPE} \
- --with-gdalconfig=${PROJECTS}/gdal/rel-${GDAL_VER}w${OS_BUILD}${GCC_TYPE}/bin/gdal-config \
- --with-jsondir=${MINGPROJECTS}/json-c/rel-${JSON_VER}w${OS_BUILD}${GCC_TYPE} \
- --with-libiconv=${PROJECTS}/rel-libiconv-1.13.1w${OS_BUILD}${GCC_TYPE} \
- --with-xsldir=${PROJECTS}/docbook/docbook-xsl-1.76.1 \
- --with-gettext=no
+ --without-interrupt-tests \
+ --prefix=${PROJECTS}/postgis/liblwgeom-${POSTGIS_VER}w${OS_BUILD}${GCC_TYPE}
fi;
-#make clean
-##hack to get around boolean incompatibility now only needed for 2.0 (no longer for 2.1)
-if [ "$POSTGIS_MINOR_VERSION" == "0" ] ; then
-cp ${MINGPROJECTS}/json-c/rel-${JSON_VER}w${OS_BUILD}${GCC_TYPE}/include/json/json_object.h.for_compile ${MINGPROJECTS}/json-c/rel-${JSON_VER}w${OS_BUILD}${GCC_TYPE}/include/json/json_object.h
-fi;
-
+make clean
#patch liblwgeom generated make to get rid of dynamic linking
sed -i 's/LDFLAGS += -no-undefined//g' liblwgeom/Makefile
+#make uninstall
+
make && make install
Modified: branches/2.4/ci/winnie/package_postgis.sh
===================================================================
--- branches/2.4/ci/winnie/package_postgis.sh 2018-02-20 22:33:29 UTC (rev 16396)
+++ branches/2.4/ci/winnie/package_postgis.sh 2018-02-20 22:35:16 UTC (rev 16397)
@@ -9,18 +9,18 @@
#POSTGIS_MAJOR_VERSION=2
#POSTGIS_MINOR_VERSION=1
#POSTGIS_MICRO_VERSION=0dev
-# export GEOS_VER=3.6.2
-# 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 OS_BUILD=32
-# export PROTOBUF_VER=3.2.0
-# export LIBXML_VER=2.7.8
-# export PROTOBUF_VER=3.2.0
-# export PROTOBUFC_VER=1.2.1
+#export GCC_TYPE=
+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
@@ -54,15 +54,15 @@
if [[ "$POSTGIS_MICRO_VERSION" == *SVN* || "$POSTGIS_MICRO_VERSION" == *dev* ]] ; then
export POSTGIS_SRC=${PROJECTS}/postgis/branches/${POSTGIS_MINOR_VER}
- export svnurl="http://svn.osgeo.org/postgis/branches/${POSTGIS_MINOR_VER}"
+ export svnurl="https://svn.osgeo.org/postgis/branches/${POSTGIS_MINOR_VER}"
else
#tagged version -- official release
export POSTGIS_SRC=${PROJECTS}/postgis/tags/${POSTGIS_MINOR_VER}.${POSTGIS_MICRO_VERSION}
- export svnurl="http://svn.osgeo.org/postgis/tags/${POSTGIS_MINOR_VER}.${POSTGIS_MICRO_VERSION}"
+ export svnurl="https://svn.osgeo.org/postgis/tags/${POSTGIS_MINOR_VER}.${POSTGIS_MICRO_VERSION}"
fi;
-if [[ "$POSTGIS_MINOR_VER" == 2.3 ]] ; then
- export svnurl="http://svn.osgeo.org/postgis/trunk"
+if [[ "$reference" == *trunk* ]] ; then
+ export svnurl="https://svn.osgeo.org/postgis/trunk"
fi;
#export POSTGIS_SRC=${PROJECTS}/postgis/trunk
#POSTGIS_SVN_REVISION=will_be_passed_in_by_bot
@@ -146,7 +146,6 @@
if [ -n "$SFCGAL_VER" ]; then
## only copy cgal and sfcgal stuff if sfcgal is packaged
- 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
@@ -199,7 +198,9 @@
#cp topology/README* ${RELDIR}/${RELVERDIR}/share/contrib/postgis-${POSTGIS_MINOR_VER}
#cp utils/* ${RELDIR}/${RELVERDIR}/utils
#cp extras/* ${RELDIR}/${RELVERDIR}/share/contrib/postgis-${POSTGIS_MINOR_VER}/extras
-cp -r extensions/*/sql/* ${RELDIR}/${RELVERDIR}/share/extension
+cp ${PGPATH}/share/extension/postgis*${POSTGIS_MICRO_VER}.sql ${RELDIR}/${RELVERDIR}/share/extension
+cp ${PGPATH}/share/extension/postgis*${POSTGIS_MICRO_VER}next.sql ${RELDIR}/${RELVERDIR}/share/extension
+cp ${PGPATH}/share/extension/address_standardizer*${POSTGIS_MICRO_VER}.sql ${RELDIR}/${RELVERDIR}/share/extension
cp -r extensions/*/*.control ${RELDIR}/${RELVERDIR}/share/extension
cp -r extensions/*/*.dll ${RELDIR}/${RELVERDIR}/lib #only address_standardizer in theory has this
#cp extensions/postgis_topology/sql/* ${RELDIR}/${RELVERDIR}/share/extension
Modified: branches/2.4/ci/winnie/regress_postgis.sh
===================================================================
--- branches/2.4/ci/winnie/regress_postgis.sh 2018-02-20 22:33:29 UTC (rev 16396)
+++ branches/2.4/ci/winnie/regress_postgis.sh 2018-02-20 22:35:16 UTC (rev 16397)
@@ -1,30 +1,20 @@
#!/bin/bash
set -e
-#winnie passed in variables
-#export OS_BUILD=64
-#export GCC_TYPE=gcc48
-#export PG_VER=9.3
-#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.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 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 PROTOBUF_VER=3.2.0
-# export LIBXML_VER=2.7.8
-
export PROJECTS=/projects
export MINGPROJECTS=/projects
export PATHOLD=$PATH
-export MAKE_EXTENSION=1
-
if [ "$OS_BUILD" == "64" ] ; then
export MINGHOST=x86_64-w64-mingw32
else
@@ -95,7 +85,7 @@
if [ -n "$SFCGAL_VER" ]; then
##hard code versions of cgal etc. for now
- export CGAL_VER=4.2
+ export CGAL_VER=4.11
BOOST_VER=1.53.0
#BOOST_VER_WU=1_49_0
export BOOST_VER_WU=1_53_0
@@ -102,6 +92,7 @@
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" \
+CFLAGS="-Wall -fno-omit-frame-pointer" \
LDFLAGS="-L${PGPATH}/lib -L${PROJECTS}/gdal/rel-${GDAL_VER}w${OS_BUILD}${GCC_TYPE}/lib -L${MINGPROJECTS}/rel-libiconv-1.13.1w${OS_BUILD}${GCC_TYPE}/lib" ./configure \
--host=${MINGHOST} --with-xml2config=${PROJECTS}/libxml/rel-libxml2-${LIBXML_VER}w${OS_BUILD}${GCC_TYPE}/bin/xml2-config \
--with-pgconfig=${PGPATH}/bin/pg_config \
@@ -115,9 +106,11 @@
--with-protobufdir=${PROJECTS}/protobuf/rel-${PROTOBUF_VER}w${OS_BUILD}${GCC_TYPE} \
--with-sfcgal=${PROJECTS}/CGAL/rel-sfcgal-${SFCGAL_VER}w${OS_BUILD}${GCC_TYPE}/bin/sfcgal-config \
--with-pcredir=${PROJECTS}/pcre/rel-${PCRE_VER}w${OS_BUILD}${GCC_TYPE} \
- --without-interrupt-tests
-elif [ "$POSTGIS_MAJOR_VERSION" == "2" ] ; then
+ --without-interrupt-tests \
+ --prefix=${PROJECTS}/postgis/liblwgeom-${POSTGIS_VER}w${OS_BUILD}${GCC_TYPE}
+else
CPPFLAGS="-I${PGPATH}/include -I${MINGPROJECTS}/rel-libiconv-1.13.1w${OS_BUILD}${GCC_TYPE}/include" \
+CFLAGS="-Wall -fno-omit-frame-pointer" \
LDFLAGS="-L${PGPATH}/lib -L${PROJECTS}/gdal/rel-${GDAL_VER}w${OS_BUILD}${GCC_TYPE}/lib -L${MINGPROJECTS}/rel-libiconv-1.13.1w${OS_BUILD}${GCC_TYPE}/lib" ./configure \
--host=${MINGHOST} --with-xml2config=${PROJECTS}/libxml/rel-libxml2-${LIBXML_VER}w${OS_BUILD}${GCC_TYPE}/bin/xml2-config \
--with-pgconfig=${PGPATH}/bin/pg_config \
@@ -129,29 +122,12 @@
--with-jsondir=${MINGPROJECTS}/json-c/rel-${JSON_VER}w${OS_BUILD}${GCC_TYPE} \
--with-libiconv=${PROJECTS}/rel-libiconv-1.13.1w${OS_BUILD}${GCC_TYPE} \
--with-xsldir=${PROJECTS}/docbook/docbook-xsl-1.76.1 \
- --without-interrupt-tests
-else
-CPPFLAGS="-I${PGPATH}/include -I${MINGPROJECTS}/rel-libiconv-1.13.1w${OS_BUILD}${GCC_TYPE}/include" \
- LDFLAGS="-L${PGPATH}/lib -L${PROJECTS}/gdal/rel-${GDAL_VER}w${OS_BUILD}${GCC_TYPE}/lib -L${MINGPROJECTS}/rel-libiconv-1.13.1w${OS_BUILD}${GCC_TYPE}/lib" ./configure \
- --host=${MINGHOST} --with-xml2config=${PROJECTS}/libxml/rel-libxml2-${LIBXML_VER}w${OS_BUILD}${GCC_TYPE}/bin/xml2-config \
- --with-pgconfig=${PGPATH}/bin/pg_config \
- --with-geosconfig=${PROJECTS}/geos/rel-${GEOS_VER}w${OS_BUILD}${GCC_TYPE}/bin/geos-config \
- --with-projdir=${MINGPROJECTS}/proj/rel-${PROJ_VER}w${OS_BUILD}${GCC_TYPE} \
- --with-gdalconfig=${PROJECTS}/gdal/rel-${GDAL_VER}w${OS_BUILD}${GCC_TYPE}/bin/gdal-config \
- --with-jsondir=${MINGPROJECTS}/json-c/rel-${JSON_VER}w${OS_BUILD}${GCC_TYPE} \
- --with-libiconv=${PROJECTS}/rel-libiconv-1.13.1w${OS_BUILD}${GCC_TYPE} \
- --with-xsldir=${PROJECTS}/docbook/docbook-xsl-1.76.1 \
- --with-gettext=no
+ --without-interrupt-tests \
+ --prefix=${PROJECTS}/postgis/liblwgeom-${POSTGIS_VER}w${OS_BUILD}${GCC_TYPE}
fi;
make clean
-##hack to get around boolean incompatibility
-##hack to get around boolean incompatibility now only needed for 2.0 (no longer for 2.1)
-if [ "$POSTGIS_MINOR_VERSION" == "0" ] ; then
-cp ${MINGPROJECTS}/json-c/rel-${JSON_VER}w${OS_BUILD}${GCC_TYPE}/include/json/json_object.h.for_compile ${MINGPROJECTS}/json-c/rel-${JSON_VER}w${OS_BUILD}${GCC_TYPE}/include/json/json_object.h
-fi;
-
#patch liblwgeom generated make to get rid of dynamic linking
sed -i 's/LDFLAGS += -no-undefined//g' liblwgeom/Makefile
@@ -169,7 +145,9 @@
cp topology/*.dll ${PGPATHEDB}/lib
cp postgis/postgis*.dll ${PGPATHEDB}/lib
cp raster/rt_pg/rtpostgis-*.dll ${PGPATHEDB}/lib
- cp -r extensions/*/sql/* ${PGPATHEDB}/share/extension
+ cp -r ${PGPATH}/share/extension/postgis*${POSTGIS_MICRO_VER}.sql ${PGPATHEDB}/share/extension
+ cp -r ${PGPATH}/share/extension/postgis*${POSTGIS_MICRO_VER}next.sql ${PGPATHEDB}/share/extension
+ cp -r ${PGPATH}/share/extension/address_standardizer*${POSTGIS_MICRO_VER}.sql ${PGPATHEDB}/share/extension
cp -r extensions/*/*.control ${PGPATHEDB}/share/extension
cp -r extensions/*/*.dll ${PGPATHEDB}/lib
More information about the postgis-tickets
mailing list