Commit db6abf1d authored by Bas Couwenberg's avatar Bas Couwenberg

New upstream version 2.4.0~beta1+dfsg

parent 805c5fc1
......@@ -10,9 +10,10 @@ pipeline:
recursive: false
build:
image: *test-image
pull: true
commands:
- ./autogen.sh
- ./configure CFLAGS="-O0 -Wall"
- ./configure CFLAGS="-O0 -Wall" --without-interrupt-tests
- make
check:
image: *test-image
......@@ -20,4 +21,4 @@ pipeline:
- service postgresql start
- make check RUNTESTFLAGS=-v
- make install
- utils/check_all_upgrades.sh 2.4.0dev
- utils/check_all_upgrades.sh 2.4.0alpha
......@@ -17,10 +17,34 @@ trim_trailing_whitespace = false
[*.{c,h}]
indent_style = tab
# SQL files want tab indentation
[*.{sql,sql.in}]
indent_style = tab
# topology C files want space indentation
[topology/*.{c,h}]
indent_style = space
# topology C files want space indentation
[liblwgeom/lwgeom_topo.{c,h}]
indent_style = space
# topology SQL files want space indentation
[topology/**.{sql,sql.in}]
indent_style = space
# postgis/sfcgal.sql.in wants space indentation
[postgis/sfcgal.sql.in]
indent_style = space
# .h.in files want space indentation
[*.h.in]
indent_style = space
# Makefiles want tab indentation
[{Makefile.in,Makefile,GNUmakefile.in}]
indent_style = tab
# .bat files want CRLF
[*.bat]
end_of_line = crlf
*.vcproj eol=crlf
*.bat eol=crlf
*.sh eol=lf
*.ac eol=lf
*.h.in eol=lf
......
......@@ -3,15 +3,17 @@ env:
- RUNTESTFLAGS=-v
addons:
postgresql: "9.4"
postgresql: "9.6"
before_install:
- sudo add-apt-repository --yes ppa:ubuntugis/ppa
- sudo add-apt-repository --yes ppa:ubuntugis/ubuntugis-unstable
- sudo apt-get update -qq
- sudo apt-get install -y
postgresql-9.4 postgresql-server-dev-9.4
build-essential autoconf libtool libcunit1-dev
xsltproc docbook-xsl docbook-mathml dblatex
libproj-dev libgdal1h libgdal-dev libgeos-dev libjson0-dev
- sudo apt-get install -y --no-install-recommends
postgresql-9.6 postgresql-server-dev-9.6
libcunit1-dev xsltproc docbook-xsl docbook-mathml dblatex
libproj-dev libgdal-dev libgeos-dev libjson0-dev
libsfcgal1 libsfcgal-dev libprotobuf-c0-dev libgdal-dev
- dpkg -l | grep postgresql
- ./autogen.sh
......@@ -19,9 +21,12 @@ language: c
compiler: gcc
dist: trusty
script:
- ./configure
- make
- chmod 755 /home/travis
- make check
- make check RUNTESTFLAGS='--dumprestore'
- sudo make install
......
This diff is collapsed.
PostGIS 2.4.0
2017/09/xx
* New Features *
- #3822, Have postgis_full_version() also show and check version of
PostgreSQL the scripts were built against (Sandro Santilli)
- #2411, curves support in ST_Reverse (Sandro Santilli)
- #2951, ST_Centroid for geography (Danny Götte)
- #3788, Allow postgis_restore.pl to work on directory-style (-Fd) dumps
(Roger Crew)
- #3772, Direction agnostic ST_CurveToLine output (Sandro Santilli / KKGeo)
- #2464, ST_CurveToLine with MaxError tolerance (Sandro Santilli / KKGeo)
- #3599, Geobuf output support via ST_AsGeobuf (Björn Harrtell)
- #3661, Mapbox vector tile output support via ST_AsMVT (Björn Harrtell / CartoDB)
- #3689, Add orientation checking and forcing functions (Dan Baston)
- #3753, Gist penalty speed improvements for 2d and nd points
(Darafei Praliaskouski)
- #3677, ST_FrechetDistance (Shinichi Sugiyama)
- Most aggregates (raster and geometry),
and all stable / immutable (raster and geometry) marked as parallel safe
- #2249, ST_MakeEmptyCoverage for raster (David Zwarg, ainomieli)
- #3709, Allow signed distance for ST_Project (Darafei Praliaskouski)
- #524, Covers support for Polygon-on-polygon, line on line,
point on line for geography (Danny Götte)
* Enhancements *
- Support for PostgreSQL 10
- #3747, Add zip4 and address_alphanumeric as attributes
to norm_addy tiger_geocoder type.
- #3748, address_standardizer lookup tables update
so pagc_normalize_address better standardizes abbreviations
- #3647, better handling of noding in ST_Node using GEOSNode
(Wouter Geraedts)
- #3684, Update to EPSG register v9
(Even Rouault)
* Breaking Changes *
- Dropped support for PostgreSQL 9.2.
- #3810, GEOS 3.4.0 or above minimum required to compile
- Most aggregates now marked as parallel safe,
which means most aggs have to be dropped / recreated.
If you have views that utilize PostGIS aggs,
you'll need to drop before upgrade and recreate after upgrade
PostGIS 2.4.0beta1
2017/09/02
See PostGIS 2.4.0 section for details
PostGIS 2.4.0alpha
2017/08/05
See PostGIS 2.4.0 section for details
PostGIS 2.3.3
2017/07/01
......@@ -31,6 +85,7 @@ PostGIS 2.3.2
- #3683, Unable to update postgis after postgres pg_upgrade going from < 9.5 to pg > 9.4
- #3688, ST_AsLatLonText: round minutes
PostGIS 2.3.1
2016/11/28
......@@ -53,6 +108,7 @@ PostGIS 2.3.1
- #3667, geography ST_Segmentize bug
(Hugo Mercier of Oslandia)
PostGIS 2.3.0
2016/09/26
......@@ -67,6 +123,8 @@ PostGIS 2.3.0
- #3396, ST_EstimatedExtent, throw WARNING instead of ERROR
(Regina Obe)
* Deprecated signatures *
* New Features *
- Add support for custom TOC in postgis_restore.pl
......@@ -109,7 +167,7 @@ PostGIS 2.3.0
* Bug Fixes
- #2841, ST_MinimumBoundingCircle not covering original
- #2841, ST_MinimumBoundingCircle not covering original
* Performance Enhancements *
......@@ -120,6 +178,17 @@ PostGIS 2.3.0
- Make adding a line to topology interruptible (Sandro Santilli)
- Documentation updates from Mike Toews
PostGIS 2.3.0rc1
2016/09/19
See PostGIS 2.3.0 section for details
PostGIS 2.3.0beta1
2016/09/06
See PostGIS 2.3.0 section for details
PostGIS 2.2.2
2016/03/22
......@@ -143,6 +212,7 @@ PostGIS 2.2.2
http://postgis.net/docs/manual-2.2/RT_FAQ.html#faq_raster_data_not_restore
- #3426, failing POINT EMPTY tests on fun architectures
PostGIS 2.2.1
2016/01/06
......@@ -199,7 +269,6 @@ PostGIS 2.2.0
- Java binding moved to separate repository:
https://github.com/postgis/postgis-java
* Deprecated signatures *
- #2748, ST_Shift_Longitude renamed to ST_ShiftLongitude,
......@@ -330,6 +399,7 @@ PostGIS 2.2.0
smaller files for ease of long-term maintenance and development
- #1220, lwerror and lwnotice function became internal to liblwgeom
PostGIS 2.1.8
2015/07/07
......@@ -355,6 +425,7 @@ PostGIS 2.1.7
- #3088, Do not (re)define strcasestr in a liblwgeom.h
- #3094, Malformed GeoJSON inputs crash backend
PostGIS 2.1.6
2015/03/20
......@@ -378,6 +449,7 @@ PostGIS 2.1.6
- #3020, ST_AddBand out-db bug where height using width value
- #3031, Allow restore of Geometry(Point) tables dumped with empties in them
PostGIS 2.1.5
2014/12/18
......@@ -395,6 +467,7 @@ PostGIS 2.1.5
- #2953, 2D stats not generated when Z/M values are extreme
- #3009, Geography cast may effect underlying tuple
PostGIS 2.1.4
2014/09/10
......
Debbie:
[![Build Status](https://debbie.postgis.net/buildStatus/icon?job=PostGIS_2.3)]
(https://debbie.postgis.net/view/PostGIS/job/PostGIS_2.3/)
[![Build Status](https://debbie.postgis.net/buildStatus/icon?job=PostGIS_trunk)](https://debbie.postgis.net/view/PostGIS/job/PostGIS_trunk/)
Winnie:
[![Build Status](https://debbie.postgis.net:444/buildStatus/icon?job=PostGIS_2.3)]
(https://debbie.postgis.net:444/view/PostGIS/job/PostGIS_2.3/)
[![Build Status](https://debbie.postgis.net:444/buildStatus/icon?job=PostGIS_trunk)](https://debbie.postgis.net:444/view/PostGIS/job/PostGIS_trunk/)
Dronie:
[![Build Status](https://drone.osgeo.org/api/badges/postgis/postgis/status.svg?branch=svn-2.3)]
(https://drone.osgeo.org/postgis/postgis?branch=svn-2.3)
[![Build Status](https://drone.osgeo.org/api/badges/postgis/postgis/status.svg?branch=svn-trunk)](https://drone.osgeo.org/postgis/postgis?branch=svn-trunk)
Travis:
[![Build Status](https://secure.travis-ci.org/postgis/postgis.png?branch=svn-2.3)]
(http://travis-ci.org/postgis/postgis?branch=svn-2.3)
[![Build Status](https://secure.travis-ci.org/postgis/postgis.svg)](http://travis-ci.org/postgis/postgis)
GitLab-CI:
[![Gitlab-CI](https://gitlab.com/postgis/postgis/badges/svn-2.3/build.svg)]
(https://gitlab.com/postgis/postgis/commits/svn-2.3)
[![Gitlab-CI](https://gitlab.com/postgis/postgis/badges/svn-trunk/build.svg)](https://gitlab.com/postgis/postgis/commits/svn-trunk)
This file is here to play nicely with modern code repository facilities.
Actual readme is [here](README.postgis).
......@@ -22,15 +17,23 @@ https://trac.osgeo.org/postgis/
## Official chat room:
Use your preferred client, if configured:
Official chat room is the #postgis channel on the
[freenode](https://freenode.net) network.
To partecipate, point your preferred
[IRC client](https://en.wikipedia.org/wiki/Comparison_of_Internet_Relay_Chat_clients)
to:
irc://irc.freenode.net/#postgis
Or try a web client like:
Or try a web IRC client like:
- [qwebirc@freenode](https://webchat.freenode.net/?channels=#postgis)
- [KiwiIRC](https://kiwiirc.com/client/irc.freenode.net/#postgis)
Or join via [matrix](https://matrix.to/#/#postgis:matrix.org)
## Official source tarball releases
http://postgis.net/source
If you would like to contribute to this project, please refer to our
......
PostGIS - Geographic Information Systems Extensions to PostgreSQL
=================================================================
:Version: 2.3.3
:Date: 2017-07-01
:Version: 2.4.0beta1
:Date: 2017-09-02
:Website: http://postgis.net
This distribution contains a module which implements GIS simple features, ties
......@@ -31,7 +31,7 @@ Directory structure::
REQUIREMENTS
------------
PostGIS 2.3.3 is compatible with PostgreSQL 9.2-9.6.
PostGIS is compatible with PostgreSQL 9.3 and above.
You *must* have the full PostgreSQL - including server headers - installed for
this to work.
......@@ -44,7 +44,7 @@ this to work.
http://trac.osgeo.org/proj/
* GEOS (Required, Version 3.3.0 or higher
- 3.6+ is strongly recommended and needed for full features):
- 3.4+ is strongly recommended and needed for full features):
The GEOS library provides support for exact topological tests such as
ST_Touches(), ST_Contains(), ST_Disjoint() and spatial operations such as
......@@ -187,8 +187,7 @@ UPGRADING EXISTING SPATIAL DATABASES
Upgrade PostGIS using the "ALTER EXTENSION" facility.
ALTER EXTENSION postgis UPDATE;
ALTER EXTENSION postgis UPDATE TO '2.2.0';
USAGE
......
......@@ -4,8 +4,8 @@
# See HOWTO_RELEASE file in SVN for definitions of those three.
POSTGIS_MAJOR_VERSION=2
POSTGIS_MINOR_VERSION=3
POSTGIS_MICRO_VERSION=3
POSTGIS_MINOR_VERSION=4
POSTGIS_MICRO_VERSION=0beta1
# Liblwgeom interface versioning, reset to 0:0:0 (cur:age:rev)
# when changing POSTGIS_MINOR_VERSION
......
This diff is collapsed.
......@@ -27,3 +27,4 @@ yecarrillo = Eduin Carrillo <yecarrillo@yahoo.com>
bergun = Baris Ergun <barisergun75@gmail.com>
woodbri = Stephen Woodbridge <woodbri@swoodbridge.com>
dbaston = Daniel Baston <dbaston@gmail.com>
bjornharrtell = Björn Harrtell <bjorn@wololo.org>
......@@ -27,3 +27,4 @@ yecarrillo:Eduin Carrillo <yecarrillo@yahoo.com>
bergun:Baris Ergun <barisergun75@gmail.com>
woodbri:Stephen Woodbridge <woodbri@swoodbridge.com>
dbaston:Daniel Baston <dbaston@gmail.com>
bjornharrtell:Björn Harrtell <bjorn@wololo.org>
......@@ -18,7 +18,7 @@ set -e
#export SFCGAL_VER=1.0.4
#export PROJ_VER=4.8.0
export PROTOBUF_VER=3.2.0
export LIBXML_VER=2.7.8
if [[ "${GCC_TYPE}" == *gcc48* ]] ; then
......@@ -68,8 +68,14 @@ export GDAL_DATA="${PROJECTS}/gdal/rel-${GDAL_VER}w${OS_BUILD}${GCC_TYPE}/share/
#export PATH="${PATHOLD}:${PGPATH}/bin:${PGPATH}/lib"
export PATH="${PGPATH}/bin:${PGPATH}/lib:${MINGPROJECTS}/rel-libiconv-1.13.1w${OS_BUILD}${GCC_TYPE}/include:${MINGPROJECTS}/rel-libiconv-1.13.1w${OS_BUILD}${GCC_TYPE}/bin:${MINGPROJECTS}/gtkw${OS_BUILD}${GCC_TYPE}/bin:${MINGPROJECTS}/gtk/bin:${PROJECTS}/geos/rel-${GEOS_VER}w${OS_BUILD}${GCC_TYPE}/bin:${MINGPROJECTS}/xsltproc:${PATH}"
#add protobuf
export PATH="${PROJECTS}/protobuf/rel-${PROTOBUF_VER}w${OS_BUILD}${GCC_TYPE}/bin:${PROJECTS}/protobuf/rel-${PROTOBUF_VER}w${OS_BUILD}${GCC_TYPE}/lib:${PATH}"
echo PATH AFTER: $PATH
export PKG_CONFIG_PATH=${PROJECTS}/protobuf/rel-${PROTOBUF_VER}w${OS_BUILD}${GCC_TYPE}/lib/pkgconfig;
cd ${POSTGIS_SRC}
if [ -e ./GNUMakefile ]; then
make distclean
......@@ -91,13 +97,13 @@ fi
if [ -n "$SFCGAL_VER" ]; then
##hard code versions of cgal etc. for now
export CGAL_VER=4.2
export CGAL_VER=4.6.1
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" \
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 \
......@@ -107,7 +113,9 @@ LDFLAGS="-L${PGPATH}/lib -L${PROJECTS}/gdal/rel-${GDAL_VER}w${OS_BUILD}${GCC_TYP
--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-gui --with-gettext=no --with-sfcgal=${PROJECTS}/CGAL/rel-sfcgal-${SFCGAL_VER}w${OS_BUILD}${GCC_TYPE}/bin/sfcgal-config \
--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
CPPFLAGS="-I${PGPATH}/include -I${MINGPROJECTS}/rel-libiconv-1.13.1w${OS_BUILD}${GCC_TYPE}/include" \
......@@ -117,10 +125,11 @@ LDFLAGS="-L${PGPATH}/lib -L${PROJECTS}/gdal/rel-${GDAL_VER}w${OS_BUILD}${GCC_TYP
--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-gui --with-gettext=no \
--with-protobufdir=${PROJECTS}/protobuf/rel-${PROTOBUF_VER}w${OS_BUILD}${GCC_TYPE} \
--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-gui --with-gettext=no
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 \
......
......@@ -16,6 +16,9 @@
#export GCC_TYPE=
#export SFCGAL_VER=1.1.0
#export PCRE_VER
export PROTOBUF_VER=3.2.0
export PROTOBUFC_VER=1.2.1
if [[ "${GCC_TYPE}" == *gcc48* ]] ; then
export PROJECTS=/projects
export MINGPROJECTS=/projects
......@@ -91,12 +94,13 @@ cp ${MINGPROJECTS}/rel-libiconv-1.13.1w${OS_BUILD}/bin/*.dll $outdir/bin/postgi
# it seems 9.2 and 9.3 doesn't come with its own libiconv good grief
# and trying to use their libiconv2.dll makes shp2pgsql crash
if [[ "$PG_VER" == *9.2* || "$PG_VER" == *9.3* ]]; then
cp ${MINGPROJECTS}/rel-libiconv-1.13.1w${OS_BUILD}${GCC_TYPE}/bin/*.dll $outdir/bin
cp ${MINGPROJECTS}/rel-libiconv-1.13.1w${OS_BUILD}${GCC_TYPE}/bin/*.dll $outdir/bin
fi;
cp ${PGPATHEDB}/bin/libpq.dll $outdir/bin/postgisgui
#cp ${PGPATHEDB}/bin/libiconv2.dll $outdir/bin/postgisgui
cp ${PGPATHEDB}/bin/libpq.dll $outdir/bin/postgisgui
#cp ${PGPATHEDB}/bin/libiconv2.dll $outdir/bin/postgisgui
cp ${MINGPROJECTS}/rel-libiconv-1.13.1w${OS_BUILD}${GCC_TYPE}/bin/libicon*.dll $outdir/bin/postgisgui
cp ${PGPATHEDB}/bin/libintl.dll $outdir/bin/postgisgui
cp ${PGPATHEDB}/bin/libintl*.dll $outdir/bin/postgisgui
cp ${PGPATHEDB}/bin/ssleay32.dll $outdir/bin/postgisgui
cp ${PGPATHEDB}/bin/libeay32.dll $outdir/bin/postgisgui
......@@ -119,13 +123,16 @@ cp -p ${PROJECTS}/geos/rel-${GEOS_VER}w${OS_BUILD}${GCC_TYPE}/bin/*.dll $outdir/
cp ${MINGPROJECTS}/proj/rel-${PROJ_VER}w${OS_BUILD}${GCC_TYPE}/bin/*.dll $outdir/bin/postgisgui
cp -p ${PROJECTS}/geos/rel-${GEOS_VER}w${OS_BUILD}${GCC_TYPE}/bin/*.dll $outdir/bin/postgisgui
#for protobuf
cp ${PROJECTS}/protobuf/rel-${PROTOBUF_VER}w${OS_BUILD}${GCC_TYPE}/bin/libprotobuf-c-*.dll $outdir/bin
echo "POSTGIS: ${POSTGIS_MINOR_VER} r${POSTGIS_SVN_REVISION} http://postgis.net/source" > $verfile
if [ "$POSTGIS_MAJOR_VERSION" == "2" ] ; then
## only copy gdal components if 2+. 1.5 doesn't have raster support
cp -p ${PROJECTS}/gdal/rel-${GDAL_VER}w${OS_BUILD}${GCC_TYPE}/bin/*.dll $outdir/bin
cp -rp ${PROJECTS}/gdal/rel-${GDAL_VER}w${OS_BUILD}${GCC_TYPE}/share/gdal $outdir/gdal-data
if [ "$POSTGIS_MINOR_VERSION" > "0" ] ; then
## only copy pagc standardizer components for 2.1+
cp -p ${PROJECTS}/pcre/rel-${PCRE_VER}w${OS_BUILD}${GCC_TYPE}/bin/libpcre-1*.dll $outdir/bin
......@@ -145,12 +152,15 @@ if [ -n "$SFCGAL_VER" ]; then
echo "Boost VERSION: ${BOOST_VER} http://www.boost.org" >> $verfile
echo "GMP VERSION: ${GMP_VER} https://gmplib.org" >> $verfile
echo "MPFR VERSION: ${MPFR_VER} http://www.mpfr.org" >> $verfile
cp -p ${PROJECTS}/CGAL/rel-cgal-${CGAL_VER}w${OS_BUILD}${GCC_TYPE}/bin/*.dll $outdir/bin
cp -p ${PROJECTS}/CGAL/rel-sfcgal-${SFCGAL_VER}w${OS_BUILD}${GCC_TYPE}/lib/*.dll $outdir/bin
# cp -p ${PROJECTS}/CGAL/rel-cgal-${CGAL_VER}w${OS_BUILD}${GCC_TYPE}/bin/*.dll $outdir/bin/postgisgui
# cp -p ${PROJECTS}/CGAL/rel-sfcgal-${SFCGAL_VER}w${OS_BUILD}${GCC_TYPE}/lib/*.dll $outdir/bin/postgisgui
fi;
echo "PROTOBUF VERSION: ${PROTOBUF_VER} https://github.com/google/protobuf" >> $verfile
echo "PROTOBUF-C VERSION: ${PROTOBUFC_VER} https://github.com/protobuf-c/protobuf-c" >> $verfile
#cp ${MINGPROJECTS}/libxml/rel-libxml2-2.7.8w${OS_BUILD}/bin/*.dll $outdir/bin/
cp ${PGPATHEDB}/bin/libxml2-2.dll $outdir/bin/
......
......@@ -14,6 +14,7 @@ set -e
export PROJECTS=/projects
export MINGPROJECTS=/projects
export PATHOLD=$PATH
export PROTOBUF_VER=3.2.0
if [ "$OS_BUILD" == "64" ] ; then
......@@ -54,6 +55,11 @@ export RELVERDIR=postgis-pg${REL_PGVER}-binaries-${POSTGIS_MICRO_VER}w${OS_BUILD
export PATH="${PATHOLD}:${PGPATH}/bin:${PGPATH}/lib"
#PATH="${MINGPROJECTS}/gettext/rel-gettext-0.18.1/bin:${MINGPROJECTS}/xsltproc:${MINGPROJECTS}/gtk/bin:${PROJECTS}/geos/rel-${GEOS_VER}w${OS_BUILD}/bin:${PROJECTS}/gdal/rel-${GDAL_VER}w${OS_BUILD}/bin:${MINGPROJECTS}/rel-libiconv-1.13.1w${OS_BUILD}/include:${MINGPROJECTS}/rel-libiconv-1.13.1w${OS_BUILD}/bin:${MINGPROJECTS}/proj/rel-${PROJ_VER}w${OS_BUILD}/bin:${MINGPROJECTS}/libxml/rel-libxml2-${LIBXML_VER}w${OS_BUILD}/bin:${PATH}"
PATH="${MINGPROJECTS}/xsltproc:${MINGPROJECTS}/gtkw${OS_BUILD}${GCC_TYPE}/bin:${PROJECTS}/geos/rel-${GEOS_VER}w${OS_BUILD}${GCC_TYPE}/bin:${PROJECTS}/gdal/rel-${GDAL_VER}w${OS_BUILD}${GCC_TYPE}/bin:${MINGPROJECTS}/rel-libiconv-1.13.1w${OS_BUILD}${GCC_TYPE}/lib:${MINGPROJECTS}/rel-libiconv-1.13.1w${OS_BUILD}${GCC_TYPE}/include:${MINGPROJECTS}/rel-libiconv-1.13.1w${OS_BUILD}${GCC_TYPE}/bin:${MINGPROJECTS}/proj/rel-${PROJ_VER}w${OS_BUILD}${GCC_TYPE}/bin:${MINGPROJECTS}/libxml/rel-libxml2-${LIBXML_VER}w${OS_BUILD}${GCC_TYPE}/bin:${PATH}"
#add protobuf
export PATH="${PROJECTS}/protobuf/rel-${PROTOBUF_VER}w${OS_BUILD}${GCC_TYPE}/bin:${PROJECTS}/protobuf/rel-${PROTOBUF_VER}w${OS_BUILD}${GCC_TYPE}/lib:${PATH}"
export PKG_CONFIG_PATH=${PROJECTS}/protobuf/rel-${PROTOBUF_VER}w${OS_BUILD}${GCC_TYPE}/lib/pkgconfig;
echo PATH AFTER: $PATH
echo WORKSPACE IS $WORKSPACE
......@@ -81,15 +87,13 @@ fi
if [ -n "$SFCGAL_VER" ]; then
##hard code versions of cgal etc. for now
export CGAL_VER=4.6.1
BOOST_VER=1.59.0
export BOOST_VER_WU=1_59_0
export CGAL_VER=4.2
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}"
#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
#TODO: turn back on topology regression testing once topology issues resolved
CPPFLAGS="-I${PGPATH}/include -I${MINGPROJECTS}/rel-libiconv-1.13.1w${OS_BUILD}${GCC_TYPE}/include" \
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 \
......@@ -99,8 +103,11 @@ LDFLAGS="-L${PGPATH}/lib -L${PROJECTS}/gdal/rel-${GDAL_VER}w${OS_BUILD}${GCC_TYP
--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-gui --with-gettext=no --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
--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} \
--without-interrupt-tests
elif [ "$POSTGIS_MAJOR_VERSION" == "2" ] ; then
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 \
......@@ -109,10 +116,12 @@ LDFLAGS="-L${PGPATH}/lib -L${PROJECTS}/gdal/rel-${GDAL_VER}w${OS_BUILD}${GCC_TYP
--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-gui --with-gettext=no \
--with-protobufdir=${PROJECTS}/protobuf/rel-${PROTOBUF_VER}w${OS_BUILD}${GCC_TYPE} \
--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-gui --with-gettext=no
--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 \
......@@ -155,14 +164,14 @@ if [ "$MAKE_EXTENSION" == "1" ]; then
cp -r extensions/*/sql/* ${PGPATHEDB}/share/extension
cp -r extensions/*/*.control ${PGPATHEDB}/share/extension
cp -r extensions/*/*.dll ${PGPATHEDB}/lib
make check RUNTESTFLAGS="--extension -v"
##test address standardizer