Commit be3112b9 authored by Bas Couwenberg's avatar Bas Couwenberg

New upstream version 2.4.4+dfsg

parent 586ff739
# See http://readme.drone.io/0.5/usage/overview
# See https://git.osgeo.org/gogs/postgis/postgis-docker
test-image: &test-image docker.kbt.io/postgis/build-test:trisquel
# See https://git.osgeo.org/gitea/postgis/postgis-docker
test-image: &test-image docker.kbt.io/postgis/build-test:trisquel2
matrix:
PGVER:
- 9.3
- 9.4
- 9.5
- 9.6
- 10
pipeline:
clone:
......@@ -12,13 +20,15 @@ pipeline:
image: *test-image
pull: true
commands:
- service postgresql start $PGVER
- export PGPORT=`grep ^port /etc/postgresql/$PGVER/main/postgresql.conf | awk '{print $3}'`
- export PATH=/usr/lib/postgresql/$PGVER/bin:$PATH
- psql --version
- ./autogen.sh
- ./configure CFLAGS="-O0 -Wall" --without-interrupt-tests
- ./configure CFLAGS="-O0 -Wall -fno-omit-frame-pointer" --without-interrupt-tests
- make
check:
image: *test-image
commands:
- service postgresql start
# we should maybe wait for postgresql service to startup here...
- psql -c "select version()" template1
- make check RUNTESTFLAGS=-v
- make install
- utils/check_all_upgrades.sh
......
test:
script:
- apt-get update -qq && apt-get install -y
postgresql-9.4 postgresql-server-dev-9.4
postgresql-9.6 postgresql-server-dev-9.6
build-essential autoconf libtool libcunit1-dev
xsltproc docbook-xsl docbook-mathml dblatex
libproj-dev libgdal-dev libgeos-dev libjson0-dev
libproj-dev libgdal-dev libgeos-dev libjson-c-dev
- lsb_release -a
- uname -a
- service postgresql start
......
2018-03-28 08:53 Regina Obe <lr@pcorp.us>
* [r16504] NEWS, doc/reference_raster.xml,
raster/rt_pg/rtpg_mapalgebra.c, raster/test/regress/tickets.sql,
raster/test/regress/tickets_expected: Fix crasher in raster when
fed an empty raster (note was tempted to change the def of empty
raster to include raster with no bands but not sure where else
that is used, so just revised the clip check to not try to clip
if no bands).
References #3055 for PostGIS 2.4.4,
also minor doc fix references #2925 for PostGIS 2.4.4
2018-03-27 17:36 Darafei Praliaskouski <me@komzpa.net>
* [r16500] NEWS, liblwgeom/lwlinearreferencing.c: ST_CPAWithin
precision fix
Closes #4032
2018-03-25 03:33 Regina Obe <lr@pcorp.us>
* [r16498] NEWS, extensions/postgis_extension_helper.sql: upgrade
support for PostgreSQL 11
closes #4044 for PostGIS 2.4.4
2018-03-24 03:01 Regina Obe <lr@pcorp.us>
* [r16496] NEWS: change sorting of tickets to be nuermic by ticket
number. Add in missing tickets
2018-03-24 02:17 Regina Obe <lr@pcorp.us>
* [r16495] doc/installation.xml: note in docs about soft upgrade
that legacy.sql must be rerun for each minor.
Closes #2960 for PostGIS 2.4.4
2018-03-24 00:00 Daniel Baston <dbaston@gmail.com>
* [r16491] liblwgeom/lwgeom_geos_cluster.c, regress/tickets.sql,
regress/tickets_expected: Avoid dropping SRID in
ST_ClusterIntersecting
References #4055
2018-03-23 06:35 Regina Obe <lr@pcorp.us>
* [r16484] ci/winnie/build_postgis.sh,
ci/winnie/package_postgis.sh, ci/winnie/regress_postgis.sh:
change to use GDAL 2.2.4, 3.6.2 (for packaging) but keep 3.7.0dev
for regress testing
2018-03-23 00:09 Regina Obe <lr@pcorp.us>
* [r16482] NEWS, postgis/geography.sql.in: schema qualify geography
functions (including ST_Buffer)
References #4052 for PostGIS 2.4.4
2018-03-18 22:43 Regina Obe <lr@pcorp.us>
* [r16477] ci/debbie/postgis_release_docs.sh: Seems sometimes the
postgis_svn_revision.h gets wiped out, so end up with no svn
number.
Explicitly call svn_repo_revision.pl to ensure we have an svn
number to read
References #4047 for PostGIS 2.4
2018-03-18 09:10 Regina Obe <lr@pcorp.us>
* [r16474] ci/debbie/postgis_release_docs.sh: this for sure will
fix revision # this time I tested before hand
References #4047 for PostGIS 2.4
2018-03-18 05:16 Regina Obe <lr@pcorp.us>
* [r16472] ci/debbie/postgis_release_docs.sh: variable typo
References #4047 for PostGIS 2.4
2018-03-18 05:12 Regina Obe <lr@pcorp.us>
* [r16470] ci/debbie/postgis_release_docs.sh: Add logic to show git
log timestamp in UTC instead of Unix timestamp and put in svn
revision number
References #4047 for PostGIS 2.4
2018-02-26 20:04 Paul Ramsey <pramsey@cleverelephant.ca>
* [r16425] liblwgeom/lwin_wkt_lex.c: Update lexer generated file
References #4017
2018-02-26 20:03 Paul Ramsey <pramsey@cleverelephant.ca>
* [r16424] NEWS, liblwgeom/lwin_wkt_lex.l: Fix memory corruption in
case where lexer is interrupted mid-process
References #4017
For 2.4 branch
2018-02-26 18:25 Paul Ramsey <pramsey@cleverelephant.ca>
* [r16420] NEWS, liblwgeom/lwlinearreferencing.c: Use more precise
bounds when testing overlap of temporal ranges.
For 2.4, references #4025
2018-02-25 14:54 Sandro Santilli <strk@kbt.io>
* [r16417] NEWS, liblwgeom/lwin_geojson.c: Do not include private
header for json-c >= 0.13
Patch by Björn Esser
Closes #3942 for 2.4 branch
(also fixes NEWS section corrupted by recent commit)
2018-02-22 11:13 Darafei Praliaskouski <me@komzpa.net>
* [r16406] NEWS, postgis/lwgeom_box3d.c, regress/regress_expected,
regress/sfcgal/regress_expected: Fix cast from box3d to geometry
Patch by Matthias Bay
Closes https://github.com/postgis/postgis/pull/214
Closes #4020
2018-02-21 14:31 Sandro Santilli <strk@kbt.io>
* [r16401] .gitlab-ci.yml: [gitlab-ci] Switch to PostgreSQL 9.6 and
libjson-c-dev
Fixes gitlab-ci build for 2.4, references #4023
2018-02-21 09:05 Sandro Santilli <strk@kbt.io>
* [r16399] authors.git, authors.svn: Lowercase Algunenano
All LDAP account names are lowercase
2018-02-20 22:38 Regina Obe <lr@pcorp.us>
* [r16398] authors.git, authors.svn: Add Raúl Marín Rodríguez to
developers list
2018-02-20 22:35 Regina Obe <lr@pcorp.us>
* [r16397] ci/winnie/build_postgis.sh,
ci/winnie/package_postgis.sh, ci/winnie/regress_postgis.sh:
backport regress changes from 2.5
2018-01-26 14:55 Paul Ramsey <pramsey@cleverelephant.ca>
* [r16362] NEWS, liblwgeom/lwpoly.c: lwpoly_construct_circle: Avoid
division by zero (Raúl Marín Rodríguez)
References #4003
2018-01-26 12:47 Paul Ramsey <pramsey@cleverelephant.ca>
* [r16361] NEWS, postgis/geography_btree.c: Avoid memory exhaustion
when building a btree index (references #4004)
From Edmund Horner
2018-01-22 14:15 Sandro Santilli <strk@kbt.io>
* [r16358] NEWS, postgis/geography.sql.in: Set availability of
support function for KNN index
Fixes upgrade from 2.1 to 2.2+
Closes #3978 in 2.4 branch (2.4.4)
2018-01-22 12:35 Sandro Santilli <strk@kbt.io>
* [r16353] .drone.yml: [drone] Use trisquel2 image, test all pgsql
versions and upgrades
The new docker image also uses newer GEOS (3.6.2).
References #3813 for 2.4 branch
NOTE: could not use -Werror in this branch as it would fail
2018-01-22 11:30 Sandro Santilli <strk@kbt.io>
* [r16350] regress/run_test.pl: backport run_test.pl fixes from
trunk
2018-01-21 07:12 Regina Obe <lr@pcorp.us>
* [r16347] ci/winnie/build_postgis.sh,
ci/winnie/package_postgis.sh, ci/winnie/regress_postgis.sh:
change scripts back to versions of things to compile against
(GDAL, PROJ, SCGAL, GEOS) being set at job level until we have
the stop and start postgres in repo as well.
2018-01-20 12:58 Sandro Santilli <strk@kbt.io>
* [r16346] ci/debbie/postgis_regress.sh: Have Debbie test all
available upgrades
References #2676 for 2.4 branch
2018-01-18 21:46 Sandro Santilli <strk@kbt.io>
* [r16336] macros/pkg.m4: Forgot to add pkg.m4 macro in r16324
See #3992
2018-01-17 23:23 Regina Obe <lr@pcorp.us>
* [r16328] NEWS: Move PgSQL 11 support note to 2.4.4
It was put in after 2.4.3 was already tagged and tarred.
2018-01-16 20:54 Sandro Santilli <strk@kbt.io>
* [r16325] NEWS, configure.ac: Use PKG_PROG_PKG_CONFIG macro from
pkg.m4 to detect pkg-config
Patch by Bas Couwenberg
Closes #3992 in 2.4 branch (for 2.4.4)
2018-01-16 14:47 Paul Ramsey <pramsey@cleverelephant.ca>
* [r16321] NEWS: Updates news re pg11 support
2018-01-16 14:46 Paul Ramsey <pramsey@cleverelephant.ca>
* [r16320] libpgcommon/lwgeom_pg.h, libpgcommon/lwgeom_transform.c,
postgis/lwgeom_geos_prepared.c: Backport support for Pg11 to 2.4
branch. Closes #3946
2018-01-16 07:06 Regina Obe <lr@pcorp.us>
* [r16315] Version.config, ci/debbie/postgis_doc_translations.sh,
ci/debbie/postgis_make_dist.sh,
ci/debbie/postgis_release_docs.sh,
extensions/upgradeable_versions.mk: flip version to 2.4.4dev, add
2.4.3 to upgrade versions
add timestamp to dev docs
closes #3991 for PostGIS 2.4.4dev
2018-01-15 21:38 Regina Obe <lr@pcorp.us>
* [r16305] ci/debbie/postgis_release_docs.sh: Get rid of SVN number
and revise to not build local html except for trunk
2018-01-15 20:47 Regina Obe <lr@pcorp.us>
* [r16301] HOWTO_RELEASE, Version.config: more clearifying notes on
HOWTO_RELEASE
change version to 2.4.3 in prep for tagging tomorrow or
Wednesday.
2018-01-15 00:50 Regina Obe <lr@pcorp.us>
* [r16299] ChangeLog, Version.config,
ci/debbie/postgis_make_dist.sh: update ChangeLog
flip Version.config to rc2
revise make dist to output branch reading from
2018-01-15 00:24 Regina Obe <lr@pcorp.us>
* [r16298] NEWS, configure.ac, doc/release_notes.xml:
PostGIS 2.4.4
2018/04/08
* Bug fixes *
- #3055, [raster] ST_Clip() on a raster without band crashes the server
(Regina Obe)
- #3942, geojson: Do not include private header for json-c >= 0.13
(Björn Esser)
- #3952, ST_Transform fails in parallel mode (Paul Ramsey)
- #3978, Fix KNN when upgrading from 2.1 or older (Sandro Santilli)
- #4003, lwpoly_construct_circle: Avoid division by zero (Raúl Marín Rodríguez)
- #4004, Avoid memory exhaustion when building a btree index (Edmund Horner)
- #4016, proj 5.0.0 support (Raúl Marín Rodríguez)
- #4017, lwgeom lexer memory corruption (Peter E)
- #4020, Casting from box3d to geometry now returns correctly connected
PolyhedralSurface (Matthias Bay)
- #4025, #4032 Incorrect answers for temporally "almost overlapping" ranges
(Paul Ramsey, Darafei Praliaskouski)
- #4052, schema qualify several functions in geography (Regina Obe)
- #4055, ST_ClusterIntersecting drops SRID (Daniel Baston)
* Enhancements *
- #3946, Compile support for PgSQL 11 (Paul Ramsey)
- #3992, Use PKG_PROG_PKG_CONFIG macro from pkg.m4 to detect pkg-config
(Bas Couwenberg)
- #4044, Upgrade support for PgSQL 11 (Regina Obe)
PostGIS 2.4.3
2018/01/17
......
PostGIS - Geographic Information Systems Extensions to PostgreSQL
=================================================================
:Version: 2.4.3dev
:Date: 2017-xx-xx
:Version: 2.4.4
:Date: 2017-04-08
:Website: http://postgis.net
This distribution contains a module which implements GIS simple features, ties
......@@ -202,7 +202,7 @@ UPGRADING EXISTING SPATIAL DATABASES
Upgrade PostGIS using the "ALTER EXTENSION" facility.
ALTER EXTENSION postgis UPDATE TO '2.2.0';
ALTER EXTENSION postgis UPDATE;
USAGE
......
......@@ -5,7 +5,7 @@
POSTGIS_MAJOR_VERSION=2
POSTGIS_MINOR_VERSION=4
POSTGIS_MICRO_VERSION=3
POSTGIS_MICRO_VERSION=4
# Liblwgeom interface versioning, reset to 0:0:0 (cur:age:rev)
# when changing POSTGIS_MINOR_VERSION
......
This diff is collapsed.
algunenano = Raúl Marín Rodríguez <rmrodriguez@carto.com>
benjubb = Ben Jubb <benjubb@refractions.net>
bergun = Baris Ergun <barisergun75@gmail.com>
bjornharrtell = Björn Harrtell <bjorn@wololo.org>
......
algunenano:Raúl Marín Rodríguez <rmrodriguez@carto.com>
benjubb:Ben Jubb <benjubb@refractions.net>
bergun:Baris Ergun <barisergun75@gmail.com>
bjornharrtell:Björn Harrtell <bjorn@wololo.org>
......
This diff is collapsed.
This diff is collapsed.
......@@ -49,10 +49,10 @@ make check-localized
#make pdf
rm -rf images
mkdir images
cp html/images/* images
cp html/images/* images
#make epub
#make -e chunked-html 2>&1 | tee -a doc-errors.log
#make update-po
#make update-po #we only do this for trunk, cause transifex only follows trunk
make html-localized
# make -C po/es/ local-html
# make -C po/fr/ local-html
......
#!/bin/bash
set -e
## begin variables passed in by jenkins
# export reference=$reference
export PG_VER=9.6
# export PGPORT=8442
export OS_BUILD=64
# export POSTGIS_MAJOR_VERSION=2
# export POSTGIS_MINOR_VERSION=2
# export POSTGIS_MICRO_VERSION=0dev
export PROJECTS=/var/lib/jenkins/workspace
export GEOS_VER=3.6
export GDAL_VER=2.2
......@@ -12,7 +15,6 @@ export WEB_DIR=/var/www/postgis_stuff
export PATH="${PGPATH}/bin:$PATH"
export LD_LIBRARY_PATH="${PROJECTS}/gdal/rel-${GDAL_VER}w${OS_BUILD}/lib:${PROJECTS}/geos/rel-${GEOS_VER}w${OS_BUILD}/lib:${PGPATH}/lib"
echo "Reference Branch: $reference"
POSTGIS_MAJOR_VERSION=`grep ^POSTGIS_MAJOR_VERSION Version.config | cut -d= -f2`
POSTGIS_MINOR_VERSION=`grep ^POSTGIS_MINOR_VERSION Version.config | cut -d= -f2`
POSTGIS_MICRO_VERSION=`grep ^POSTGIS_MICRO_VERSION Version.config | cut -d= -f2`
......@@ -30,4 +32,4 @@ export package=${newoutdir}.tar.gz
echo "The package name is $package"
cp $package $WEB_DIR
sh ci/debbie/postgis_release_docs.sh
bash ci/debbie/postgis_release_docs.sh
......@@ -67,10 +67,10 @@ if [ "$?" != "0" ]; then
fi
make check RUNTESTFLAGS=-v
make install
if [ "$MAKE_EXTENSION" = "1" ]; then
echo "Running extension testing"
make install
make check RUNTESTFLAGS=--extension
if [ "$?" != "0" ]; then
exit $?
......@@ -79,7 +79,6 @@ fi
if [ "$DUMP_RESTORE" = "1" ]; then
echo "Dum restore test"
make install
make check RUNTESTFLAGS="-v --dumprestore"
if [ "$?" != "0" ]; then
exit $?
......@@ -89,4 +88,15 @@ fi
if [ "$MAKE_GARDEN" = "1" ]; then
echo "Running garden test"
make garden
if [ "$?" != "0" ]; then
exit $?
fi
fi
# Test all available upgrades
# TODO: protect via some variable ?
utils/check_all_upgrades.sh \
`grep '^POSTGIS_' Version.config | cut -d= -f2 | paste -sd '.'`
if [ "$?" != "0" ]; then
exit $?
fi
......@@ -22,7 +22,7 @@ POSTGIS_MICRO_VERSION=`grep ^POSTGIS_MICRO_VERSION Version.config | cut -d= -f2`
chmod -R 755 /var/www/postgis_docs/manual-${POSTGIS_MAJOR_VERSION}.${POSTGIS_MINOR_VERSION}
echo $PATH
sh autogen.sh
#sh autogen.sh
if [ -f GNUMakefile ]; then
make distclean
......@@ -37,12 +37,32 @@ LDFLAGS="-L${PGPATH}/lib" ./configure \
--with-geosconfig=${PROJECTS}/geos/rel-${GEOS_VER}w${OS_BUILD}/bin/geos-config \
--without-raster
make clean
# generating postgis_svn_revision.h in case hasn't been generated
if test -f utils/svn_repo_revision.pl; then
echo "Generating postgis_svn_revision.h"
perl utils/svn_repo_revision.pl
fi
export VREV="`cat postgis_svn_revision.h | awk '{print $3}'`"
echo "SVN is ${VREV}"
cd doc
#mv postgis.xml postgis.xml.orig
#sed -e "s:</title>:</title><subtitle><subscript>SVN Revision (<emphasis>${POSTGIS_SVN_REVISION}</emphasis>)</subscript></subtitle>:" postgis.xml.orig > postgis.xml
echo "Micro: $POSTGIS_MICRO_VERSION"
cp postgis.xml postgis.xml.orig #we for dev will inject stuff into file, so backup original
#inject a development time stamp if we are in development branch
if [[ "$POSTGIS_MICRO_VERSION" == *"dev"* ]]; then
export GIT_TIMESTAMP=`git log -1 --pretty=format:%ct`
export GIT_TIMESTAMP="`date -d @$GIT_TIMESTAMP`" #convert to UTC date
echo "GIT_TIMESTAMP: ${GIT_TIMESTAMP}"
export part_old="</title>"
export part_new="</title><subtitle><subscript>DEV (<emphasis>$GIT_TIMESTAMP rev. $VREV </emphasis>)</subscript></subtitle>"
sed -i 's,'"$part_old"','"$part_new"',' postgis.xml
fi
make pdf
rm -rf images
mkdir images
......@@ -50,24 +70,24 @@ cp html/images/* images
make epub
make -e chunked-html 2>&1 | tee -a doc-errors.log
if [[ "$reference" == *trunk* ]] ; then #only do this for trunk because only trunk follows transifex
make update-po
make -C po/it_IT/ local-html
if [[ "$reference" == *"trunk"* ]]; then #only do this for trunk because only trunk follows transifex
#make update-po
#make -C po/it_IT/ local-html
make -C po/pt_BR/ local-html
make -C po/ja/ local-html
#make -C po/ja/ local-html
make -C po/de/ local-html
make -C po/pt_BR/ local-html
make -C po/ko_KR/ local-html
#make -C po/ko_KR/ local-html
#make pdf-localized
fi;
fi
package="doc-html-${POSTGIS_MAJOR_VERSION}.${POSTGIS_MINOR_VERSION}.${POSTGIS_MICRO_VERSION}.tar.gz"
export outdir=html
tar -czf "$package" --exclude='.svn' --exclude='.git' --exclude='image_src' "$outdir"
#mv postgis.xml.orig postgis.xml
cp postgis.xml.orig postgis.xml
mkdir -p /var/www/postgis_docs/manual-${POSTGIS_MAJOR_VERSION}.${POSTGIS_MINOR_VERSION}
mkdir -p /var/www/postgis_docs/manual-${POSTGIS_MAJOR_VERSION}.${POSTGIS_MINOR_VERSION}/images
cp -R html/*.* /var/www/postgis_docs/manual-${POSTGIS_MAJOR_VERSION}.${POSTGIS_MINOR_VERSION}
......@@ -76,3 +96,9 @@ chmod -R 755 /var/www/postgis_docs/manual-${POSTGIS_MAJOR_VERSION}.${POSTGIS_MIN
cp -R *.pdf /var/www/postgis_stuff/
cp -R *.epub /var/www/postgis_stuff/
cp -R $package /var/www/postgis_stuff/
if [[ "$POSTGIS_MICRO_VERSION" == *"dev"* ]]; then #rename the files without the micro if it's a development branch
mv /var/www/postgis_stuff/doc-html-${POSTGIS_MAJOR_VERSION}.${POSTGIS_MINOR_VERSION}.${POSTGIS_MICRO_VERSION}.tar.gz /var/www/postgis_stuff/doc-html-${POSTGIS_MAJOR_VERSION}.${POSTGIS_MINOR_VERSION}.tar.gz
mv /var/www/postgis_stuff/postgis-${POSTGIS_MAJOR_VERSION}.${POSTGIS_MINOR_VERSION}.${POSTGIS_MICRO_VERSION}.pdf /var/www/postgis_stuff/postgis-${POSTGIS_MAJOR_VERSION}.${POSTGIS_MINOR_VERSION}.pdf
mv /var/www/postgis_stuff/postgis-${POSTGIS_MAJOR_VERSION}.${POSTGIS_MINOR_VERSION}.${POSTGIS_MICRO_VERSION}.epub /var/www/postgis_stuff/postgis-${POSTGIS_MAJOR_VERSION}.${POSTGIS_MINOR_VERSION}.epub
fi
......@@ -6,17 +6,23 @@ set -e
#export PG_VER=9.2beta2
#export PGHOST=localhost
#export PGPORT=8442
#export PGUSER=postgres
#POSTGIS_SVN_REVISION=passed_in_by_buildbot
export GEOS_VER=3.7.0dev
export GDAL_VER=2.2.2
#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.6.2
export GDAL_VER=2.2.4
export PROJ_VER=4.9.3
export SFCGAL_VER=1.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
if [[ "${GCC_TYPE}" == *gcc48* ]] ; then
......@@ -44,12 +50,14 @@ export PGWINVER=${PG_VER}edb
echo PATH BEFORE: $PATH
export PGPATH=${PROJECTS}/postgresql/rel/pg${PG_VER}w${OS_BUILD}${GCC_TYPE}
#export PROJSO=libproj-0.dll
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 @@ export PATH="${PROJECTS}/protobuf/rel-${PROTOBUF_VER}w${OS_BUILD}${GCC_TYPE}/bin
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,14 +102,13 @@ if [ -n "$PCRE_VER" ]; then
fi
if [ -n "$SFCGAL_VER" ]; then
##hard code versions of cgal etc. for now
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" \
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 @@ LDFLAGS="-L${PGPATH}/lib -L${PROJECTS}/gdal/rel-${GDAL_VER}w${OS_BUILD}${GCC_TYP
--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 @@ 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 \
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
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
--without-interrupt-tests \
--prefix=${PROJECTS}/postgis/liblwgeom-${POSTGIS_VER}w${OS_BUILD}${GCC_TYPE}
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
......@@ -9,18 +9,18 @@
#POSTGIS_MAJOR_VERSION=2
#POSTGIS_MINOR_VERSION=1
#POSTGIS_MICRO_VERSION=0dev
#export OS_BUILD=32
#export GCC_TYPE=
export SFCGAL_VER=1.3.2
export GEOS_VER=3.6.2
export GDAL_VER=2.2.2
export GDAL_VER=2.2.4
export PROJ_VER=4.9.3
export SFCGAL_VER=1.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
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 @@ export POSTGIS_MICRO_VER=${POSTGIS_MICRO_VERSION}
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 @@ fi;
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/topology_upgrade_*.sql ${RELDIR}/${RELVERDIR}/share/contrib/postgis-
#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
......
#!/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 SFCGAL_VER=1.3.2
export GEOS_VER=3.7.0dev
export GDAL_VER=2.2.2