Commit 03f3118a authored by Bas Couwenberg's avatar Bas Couwenberg

Imported Upstream version 2.3.0

parent 250e5958
# default build directory
build
src/turnRestricted
fix_typos
.DS_Store
.vagrant
issues
tools/vagrant/packaging.sh
*.mo
.directory
......
......@@ -7,10 +7,10 @@
#choose precise or trusty
group: edge
3dist: trusty
#group: edge
#dist: trusty
#dist: precise
dist: precise
sudo: required
......@@ -27,6 +27,7 @@ branches:
only:
- master
- develop
- release/2.3.0
env:
- POSTGRESQL_VERSION=9.1
......@@ -34,9 +35,10 @@ env:
- POSTGRESQL_VERSION=9.3
- POSTGRESQL_VERSION=9.4
- POSTGRESQL_VERSION=9.5
#- POSTGRESQL_VERSION=9.6
# excecuted. So things have to be tested oe by one.
# executed. So things have to be tested oe by one.
addons:
apt:
sources:
......@@ -53,24 +55,36 @@ addons:
- libcgal-dev
- postgresql-server-dev-all
- postgresql-common
- python-sphinx
install:
- sudo /etc/init.d/postgresql stop
- sudo /etc/init.d/postgresql stop
- sudo ./tools/travis/install-postgres9.5.sh $POSTGRESQL_VERSION postgres
#- sudo ./tools/travis/install-postgres9.6.sh $POSTGRESQL_VERSION postgres
before_script:
## Install doxygen
#- sudo add-apt-repository ppa:libreoffice/libreoffice-4-4 -y && sudo apt-get -qq update &&
# sudo apt-get --no-install-suggests --no-install-recommends -qq install doxygen &&
# doxygen --version ;
# Add our chosen PG version to the path
- export PATH=/usr/lib/postgresql/$POSTGRESQL_VERSION/bin:$PATH
# Stop whichever version of PG that travis started
- sudo /etc/init.d/postgresql stop
# Start the version of PG that we want to test
- sudo /etc/init.d/postgresql start $POSTGRESQL_VERSION
# Install pgtap and pg_prove
# pgtap has to be installed after postgres has started
- ./tools/travis/install_pgtap.sh $POSTGRESQL_VERSION
- sudo apt-get install -y libtap-parser-sourcehandler-pgtap-perl
# initialize databases
- createdb -U postgres ___pgr___test___
- createdb -U postgres pgr_test__db__test
......@@ -78,12 +92,15 @@ before_script:
script:
- ./tools/travis/pgrouting_build.sh $POSTGRESQL_VERSION $POSTGIS_VERSION
# tests as part of script so if a test fails the build fails
- ./tools/travis/pgrouting_test.sh $POSTGRESQL_VERSION postgres
- ./tools/testers/pg_prove_tests.sh postgres
after_script:
# nothing
# blank
#after_success:
#- ./tools/travis/pgrouting_deploy.sh $POSTGRESQL_VERSION $POSTGIS_VERSION
- make doc
# - doxygen -v
- make doxy
This diff is collapsed.
hanges for 2.2.4
Changes for 2.3.0
-------------------------------------------------------------------------------
- New Signatures:
* pgr_TSP
* pgr_aStar
* New Functions:
* pgr_eucledianTSP
* New Proposed functions
* pgr_dijkstraCostMatrix
* pgr_withPointsCostMatrix
* pgr_maxFlowPushRelabel
* pgr_maxFlowEdmondsKarp
* pgr_maxFlowBoykovKolmogorov
* pgr_maximumCardinalityMatching
* pgr_edgeDisjointPaths
* pgr_contractGraph
* Deprecated Signatures
* pgr_tsp - use pgr_TSP or pgr_eucledianTSP instead
* pgr_astar - use pgr_aStar instead
* Deprecated functions
* pgr_flip_edges
* pgr_vidsToDmatrix
* pgr_pointsToDMatrix
* pgr_textToPoints
Changes for 2.2.4
-------------------------------------------------------------------------------
- Bogus uses of extern "C"
......@@ -12,7 +50,6 @@ Changes for 2.2.3
- Fixed compatibility issues with PostgreSQL 9.6.
Changes for 2.2.2
-------------------------------------------------------------------------------
......@@ -27,31 +64,31 @@ Changes for 2.2.1
Changes for 2.2.0
-------------------------------------------------------------------------------
- Improved:
- pgr_nodeNetwork
- Adding a row_where and outall optional parameters
- Improved:
- pgr_nodeNetwork
- Adding a row_where and outall optional parameters
- Signature fix
- pgr_dijkstra -- to match what was documented (the pgr_dijkstra from V2.0)
- Signature fix
- pgr_dijkstra -- to match what was documented (the pgr_dijkstra from V2.0)
- New functions
- pgr_floydWarshall
- pgr_Johnson
- pgr_DijkstraCost
- New functions
- pgr_floydWarshall
- pgr_Johnson
- pgr_DijkstraCost
- New Proposed functions
- pgr_withPoints
- pgr_withPointsCost
- pgr_withPointsDD
- pgr_withPointsKSP
- pgr_dijkstraVia
- New Proposed functions
- pgr_withPoints
- pgr_withPointsCost
- pgr_withPointsDD
- pgr_withPointsKSP
- pgr_dijkstraVia
- Deprecated functions:
- pgr_apspWarshall use pgr_floydWarshall instead
- pgr_apspJohnson use pgr_Johnson instead
- pgr_kDijkstraCost use pgr_dijkstraCost instead
- pgr_kDijkstraPath use pgr_dijkstra instead
- Deprecated functions:
- pgr_apspWarshall use pgr_floydWarshall instead
- pgr_apspJohnson use pgr_Johnson instead
- pgr_kDijkstraCost use pgr_dijkstraCost instead
- pgr_kDijkstraPath use pgr_dijkstra instead
......@@ -69,7 +106,7 @@ Changes for 2.1.0
- allow any-integer in the id's
- allow any-numerical on the cost/reverse_cost columns
- Three Functions where completly re-factored using the developers library and functionality was added.
- Three Functions where completely re-factored using the developers library and functionality was added.
- pgr_dijkstra
- pgr_ksp
......@@ -83,7 +120,7 @@ Changes for 2.1.0
- The library has a the prefix 2-1-0
- Added proposed functions to be evaluated:
- Proposed functions from Steve Woodbridge, (Classified as Convinience by the author.)
- Proposed functions from Steve Woodbridge, (Classified as Convenience by the author.)
- pgr_pointToEdgeNode - convert a point geometry to a vertex_id based on closest edge.
- pgr_flipEdges - flip the edges in an array of geometries so the connect end to end.
- pgr_textToPoints - convert a string of x,y;x,y;... locations into point geometries.
......
......@@ -6,9 +6,11 @@
### Branches
The *master* branch reflects the current 2.2.4 release.
The *develop* branch reflects the 2.3.0-dev
* The *master* branch has the latest minor release. (2.3.0)
* The *develop* branch has the next minor release. (2.4.0)
For the complete list of releases go to:
https://github.com/pgRouting/pgrouting/releases
## LINKS
......@@ -20,26 +22,43 @@ The *develop* branch reflects the 2.3.0-dev
<table>
<tr>
<td>Branch</td>
<td>Status</td>
<td>Comment</td>
<td>Travis</td>
<td>Appveyor</td>
<td>Jenkins</td>
<td>Comments</td>
</tr>
<tr>
<td>master</td>
<td><img src="https://travis-ci.org/pgRouting/pgrouting.png?branch=master" alt="Build Status"/></td>
<td><img src="https://ci.appveyor.com/api/projects/status/github/pgRouting/pgrouting?branch=master&svg=true" alt="Appveyor Status"/></td>
<td><img src="http://winnie.postgis.net:1500/buildStatus/icon?job=pgRouting_matrix_master" alt="Jenkins Status"/></td>
<td></td>
</tr>
<tr>
<td>develop</td>
<td><img src="https://travis-ci.org/pgRouting/pgrouting.png?branch=develop" alt="Build Status"/></td>
<td><img src="https://ci.appveyor.com/api/projects/status/github/pgRouting/pgrouting?branch=develop&svg=true" alt="Appveyor Status"/></td>
<td><img src="http://winnie.postgis.net:1500/buildStatus/icon?job=pgRouting_matrix_branch_develop" alt="Jenkins Status"/></td>
<td></td>
</tr>
<tr>
<td>gh-pages</td>
<td><img src="https://travis-ci.org/pgRouting/pgrouting.png?branch=gh-pages" alt="Build Status"/></td>
<td></td>
<td></td>
<td>not enabled</td>
</tr>
</table>
* travis: Postgis 2.2 for Postgres 9.1, 9.2, 9.3, 9.4, 9.5
* precise
* jenkins: g++ 4.8 on 32 & 64 bits for Postgis 2.3.0dev and Postgres 9.4, 9.5, 9.6
* appveyor: vs1013 Postgis 2.2 Postgres 9.4
## INTRODUCTION
pgRouting extends the PostGIS/PostgreSQL geospatial database to provide geospatial routing and other network analysis functionality.
......@@ -58,7 +77,7 @@ This library contains following features:
* Traveling Sales Person
* Turn Restriction Shortest Path (TRSP)
Additionaly, ready for testing and to be part of 2.3 official version:
Additionally, ready for testing and to be part of 2.3 official version:
* Shortest Path Dijkstra With Points Family of functions
* Shortest Path Dijkstra Cost With Points Family of functions
......@@ -73,21 +92,23 @@ Family of functions include:
* many to one
* many to many
## REQUIREMENTS
* C and C++ compilers
* g++ >= 4.6
* Postgresql version >= 9.1
* PostGIS version >= 2.0
* The Boost Graph Library (BGL).
* Version >= 1.46
* Version >= 1.55 for linux
* Version >= 1.58 for MAC
* CMake >= 2.8.8
* CGAL >= 4.4
* Sphinx >= 1.2
## INSTALLATION
See online documentation: http://docs.pgrouting.org/latest/en/doc/src/installation/installation.html
See online documentation: http://docs.pgrouting.org/
## COMPILATION
......@@ -121,11 +142,13 @@ Postgresql 9.1+
## USAGE
See online documentation: http://docs.pgrouting.org/latest/en/doc/index.html
See online documentation: http://docs.pgrouting.org/2.3/en/doc/index.html
## LICENSE
* Most features are available under GPLv2.
* Some Boost extensions are available under Boost license (see LICENSE_1_0.txt)
* Some code contributed by iMaptools.com is available under MIT-X license.
pgrouting-2.2.4-2524-3d5c321 master
pgrouting-2.3.0-3977-8c86efd master
......@@ -5,72 +5,56 @@
# Main configuration
# ------------------------------------------------------------------------------
notifications:
email:
on_failure: vicky_vergara@hotmail.com
version: 2.3.{build}
branches:
only:
- master
- develop
- dev-2.2
services:
- postgresql
environment:
POSTGRESQL_VERSION: 9.4
# excecuted. So things have to be tested oe by one.
#addons:
# apt:
# sources:
# For gcc >= 4.8
# - ubuntu-toolchain-r-test
# For cmake >= 2.8.8 (for CMakePackageConfigHelpers)
#- kubuntu-backports
# - boost-latest
# packages:
#- cmake
# - libboost-thread-dev
#- libboost-graph-dev
#- libcgal-dev
#- postgresql-server-dev-all
#- postgresql-common
image: Visual Studio 2013
configuration: Release
platform: x64
clone_depth: 1
clone_folder: c:\build\pgrouting
#- export PATH=/usr/lib/postgresql/$POSTGRESQL_VERSION/bin:$PATH # Add our chosen PG version to the path
#- sudo /etc/init.d/postgresql stop # Stop whichever version of PG that travis started
#- sudo apt-get install -y postgresql-9.5
#- sudo apt-get install -y postgresql-9.5-postgis
#- sudo /etc/init.d/postgresql stop # Stop whichever version of PG that travis started
#- sudo /etc/init.d/postgresql start $POSTGRESQL_VERSION # Start the version of PG that we want to test
#before_script:
# - ./tools/travis/install_pgtap.sh $POSTGRESQL_VERSION # pgtap has to be installed after postgres has started
#- sudo apt-get install -y libtap-parser-sourcehandler-pgtap-perl
#- createdb ___pgr___test___
#- createdb pgr_test__db__test
#- ./tools/travis/check-extensions.sh $POSTGRESQL_VERSION ___pgr___test___
cache:
- downloads -> appveyor.yml
- c:\build\local\msvc120\x64 -> appveyor
services:
- postgresql94
#before_install:
#before_script:
#script:
#- ./tools/travis/pgrouting_build.sh $POSTGRESQL_VERSION $POSTGIS_VERSION
#- ./tools/travis/pgrouting_test.sh $POSTGRESQL_VERSION
#after_script:
#- ./tools/travis/pg_prove_tests.sh postgres
#after_success:
environment:
CONFIGURATION: Release
MSVC_VER: 12.0
BUILD_ROOT_DIR: c:\build
init:
- git config --global core.autocrlf false
install:
# Install pgRouting prerequisites:
# cmake
# postGIS
# CGAL
- call ci\appveyor\install.bat
build_script:
- cd c:\build\pgrouting\ci\appveyor
- msbuild_pgrouting.bat 9.4
- cd %PGROUTING_BUILD_DIR%
- msbuild PGROUTING.sln /target:Build /property:Configuration=%CONFIGURATION%
- msbuild INSTALL.vcxproj /target:Build /property:Configuration=%CONFIGURATION%
- copy c:\build\gmp\x64\lib\*.dll C:\Progra~1\PostgreSQL\9.4\bin\
test_script:
- set PGUSER=postgres
- set PGPASSWORD=Password12!
- set PGHOME=C:\Progra~1\PostgreSQL\9.4