[pgrouting] 01/05: New upstream version 2.4.2
Bas Couwenberg
sebastic at debian.org
Wed Aug 16 16:35:47 UTC 2017
This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch master
in repository pgrouting.
commit ee72c29fed8b5d4fff5ea43938f3e9b785543b0f
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Wed Aug 16 18:14:57 2017 +0200
New upstream version 2.4.2
---
.travis.yml | 36 +-
CMakeLists.txt | 9 +-
CODE_OF_CONDUCT.md | 72 +++
COPYING => LICENSE | 0
NEWS | 497 ++++++++++++++-------
README.md | 15 +-
VERSION | 2 +-
appveyor.yml | 10 +-
ci/appveyor/install.bat | 36 +-
doc/src/pgRouting-installation.rst | 4 +-
doc/src/release_notes.rst | 48 +-
doc/test/utilities-any.result | 2 +-
src/alpha_shape/src/alpha.c | 4 +
src/common/sql/createIndex.sql | 2 +-
src/common/src/pgr_assert.cpp | 4 +-
src/ksp/doc/pgr_KSP.rst | 2 +-
src/topology/test/issue900.result | 9 +
src/topology/test/issue900.test.sql | 5 +
src/topology/test/test.conf | 1 +
.../{pgrouting--2.4.1.sig => pgrouting--2.4.2.sig} | 2 +-
tools/release-scripts/check-release.sh | 11 +-
tools/release-scripts/compile-release.sh | 2 +-
tools/release-scripts/notes2news.pl | 41 ++
tools/{curr-sig => sigs}/pgrouting--2.4.1.sig | 0
tools/testers/update-tester.sh | 5 +-
tools/winnie/build_pgrouting.sh | 128 +++++-
26 files changed, 667 insertions(+), 280 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index 59e5fe1..5b553ee 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,12 +5,11 @@
# Main configuration
# ------------------------------------------------------------------------------
-#choose precise or trusty
+#choose trusty
-#group: edge
-#dist: trusty
-
-#dist: precise
+group: edge
+dist: trusty
+sudo: required
language: cpp
@@ -18,34 +17,15 @@ language: cpp
compiler:
- gcc
-
env: POSTGRESQL_VERSION=9.6 PG_USER=postgres
-
+
matrix:
include:
- os: linux
- sudo: required
- dist: precise
- env: POSTGRESQL_VERSION=9.5 PG_USER=postgres
-
-
- - os: linux
- sudo: required
- dist: precise
- env: POSTGRESQL_VERSION=9.4 PG_USER=postgres
-
-
- - os: linux
- sudo: required
- dist: trusty
- group: edge
env: POSTGRESQL_VERSION=9.6 PG_USER=postgres
- os: linux
- sudo: required
- dist: trusty
- group: edge
env: POSTGRESQL_VERSION=9.5 PG_USER=postgres
@@ -82,6 +62,7 @@ install:
before_script:
# Add our chosen PG version to the path
+ - psql -U postgres -c "create extension postgis"
- export PATH=/usr/lib/postgresql/$POSTGRESQL_VERSION/bin:$PATH
# initialize databases
@@ -93,11 +74,10 @@ 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 $PG_USER
- ./tools/testers/pg_prove_tests.sh $PG_USER DEBUG
-#after_script:
- # blank
+after_script:
+ - ./tools/travis/pgrouting_test.sh $POSTGRESQL_VERSION $PG_USER -ignorenotice
#after_success:
# blank
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 440b892..8b14a3d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -212,7 +212,7 @@ endif()
set(PGROUTING_VERSION_MAJOR "2")
set(PGROUTING_VERSION_MINOR "4")
-set(PGROUTING_VERSION_PATCH "1")
+set(PGROUTING_VERSION_PATCH "2")
set(PGROUTING_VERSION_DEV "")
set(PGROUTING_SHORT_VERSION "${PGROUTING_VERSION_MAJOR}.${PGROUTING_VERSION_MINOR}")
@@ -316,9 +316,16 @@ endif(NOT POSTGRESQL_FOUND)
if(NOT POSTGRESQL_VERSION_STRING)
message(FATAL_ERROR "pg_config was not found. Please check your PostgreSQL installation!")
endif(NOT POSTGRESQL_VERSION_STRING)
+
string(SUBSTRING "${POSTGRESQL_VERSION_STRING}" 11 -1 POSTGRESQL_VERSION)
+
+# for XbetaY XalphaY XrcY -> X.Y
+string(REGEX REPLACE "^([0-9]+)[beta|alpha|rc].*" "\\1.0" POSTGRESQL_VERSION ${POSTGRESQL_VERSION})
+
+#for X.Y.Z -> XY Y<10
string(REGEX REPLACE "^([0-9]+)\\.([0-9]+).*" "\\1\\2" PGSQL_VERSION ${POSTGRESQL_VERSION})
+
if("${POSTGRESQL_VERSION}" VERSION_LESS "${POSTGRESQL_MINIMUM_VERSION}")
message(FATAL_ERROR " PostgreSQL ${POSTGRESQL_MINIMUM_VERSION} or greater is required.")
endif("${POSTGRESQL_VERSION}" VERSION_LESS "${POSTGRESQL_MINIMUM_VERSION}")
diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
new file mode 100644
index 0000000..d9a81a0
--- /dev/null
+++ b/CODE_OF_CONDUCT.md
@@ -0,0 +1,72 @@
+Contributors to pgRouting are expected to act respectfully toward others in accordance with the http://www.osgeo.org/code_of_conduct.
+
+Full transcription:
+
+
+# OSGeo Code of Conduct
+
+Version: 1.0
+
+Date: May 2015
+
+## Introduction
+
+This code of conduct governs how we behave in any OSGeo forum or event and whenever we will be judged by our actions. We expect it to be honored by everyone who participates in the OSGeo community formally or informally, or claims any affiliation with the OSGeo Foundation.
+
+It applies to in-person events (such as conferences and related social events), IRC, public and private mailing lists, the issue tracker, the wiki, blogs, Twitter, and any other forums which the community uses for communication and interactions.
+
+This code is not exhaustive or complete. It serves to distill our common understanding of a collaborative, shared environment and goals. We expect it to be followed in spirit as much as in the letter, so that it can enrich all of us and the technical communities in which we participate.
+
+## Diversity Statement
+
+OSGeo welcomes and encourages participation by everyone. We are committed to being a community that everyone feels good about joining, and we will always work to treat everyone well. No matter how you identify yourself or how others perceive you: we welcome you.
+Specific Guidelines
+
+We strive to:
+
+- Be open.
+ We invite anyone to participate in our community. We preferably use public methods of communication for project-related messages, unless discussing something sensitive. This applies to messages for help or project-related support, too; not only is a public support request much more likely to result in an answer to a question, it also makes sure that any inadvertent mistakes made by people answering will be more easily detected and corrected.
+
+- Be empathetic, welcoming, friendly, and patient.
+ We work together to resolve conflict, assume good intentions, and do our best to act in an empathetic fashion. We may all experience some frustration from time to time, but we do not allow frustration to turn into a personal attack. A community where people feel uncomfortable or threatened is not a productive one. Note that we have a multi-cultural, multi-lingual community and some of us are non-native speakers. We should be respectful when dealing with other community members as wel [...]
+
+- Be collaborative.
+ Our work will be used by other people, and in turn we will depend on the work of others. When we make something for the benefit of OSGeo, we are willing to explain to others how it works, so that they can build on the work to make it even better. Any decision we make will affect users and colleagues, and we take those consequences seriously when making decisions.
+
+- Be inquisitive.
+ Nobody knows everything! Asking questions early avoids many problems later, so questions are encouraged, though they may be directed to the appropriate forum. Those who are asked should be responsive and helpful, within the context of our shared goal of improving OSGeo.
+
+- Be careful in the words that we choose.
+ Whether we are participating as professionals or volunteers, we value professionalism in all interactions, and take responsibility for our own speech. Be kind to others. Do not insult or put down other participants.
+
+- Be concise
+ Keep in mind that what you write once will be read by hundreds of persons. Writing a short email means people can understand the conversation as efficiently as possible. Short emails should always strive to be empathetic, welcoming, friendly and patient. When a long explanation is necessary, consider adding a summary.
+
+ Try to bring new ideas to a conversation so that each mail adds something unique to the thread, keeping in mind that the rest of the thread still contains the other messages with arguments that have already been made.
+
+ Try to stay on topic, especially in discussions that are already fairly large.
+
+- Step down considerately.
+ Members of every project come and go. When somebody leaves or disengages from the project they should tell people they are leaving and take the proper steps to ensure that others can pick up where they left off. In doing so, they should remain respectful of those who continue to participate in the project and should not misrepresent the project's goals or achievements. Likewise, community members should respect any individual's choice to leave the project.
+
+## Anti-Harassment
+
+Harassment and other exclusionary behaviour are not acceptable. This includes, but is not limited to:
+
+- Personal insults or discriminatory jokes and language, especially those using racist or sexist terms.
+- Offensive comments, excessive or unnecessary profanity.
+- Intimidation, violent threats or demands.
+- Sustained disruption of sessions or events.
+- Stalking, harassing photography or recording.
+- Unwelcome physical contact or sexual attention.
+- Repeated harassment of others. In general, if someone asks you to stop, then stop.
+- Posting (or threatening to post) other people's personally identifying information ("doxing").
+- Sharing private content, such as emails sent privately or non-publicly, or unlogged forums such as IRC channel history.
+- Advocating for, or encouraging, any of the above behaviour.
+
+## Reporting Guidelines
+
+If you believe someone is breaking this code of conduct, you may reply to them, and point to this code of conduct. Such messages may be in public or in private, whatever is most appropriate. Assume good faith; it is more likely that participants are unaware of their bad behaviour than that they intentionally try to degrade the quality of the discussion. Should there be difficulties in dealing with the situation, you may report your concerns to event staff, a forum leader or the OSGeo Boa [...]
+
+
+
diff --git a/COPYING b/LICENSE
similarity index 100%
rename from COPYING
rename to LICENSE
diff --git a/NEWS b/NEWS
index dfb67f0..d4d5bf0 100644
--- a/NEWS
+++ b/NEWS
@@ -1,220 +1,368 @@
-Changes for 2.4.1
+pgRouting 2.4.2 Release Notes
-------------------------------------------------------------------------------
-* Bug fixes
- * fixed compiling error on macOS
- * Condition error on pgr_withPoints
+To see the issues closed by this release see the [Git closed milestone for 2.4.2 ](https://github.com/pgRouting/pgrouting/issues?utf8=%E2%9C%93&q=milestone%3A%22Release%202.4.2%22%20) on Github.
+
+*Improvement*
+
+* Works for postgreSQL 10
+
+*Bug fixes*
+
+* Fixed: Unexpected error column "cname"
+* Replace __linux__ with __GLIBC__ for glibc-specific headers and functions
+
+
+
-Changes for 2.4.0
+pgRouting 2.4.1 Release Notes
-------------------------------------------------------------------------------
-* New Signatures:
- * pgr_bdDijkstra
-* New Proposed functions
- * pgr_maxFlow
- * pgr_astar(one to many)
- * pgr_astar(many to one)
- * pgr_astar(many to many)
- * pgr_astarCost(one to one)
- * pgr_astarCost(one to many)
- * pgr_astarCost(many to one)
- * pgr_astarCost(many to many)
- * pgr_astarCostMatrix
-* Deprecated Signatures
- * pgr_bddijkstra - use pgr_bdDijkstra instead
-* Deprecated functions
- * pgr_pointsToVids
+To see the issues closed by this release see the [Git closed milestone for 2.4.2 ](https://github.com/pgRouting/pgrouting/issues?utf8=%E2%9C%93&q=milestone%3A%22Release%202.4.1%22%20) on Github.
+
+*Bug fixes*
+
+* Fixed compiling error on macOS
+* Condition error on pgr_withPoints
+
+
+pgRouting 2.4.0 Release Notes
+-------------------------------------------------------------------------------
+
+To see the issues closed by this release see the [Git closed issues for 2.4.0 ](https://github.com/pgRouting/pgrouting/issues?q=milestone%3A%22Release+2.4.0%22+is%3Aclosed) on Github.
+
+*New Signatures*
+
+* pgr_bdDijkstra
+
+
+*New Proposed Signatures*
+
+* pgr_maxFlow
+* pgr_astar(one to many)
+* pgr_astar(many to one)
+* pgr_astar(many to many)
+* pgr_astarCost(one to one)
+* pgr_astarCost(one to many)
+* pgr_astarCost(many to one)
+* pgr_astarCost(many to many)
+* pgr_astarCostMatrix
+
+*Deprecated Signatures*
+
+* pgr_bddijkstra - use pgr_bdDijkstra instead
+
+*Deprecated Functions*
+
+* pgr_pointsToVids
+
+*Bug fixes*
+
* Bug fixes on proposed functions
+
* pgr_withPointsKSP: fixed ordering
+
* TRSP original code is used with no changes on the compilation warnings
-Changes for 2.3.2
+
+pgRouting 2.3.2 Release Notes
-------------------------------------------------------------------------------
-* Bug fixes
- * Fixed pgr_gsoc_vrppdtw crash when all orders fit on one truck.
- * Fixed pgr_trsp:
- * Alternate code is not executed when the point is in reality a vertex
- * Fixed ambiguity on seq
+To see the issues closed by this release see the [Git closed issues for 2.3.2 ](https://github.com/pgRouting/pgrouting/issues?q=milestone%3A%22Release+2.3.2%22+is%3Aclosed) on Github.
+
+*Bug Fixes*
+
+* Fixed pgr_gsoc_vrppdtw crash when all orders fit on one truck.
+* Fixed pgr_trsp:
-Changes for 2.3.1
+ * Alternate code is not executed when the point is in reality a vertex
+ * Fixed ambiguity on seq
+
+
+
+pgRouting 2.3.1 Release Notes
-------------------------------------------------------------------------------
-* Bug fixes
- * Leaks on proposed max_flow functions
- * Regression error on pgr_trsp
- * Types discrepancy on pgr_createVerticesTable
+To see the issues closed by this release see the [Git closed issues for 2.3.1 ](https://github.com/pgRouting/pgrouting/issues?q=milestone%3A%22Release+2.3.1%22+is%3Aclosed) on Github.
+*Bug Fixes*
-Changes for 2.3.0
+* Leaks on proposed max_flow functions
+* Regression error on pgr_trsp
+* Types discrepancy on pgr_createVerticesTable
+
+
+
+pgRouting 2.3.0 Release Notes
-------------------------------------------------------------------------------
-* New Signatures:
+To see the issues closed by this release see the [Git closed issues for 2.3.0 ](https://github.com/pgRouting/pgrouting/issues?q=milestone%3A%22Release+2.3.0%22+is%3Aclosed) on Github.
+
+*New Signatures*
- * pgr_TSP
- * pgr_aStar
+* pgr_TSP
+* pgr_aStar
-* New Functions:
+*New Functions*
- * pgr_eucledianTSP
+* pgr_eucledianTSP
-* New Proposed functions
- * pgr_dijkstraCostMatrix
- * pgr_withPointsCostMatrix
- * pgr_maxFlowPushRelabel
- * pgr_maxFlowEdmondsKarp
- * pgr_maxFlowBoykovKolmogorov
- * pgr_maximumCardinalityMatching
- * pgr_edgeDisjointPaths
- * pgr_contractGraph
+*New Proposed functions*
+* pgr_dijkstraCostMatrix
+* pgr_withPointsCostMatrix
+* pgr_maxFlowPushRelabel(one to one)
+* pgr_maxFlowPushRelabel(one to many)
+* pgr_maxFlowPushRelabel(many to one)
+* pgr_maxFlowPushRelabel(many to many)
+* pgr_maxFlowEdmondsKarp(one to one)
+* pgr_maxFlowEdmondsKarp(one to many)
+* pgr_maxFlowEdmondsKarp(many to one)
+* pgr_maxFlowEdmondsKarp(many to many)
+* pgr_maxFlowBoykovKolmogorov (one to one)
+* pgr_maxFlowBoykovKolmogorov (one to many)
+* pgr_maxFlowBoykovKolmogorov (many to one)
+* pgr_maxFlowBoykovKolmogorov (many to many)
+* pgr_maximumCardinalityMatching
+* pgr_edgeDisjointPaths(one to one)
+* pgr_edgeDisjointPaths(one to many)
+* pgr_edgeDisjointPaths(many to one)
+* pgr_edgeDisjointPaths(many to many)
+* pgr_contractGraph
-* Deprecated Signatures
- * pgr_tsp - use pgr_TSP or pgr_eucledianTSP instead
- * pgr_astar - use pgr_aStar instead
+*Deprecated Signatures*
+* pgr_tsp - use pgr_TSP or pgr_eucledianTSP instead
+* pgr_astar - use pgr_aStar instead
-* Deprecated functions
- * pgr_flip_edges
- * pgr_vidsToDmatrix(2 signatures)
- * pgr_pointsToDMatrix
- * pgr_textToPoints
+*Deprecated Functions*
-Changes for 2.2.4
+* pgr_flip_edges
+* pgr_vidsToDmatrix
+* pgr_pointsToDMatrix
+* pgr_textToPoints
+
+
+
+
+pgRouting 2.2.4 Release Notes
-------------------------------------------------------------------------------
-- Bogus uses of extern "C"
-- Build error on Fedora 24 + GCC 6.0
-- Regression error pgr_nodeNetwork
+To see the issues closed by this release see the [Git closed issues for 2.2.4 ](https://github.com/pgRouting/pgrouting/issues?q=milestone%3A%22Release+2.2.4%22+is%3Aclosed) on Github.
+*Bug Fixes*
+* Bogus uses of extern "C"
+* Build error on Fedora 24 + GCC 6.0
+* Regression error pgr_nodeNetwork
-Changes for 2.2.3
+
+pgRouting 2.2.3 Release Notes
-------------------------------------------------------------------------------
-- Fixed compatibility issues with PostgreSQL 9.6.
+To see the issues closed by this release see the [Git closed issues for 2.2.3 ](https://github.com/pgRouting/pgrouting/issues?q=milestone%3A%22Release+2.2.3%22+is%3Aclosed) on Github.
+
+*Bug Fixes*
+
+* Fixed compatibility issues with PostgreSQL 9.6.
-Changes for 2.2.2
+
+pgRouting 2.2.2 Release Notes
-------------------------------------------------------------------------------
-- Fixed regression error on pgr_drivingDistance
+To see the issues closed by this release see the [Git closed issues for 2.2.2 ](https://github.com/pgRouting/pgrouting/issues?q=milestone%3A%22Release+2.2.2%22+is%3Aclosed) on Github.
+
+*Bug Fixes*
+
+* Fixed regression error on pgr_drivingDistance
+
-Changes for 2.2.1
+
+pgRouting 2.2.1 Release Notes
-------------------------------------------------------------------------------
-- Server crash fix on pgr_alphaShape
-- Bug fix on With Points family of functions
+To see the issues closed by this release see the [Git closed issues for 2.2.1 ](https://github.com/pgRouting/pgrouting/issues?q=milestone%3A2.2.1+is%3Aclosed) on Github.
+
+*Bug Fixes*
+
+* Server crash fix on pgr_alphaShape
+* Bug fix on With Points family of functions
+
-Changes for 2.2.0
+
+pgRouting 2.2.0 Release Notes
-------------------------------------------------------------------------------
-- Improved:
- - pgr_nodeNetwork
- - Adding a row_where and outall optional parameters
+To see the issues closed by this release see the [Git closed issues for 2.2.0 ](https://github.com/pgRouting/pgrouting/issues?q=milestone%3A%22Release+2.2.0%22+is%3Aclosed) on Github.
+
+
+*Improvements*
+
+- pgr_nodeNetwork
+
+ - Adding a row_where and outall optional parameters
- Signature fix
- - pgr_dijkstra -- to match what was documented on the pgr_dijkstra from V2.0
-
-- New functions
- - pgr_floydWarshall
- - pgr_Johnson
- - pgr_dijkstraCost(one to one)
- - pgr_dijkstraCost(one to many)
- - pgr_dijkstraCost(many to one)
- - pgr_dijkstraCost(many to many)
-
-- New Proposed functions
- - pgr_withPoints(one to one)
- - pgr_withPoints(one to many)
- - pgr_withPoints(many to one)
- - pgr_withPoints(many to many)
- - pgr_withPointsCost(one to one)
- - pgr_withPointsCost(one to many)
- - pgr_withPointsCost(many to one)
- - pgr_withPointsCost(many to many)
- - pgr_withPointsDD(single vertex)
- - pgr_withPointsDD(multiple vertices)
- - 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
- - pgr_makeDistanceMatrix
-
-
-Changes for 2.1.0
+
+ - pgr_dijkstra -- to match what is documented
+
+
+*New Functions*
+
+- pgr_floydWarshall
+- pgr_Johnson
+- pgr_dijkstraCost(one to one)
+- pgr_dijkstraCost(one to many)
+- pgr_dijkstraCost(many to one)
+- pgr_dijkstraCost(many to many)
+
+*Proposed functionality*
+
+- pgr_withPoints(one to one)
+- pgr_withPoints(one to many)
+- pgr_withPoints(many to one)
+- pgr_withPoints(many to many)
+- pgr_withPointsCost(one to one)
+- pgr_withPointsCost(one to many)
+- pgr_withPointsCost(many to one)
+- pgr_withPointsCost(many to many)
+- pgr_withPointsDD(single vertex)
+- pgr_withPointsDD(multiple vertices)
+- 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
+
+*Renamed and deprecated function*
+
+- pgr_makeDistanceMatrix renamed to _pgr_makeDistanceMatrix
+
+
+
+pgRouting 2.1.0 Release Notes
-------------------------------------------------------------------------------
+To see the issues closed by this release see the [Git closed issues for 2.1.0 ](https://github.com/pgRouting/pgrouting/issues?q=is%3Aissue+milestone%3A%22Release+2.1.0%22+is%3Aclosed) on Github.
+
+*New Signatures*
+
+- pgr_dijkstra(one to many)
+- pgr_dijkstra(many to one)
+- pgr_dijkstra(many to many)
+- pgr_drivingDistance(multiple vertices)
+
+*Refactored*
+
+- pgr_dijkstra(one to one)
+- pgr_ksp
+- pgr_drivingDistance(single vertex)
- - New Signatures
- - pgr_dijkstra(one to many)
- - pgr_dijkstra(many to one)
- - pgr_dijkstra(many to many)
- - pgr_drivingDistance(multiple vertices)
+*Improvements*
- - Three Functions where completely re-factored
+- pgr_alphaShape function now can generate better (multi)polygon with holes and alpha parameter.
- - pgr_dijkstra(one to one)
- - pgr_ksp
- - pgr_drivingDistance(single vertex)
+*Proposed functionality*
- - Improved
- - pgr_alphaShape function now can generate better polygons with holes and custom parameter
+- Proposed functions from Steve Woodbridge, (Classified as Convenience by the author.)
- - Added proposed functions to be evaluated:
- - 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.
- - pgr_pointsToVids - convert an array of point geometries into vertex ids.
- - pgr_pointsToDMatrix - Create a distance matrix from an array of points.
- - pgr_vidsToDMatrix - Create a distance matrix from an array of vertix_id.
- - pgr_vidsToDMatrix - Create a distance matrix from an array of vertix_id.
+ - 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.
+ - pgr_pointsToVids - convert an array of point geometries into vertex ids.
+ - pgr_pointsToDMatrix - Create a distance matrix from an array of points.
+ - pgr_vidsToDMatrix - Create a distance matrix from an array of vertix_id.
+ - pgr_vidsToDMatrix - Create a distance matrix from an array of vertix_id.
- - Added proposed functions from GSoc Projects:
- - pgr_vrppdtw
- - pgr_vrponedepot
+- Added proposed functions from GSoc Projects:
- - Deprecated functions
- - pgr_getColumnName
- - pgr_getTableName
- - pgr_isColumnCndexed
- - pgr_isColumnInTable
- - pgr_quote_ident
- - pgr_versionless
- - pgr_startPoint
- - pgr_endPoint
- - pgr_pointToId
+ - pgr_vrppdtw
+ - pgr_vrponedepot
- - Instead of generating many libraries:
- - All functions are encapsulated in one library
- - The library has a the prefix 2-1-0
+*Deprecated functions*
- - A C and C++ library for developer was created
+- pgr_getColumnName
+- pgr_getTableName
+- pgr_isColumnCndexed
+- pgr_isColumnInTable
+- pgr_quote_ident
+- pgr_versionless
+- pgr_startPoint
+- pgr_endPoint
+- pgr_pointToId
- - encapsulates postgreSQL related functions
- - encapsulates Boost.Graph graphs
+*No longer supported*
- - Directed Boost.Graph
- - Undirected Boost.graph
+- Removed the 1.x legacy functions
- - allow any-integer in the id's
- - allow any-numerical on the cost/reverse_cost columns
- - Removed the 1.x legacy functions
+*Bug Fixes*
- - Some bug fixes in other functions
+- Some bug fixes in other functions
-Changes for 2.0.0
+
+*Refactoring Internal Code*
+
+- A C and C++ library for developer was created
+
+ - encapsulates postgreSQL related functions
+ - encapsulates Boost.Graph graphs
+
+ - Directed Boost.Graph
+ - Undirected Boost.graph.
+
+ - allow any-integer in the id's
+ - allow any-numerical on the cost/reverse_cost columns
+
+- Instead of generating many libraries:
+ - All functions are encapsulated in one library
+ - The library has the prefix 2-1-0
+
+
+
+
+pgRouting 2.0.1 Release Notes
-------------------------------------------------------------------------------
+Minor bug fixes.
+
+*Bug Fixes*
+
+* No track of the bug fixes were kept.
+
+
+
+pgRouting 2.0.0 Release Notes
+-------------------------------------------------------------------------------
+
+To see the issues closed by this release see the [Git closed issues for 2.0.0 ](https://github.com/pgRouting/pgrouting/issues?q=milestone%3A%22Release+2.0.0%22+is%3Aclosed) on Github.
+
+With the release of pgRouting 2.0.0 the library has abandoned backwards compatibility to :ref:`pgRouting 1.x <changelog_1_x>` releases.
+The main Goals for this release are:
+
+* Major restructuring of pgRouting.
+* Standardization of the function naming
+* Preparation of the project for future development.
+
+As a result of this effort:
+
+* pgRouting has a simplified structure
+* Significant new functionality has being added
+* Documentation has being integrated
+* Testing has being integrated
+* And made it easier for multiple developers to make contributions.
+
+
+*Important Changes*
+
* Graph Analytics - tools for detecting and fixing connection some problems in a graph
* A collection of useful utility functions
* Two new All Pairs Short Path algorithms (pgr_apspJohnson, pgr_apspWarshall)
@@ -229,10 +377,10 @@ Changes for 2.0.0
* Improved build process for Windows
* Automated testing on Linux and Windows platforms trigger by every commit
* Modular library design
-* Compatibility with PostgreSQL 9.1 or newer
-* Compatibility with PostGIS 2.0 or newer
+* Compatibility with PostgreSQL 9.1 or newer
+* Compatibility with PostGIS 2.0 or newer
* Installs as PostgreSQL EXTENSION
-* Return types refactored and unified
+* Return types re factored and unified
* Support for table SCHEMA in function parameters
* Support for ``st_`` PostGIS function prefix
* Added ``pgr_`` prefix to functions and types
@@ -240,66 +388,73 @@ Changes for 2.0.0
* shooting_star is discontinued
-Changes for release 1.05
+
+
+pgRouting 1.x Release Notes
-------------------------------------------------------------------------------
-* Bugfixes
+To see the issues closed by this release see the [Git closed issues for 1.x ](https://github.com/pgRouting/pgrouting/issues?q=milestone%3A%22Release+1.x%22+is%3Aclosed) on Github.
+The following release notes have been copied from the previous ``RELEASE_NOTES`` file and are kept as a reference.
+
+
+Changes for release 1.05
+...............................................................................
+
+* Bug fixes
Changes for release 1.03
--------------------------------------------------------------------------------
+...............................................................................
* Much faster topology creation
-* Bugfixes
+* Bug fixes
Changes for release 1.02
--------------------------------------------------------------------------------
+...............................................................................
-* Shooting* bugfixes
+* Shooting* bug fixes
* Compilation problems solved
Changes for release 1.01
--------------------------------------------------------------------------------
+...............................................................................
-* Shooting* bugfixes
+* Shooting* bug fixes
Changes for release 1.0
--------------------------------------------------------------------------------
+...............................................................................
* Core and extra functions are separated
* Cmake build process
-* Bugfixes
+* Bug fixes
Changes for release 1.0.0b
--------------------------------------------------------------------------------
+...............................................................................
* Additional SQL file with more simple names for wrapper functions
-* Bugfixes
+* Bug fixes
Changes for release 1.0.0a
--------------------------------------------------------------------------------
+...............................................................................
* Shooting* shortest path algorithm for real road networks
* Several SQL bugs were fixed
Changes for release 0.9.9
--------------------------------------------------------------------------------
+...............................................................................
* PostgreSQL 8.2 support
-* Shortest path functions return empty result if they couldn’t find any path
+* Shortest path functions return empty result if they could not find any path
Changes for release 0.9.8
--------------------------------------------------------------------------------
+...............................................................................
* Renumbering scheme was added to shortest path functions
* Directed shortest path functions were added
* routing_postgis.sql was modified to use dijkstra in TSP search
-
-
diff --git a/README.md b/README.md
index a5f5e13..9fe108e 100644
--- a/README.md
+++ b/README.md
@@ -6,7 +6,7 @@
### Branches
-* The *master* branch has the latest minor release. (2.4.0)
+* The *master* branch has the latest minor release. (2.4.2)
* The *develop* branch has the next minor release. (2.5.0-dev)
For the complete list of releases go to:
@@ -41,7 +41,6 @@ https://github.com/pgRouting/pgrouting/releases
<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>
@@ -51,10 +50,12 @@ https://github.com/pgRouting/pgrouting/releases
</tr>
</table>
-* travis: Postgis 2.2 for Postgres 9.1, 9.2, 9.3, 9.4, 9.5
+* travis: Postgis 2.3.3 for Postgres 9.5 & 9.6
* 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
+ * developed with Postgres 9.3 and Postgis 2.3.3
+
+* jenkins: g++ 4.8 on 32 & 64 bits for Postgis 2.4.0dev and Postgres 9.5, 9.6, 10
+* appveyor: vs1013 Postgis 2.3.3 on Postgres 9.4
@@ -96,7 +97,7 @@ Family of functions include:
Building reqirements
--------------------
-* perl
+* Perl
* C and C++ compilers
* GNU >= 4.6
* MSVC >= 18.0
@@ -126,7 +127,7 @@ For MinGW on Windows
make
make install
-Also pre-built Windows binaries can be downloaded from http://.postgis.net/windows_downloads
+Also pre-built Windows binaries can be downloaded from https://postgis.net/windows_downloads
For Linux
diff --git a/VERSION b/VERSION
index 5f8a85d..dd83933 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-4691-722e04e03 master
+4746-fb7c27bfc master
diff --git a/appveyor.yml b/appveyor.yml
index e02bc80..0abcbef 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -25,6 +25,8 @@ environment:
CONFIGURATION: Release
MSVC_VER: 12.0
BUILD_ROOT_DIR: c:\build
+ PGIS_VERSION: 2.3.3
+ PG_VER: 9.4
init:
- git config --global core.autocrlf false
@@ -39,17 +41,17 @@ install:
build_script:
- cd c:\build\pgrouting\ci\appveyor
- - msbuild_pgrouting.bat 9.4
+ - msbuild_pgrouting.bat %PG_VER%
- 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\
+ - copy c:\build\gmp\x64\lib\*.dll C:\Progra~1\PostgreSQL\%PG_VER%\bin\
test_script:
- set PGUSER=postgres
- set PGPASSWORD=Password12!
- - set PGHOME=C:\Progra~1\PostgreSQL\9.4
+ - set PGHOME=C:\Progra~1\PostgreSQL\%PG_VER%
- set PGPORT=5432
- set PATH=%PATH%;%PGHOME%\bin
# Execute algorithm test by Cygwin
- - C:\cygwin\bin\bash -lc "cd /cygdrive/c/build/pgrouting && tools/testers/algorithm-tester.pl -psql \"/cygdrive/c/Progra~1/PostgreSQL/9.4/bin/psql\""
+ - C:\cygwin\bin\bash -lc "cd /cygdrive/c/build/pgrouting && tools/testers/algorithm-tester.pl -psql \"/cygdrive/c/Progra~1/PostgreSQL/%PG_VER%/bin/psql\""
diff --git a/ci/appveyor/install.bat b/ci/appveyor/install.bat
index 2c83668..bdd843a 100644
--- a/ci/appveyor/install.bat
+++ b/ci/appveyor/install.bat
@@ -20,9 +20,10 @@ if not defined COMMON_INSTALL_DIR set COMMON_INSTALL_DIR=%BUILD_ROOT_DIR%\local\
:: for cmake its the min version
if not defined CMAKE_VERSION set CMAKE_VERSION=3.5.2
-if not defined PG_VERSION set PG_VERSION=2.3.1
+if not defined PGIS_VERSION set PGIS_VERSION=2.3.3
if not defined BOOST_VERSION set BOOST_VERSION=1.58.0
if not defined CGAL_VERSION set CGAL_VERSION=4.8.1
+set PG_VER_NO_DOT=pg%PG_VER:.=%
set CMAKE_GENERATOR=Visual Studio %MSVC_VER:.0=% %MSVC_YEAR%
@@ -33,6 +34,9 @@ if "%platform%"=="x64" (
:: Determine if arch is 32/64 bits
if /I "%platform%"=="x86" ( set arch=32) else ( set arch=64)
+:: Determine compiler used to build postgis
+if "%arch%"=="64" (set GCC=48) else (set GCC=481)
+
::
:: =========================================================
@@ -94,38 +98,38 @@ echo ====================================
::
echo ==================================== POSTGIS
-if not exist "C:\Progra~1\PostgreSQL\9.4\makepostgisdb_using_extensions.bat" (
+if not exist "C:\Progra~1\PostgreSQL\%PG_VER%\makepostgisdb_using_extensions.bat" (
cd %APPVEYOR_BUILD_FOLDER%
- if not exist %DOWNLOADS_DIR%\postgis-pg94-binaries-%PG_VERSION%w%arch%gcc48.zip (
- echo Downloading PostGIS %PG_VERSION%
+ if not exist %DOWNLOADS_DIR%\postgis-%PG_VER_NO_DOT%-binaries-%PGIS_VERSION%w%arch%gcc%GCC%.zip (
+ echo Downloading PostGIS %PGIS_VERSION%
pushd %DOWNLOADS_DIR%
- curl -L -O -S -s http://winnie.postgis.net/download/windows/pg94/buildbot/postgis-pg94-binaries-%PG_VERSION%w%arch%gcc48.zip
+ curl -L -O -S -s http://winnie.postgis.net/download/windows/%PG_VER_NO_DOT%/buildbot/postgis-%PG_VER_NO_DOT%-binaries-%PGIS_VERSION%w%arch%gcc%GCC%.zip
popd
- if not exist %DOWNLOADS_DIR%\postgis-pg94-binaries-%PG_VERSION%w%arch%gcc48.zip (
- echo something went wrong on PostGIS %PG_VERSION% download !!!!!!!!!
+ if not exist %DOWNLOADS_DIR%\postgis-%PG_VER_NO_DOT%-binaries-%PGIS_VERSION%w%arch%gcc%GCC%.zip (
+ echo something went wrong on PostGIS %PGIS_VERSION% download !!!!!!!!!
if defined LOCAL_DEBUG dir %DOWNLOADS_DIR%
Exit \B 1
)
)
- echo Extracting PostGIS %PG_VERSION%
+ echo Extracting PostGIS %PGIS_VERSION%
pushd %DOWNLOADS_DIR%
- 7z x -o%BUILD_ROOT_DIR%\ postgis-pg94-binaries-%PG_VERSION%w%arch%gcc48.zip
+ 7z x -o%BUILD_ROOT_DIR%\ postgis-%PG_VER_NO_DOT%-binaries-%PGIS_VERSION%w%arch%gcc%GCC%.zip
popd
- echo **** Installing postGIS %PG_VERSION%
- xcopy /e /y /q %BUILD_ROOT_DIR%\postgis-pg94-binaries-%PG_VERSION%w%arch%gcc48 C:\Progra~1\PostgreSQL\9.4
+ echo **** Installing postGIS %PGIS_VERSION%
+ xcopy /e /y /q %BUILD_ROOT_DIR%\postgis-%PG_VER_NO_DOT%-binaries-%PGIS_VERSION%w%arch%gcc%GCC% C:\Progra~1\PostgreSQL\%PG_VER%
- if not exist "C:\Progra~1\PostgreSQL\9.4\makepostgisdb_using_extensions.bat" (
- echo something went wrong on PostGIS %PG_VERSION% installation !!!!!!!!!
+ if not exist "C:\Progra~1\PostgreSQL\%PG_VER%\makepostgisdb_using_extensions.bat" (
+ echo something went wrong on PostGIS %PGIS_VERSION% installation !!!!!!!!!
if defined LOCAL_DEBUG dir %DOWNLOADS_DIR%
- if defined LOCAL_DEBUG dir C:\Progra~1\PostgreSQL\9.4\
+ if defined LOCAL_DEBUG dir C:\Progra~1\PostgreSQL\%PG_VER%\
Exit \B 1
) else (
- echo **** PostGIS %PG_VERSION% %arch% installed
+ echo **** PostGIS %PGIS_VERSION% %arch% installed
)
) else (
- echo PostGIS %PG_VERSION% %arch% already installed
+ echo PostGIS %PGIS_VERSION% %arch% already installed
)
echo ====================================
diff --git a/doc/src/pgRouting-installation.rst b/doc/src/pgRouting-installation.rst
index e2060ba..affc604 100644
--- a/doc/src/pgRouting-installation.rst
+++ b/doc/src/pgRouting-installation.rst
@@ -96,10 +96,10 @@ Goto :ref:`install-short` to the compile instructions (there is no tar ball).
.. _install_enable_db:
-Enabeling and upgrading in the database
+Enabling and upgrading in the database
----------------------------------------------
-.. rubric:: Enabeling the database
+.. rubric:: Enabling the database
pgRouting is an extension and depends on postGIS. Enabling postGIS before enabling pgRouting in the database
diff --git a/doc/src/release_notes.rst b/doc/src/release_notes.rst
index 456a2c6..315de45 100644
--- a/doc/src/release_notes.rst
+++ b/doc/src/release_notes.rst
@@ -18,6 +18,7 @@ To see the full list of changes check the list of `Git commits <https://github.c
.. changelog start
+* :ref:`changelog_2_4_2`
* :ref:`changelog_2_4_1`
* :ref:`changelog_2_4_0`
* :ref:`changelog_2_3_2`
@@ -35,12 +36,33 @@ To see the full list of changes check the list of `Git commits <https://github.c
.. changelog end
+
+.. _changelog_2_4_2:
+
+pgRouting 2.4.2 Release Notes
+-------------------------------------------------------------------------------
+
+To see the issues closed by this release see the `Git closed milestone for 2.4.2 <https://github.com/pgRouting/pgrouting/issues?utf8=%E2%9C%93&q=milestone%3A%22Release%202.4.2%22%20>`_ on Github.
+
+.. rubric:: Improvement
+
+* Works for postgreSQL 10
+
+.. rubric:: Bug fixes
+
+* Fixed: Unexpected error column "cname"
+* Replace __linux__ with __GLIBC__ for glibc-specific headers and functions
+
+
+
.. _changelog_2_4_1:
pgRouting 2.4.1 Release Notes
-------------------------------------------------------------------------------
-.. rubric:: Bug fix
+To see the issues closed by this release see the `Git closed milestone for 2.4.1 <https://github.com/pgRouting/pgrouting/issues?utf8=%E2%9C%93&q=milestone%3A%22Release%202.4.1%22%20>`_ on Github.
+
+.. rubric:: Bug fixes
* Fixed compiling error on macOS
* Condition error on pgr_withPoints
@@ -77,7 +99,7 @@ To see the issues closed by this release see the `Git closed issues for 2.4.0 <h
* pgr_pointsToVids
-.. rubric:: Bug fix
+.. rubric:: Bug fixes
* Bug fixes on proposed functions
@@ -353,7 +375,7 @@ To see the issues closed by this release see the `Git closed issues for 2.1.0 <h
- Instead of generating many libraries:
- All functions are encapsulated in one library
- - The library has a the prefix 2-1-0
+ - The library has the prefix 2-1-0
@@ -380,8 +402,8 @@ With the release of pgRouting 2.0.0 the library has abandoned backwards compatib
The main Goals for this release are:
* Major restructuring of pgRouting.
-* Standardiziation of the function naming
-* Prepararation of the project for future development.
+* Standardization of the function naming
+* Preparation of the project for future development.
As a result of this effort:
@@ -411,7 +433,7 @@ As a result of this effort:
* Compatibility with PostgreSQL 9.1 or newer
* Compatibility with PostGIS 2.0 or newer
* Installs as PostgreSQL EXTENSION
-* Return types refactored and unified
+* Return types re factored and unified
* Support for table SCHEMA in function parameters
* Support for ``st_`` PostGIS function prefix
* Added ``pgr_`` prefix to functions and types
@@ -432,27 +454,27 @@ The following release notes have been copied from the previous ``RELEASE_NOTES``
Changes for release 1.05
...............................................................................
-* Bugfixes
+* Bug fixes
Changes for release 1.03
...............................................................................
* Much faster topology creation
-* Bugfixes
+* Bug fixes
Changes for release 1.02
...............................................................................
-* Shooting* bugfixes
+* Shooting* bug fixes
* Compilation problems solved
Changes for release 1.01
...............................................................................
-* Shooting* bugfixes
+* Shooting* bug fixes
Changes for release 1.0
@@ -460,14 +482,14 @@ Changes for release 1.0
* Core and extra functions are separated
* Cmake build process
-* Bugfixes
+* Bug fixes
Changes for release 1.0.0b
...............................................................................
* Additional SQL file with more simple names for wrapper functions
-* Bugfixes
+* Bug fixes
Changes for release 1.0.0a
@@ -481,7 +503,7 @@ Changes for release 0.9.9
...............................................................................
* PostgreSQL 8.2 support
-* Shortest path functions return empty result if they couldn’t find any path
+* Shortest path functions return empty result if they could not find any path
Changes for release 0.9.8
diff --git a/doc/test/utilities-any.result b/doc/test/utilities-any.result
index 005119b..8e8299d 100644
--- a/doc/test/utilities-any.result
+++ b/doc/test/utilities-any.result
@@ -1 +1 @@
-2.4.1
+2.4.2
diff --git a/src/alpha_shape/src/alpha.c b/src/alpha_shape/src/alpha.c
index 69346ff..940901f 100644
--- a/src/alpha_shape/src/alpha.c
+++ b/src/alpha_shape/src/alpha.c
@@ -23,6 +23,10 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
********************************************************************PGR-GNU*/
#include "./../../common/src/postgres_connection.h"
+#if PGSQL_VERSION == 100
+#include <float.h>
+#endif
+
#include "catalog/pg_type.h"
diff --git a/src/common/sql/createIndex.sql b/src/common/sql/createIndex.sql
index 0010fec..96efa7a 100644
--- a/src/common/sql/createIndex.sql
+++ b/src/common/sql/createIndex.sql
@@ -82,7 +82,7 @@ BEGIN
execute query;
EXCEPTION WHEN others THEN
perform _pgr_onError( true, reportErrs, fnName,
- 'Could not create index on:' || cname, SQLERRM);
+ 'Could not create index on:' || colname, SQLERRM);
END;
execute 'set client_min_messages to '|| debuglevel;
perform _pgr_msg(msgKind, fnName);
diff --git a/src/common/src/pgr_assert.cpp b/src/common/src/pgr_assert.cpp
index 69dfcb7..2249a79 100644
--- a/src/common/src/pgr_assert.cpp
+++ b/src/common/src/pgr_assert.cpp
@@ -15,7 +15,7 @@
#include <stdlib.h>
#include <stddef.h>
-#ifdef __linux__
+#ifdef __GLIBC__
#include <execinfo.h>
#endif
@@ -24,7 +24,7 @@
std::string get_backtrace() {
-#ifdef __linux__
+#ifdef __GLIBC__
void *trace[16];
int i, trace_size = 0;
diff --git a/src/ksp/doc/pgr_KSP.rst b/src/ksp/doc/pgr_KSP.rst
index 5b0d2b0..8820cad 100644
--- a/src/ksp/doc/pgr_KSP.rst
+++ b/src/ksp/doc/pgr_KSP.rst
@@ -87,7 +87,7 @@ Column Type Description
**end_vid** ``BIGINT`` Identifier of the ending vertex.
**k** ``INTEGER`` The desiered number of paths.
**directed** ``BOOLEAN`` (optional). When ``false`` the graph is considered as Undirected. Default is ``true`` which considers the graph as Directed.
-**heap_paths** ``BOOLEAN`` (optional). When ``true`` returns all the paths stored in the process heap. Default is ``false`` which only returns ``k`` pahts.
+**heap_paths** ``BOOLEAN`` (optional). When ``true`` returns all the paths stored in the process heap. Default is ``false`` which only returns ``k`` paths.
============== ============ =================================================
Roughly, if the shortest path has ``N`` edges, the heap will contain about than ``N * k`` paths for small value of ``k`` and ``k > 1``.
diff --git a/src/topology/test/issue900.result b/src/topology/test/issue900.result
new file mode 100644
index 0000000..b2b70d7
--- /dev/null
+++ b/src/topology/test/issue900.result
@@ -0,0 +1,9 @@
+NOTICE: PROCESSING:
+NOTICE: pgr_createTopology('edge_table', 0.001, 'the_geom', 'id', 'source', 'target', rows_where := 'true', clean := t)
+NOTICE: Performing checks, please wait .....
+NOTICE: Creating Topology, Please wait...
+NOTICE: -------------> TOPOLOGY CREATED FOR 18 edges
+NOTICE: Rows with NULL geometry or NULL id: 0
+NOTICE: Vertices table for table public.edge_table is: public.edge_table_vertices_pgr
+NOTICE: ----------------------------------------------
+OK
diff --git a/src/topology/test/issue900.test.sql b/src/topology/test/issue900.test.sql
new file mode 100644
index 0000000..97a9bc5
--- /dev/null
+++ b/src/topology/test/issue900.test.sql
@@ -0,0 +1,5 @@
+
+ALTER TABLE edge_table RENAME TO mbta_arc;
+CREATE TABLE edge_table AS SELECT * FROM mbta_arc;;
+SELECT pgr_CreateTopology('edge_table', 0.001, 'the_geom', 'id', clean := true);
+
diff --git a/src/topology/test/test.conf b/src/topology/test/test.conf
index 395b590..9e91da9 100644
--- a/src/topology/test/test.conf
+++ b/src/topology/test/test.conf
@@ -5,6 +5,7 @@
'comment' => 'pgr_createTopology, pgr_analyzegraph, and pgr_analyzeOneway tests for any versions.',
'data' => [ ],
'tests' => [qw(
+ issue900
analyzeOneway-any
createVertTab-any
doc-pgr_createTopology
diff --git a/tools/curr-sig/pgrouting--2.4.1.sig b/tools/curr-sig/pgrouting--2.4.2.sig
similarity index 99%
copy from tools/curr-sig/pgrouting--2.4.1.sig
copy to tools/curr-sig/pgrouting--2.4.2.sig
index f73e5b3..b477bba 100644
--- a/tools/curr-sig/pgrouting--2.4.1.sig
+++ b/tools/curr-sig/pgrouting--2.4.2.sig
@@ -1,4 +1,4 @@
-#VERSION pgrouting 2.4.1
+#VERSION pgrouting 2.4.2
#TYPES
pgr_costresult
pgr_costresult3
diff --git a/tools/release-scripts/check-release.sh b/tools/release-scripts/check-release.sh
index 2e270ed..284b405 100755
--- a/tools/release-scripts/check-release.sh
+++ b/tools/release-scripts/check-release.sh
@@ -217,10 +217,10 @@ else
fi
echo "\`\`\`"
-echo "cat VERSION | grep \"release/$MAYOR.$MINOR\""
+echo "cat VERSION | grep \"$BRANCH\""
echo "\`\`\`"
-if [[ $(cat VERSION | grep "release/$MAYOR.$MINOR") != *"release/$MAYOR.$MINOR" ]]; then
- echo "FATAL: VERSION branch should be release/$MAYOR.$MINOR"
+if [[ $(cat VERSION | grep "$BRANCH") != *"$BRANCH" ]]; then
+ echo "FATAL: VERSION branch should be $BRANCH"
exit 1
else
echo " -[x] VERSION file branch: OK"
@@ -240,6 +240,7 @@ fi
#---------------------------------------------------------------------
echo "### Checking signature files"
+test_file 2.4.1
test_file 2.4.0
test_file 2.3.2
test_file 2.3.1
@@ -276,7 +277,8 @@ echo - [x] completed local builds
echo "### checking the signature files dont change"
#---------------------------------------------------------------------
-sh tools/release-scripts/get_signatures.sh 2.4.1 ___sig_generate___ curr-sig >> build/tmp_sigs.txt
+sh tools/release-scripts/get_signatures.sh 2.4.2 ___sig_generate___ curr-sig >> build/tmp_sigs.txt
+sh tools/release-scripts/get_signatures.sh 2.4.1 ___sig_generate___ sigs >> build/tmp_sigs.txt
sh tools/release-scripts/get_signatures.sh 2.4.0 ___sig_generate___ sigs >> build/tmp_sigs.txt
sh tools/release-scripts/get_signatures.sh 2.3.2 ___sig_generate___ sigs >> build/tmp_sigs.txt
sh tools/release-scripts/get_signatures.sh 2.3.1 ___sig_generate___ sigs >> build/tmp_sigs.txt
@@ -324,6 +326,7 @@ fi
if [[ $(git status | grep 'Changes not staged for commit:') ]]; then
echo "FATAL: at least one result file changed"
+ git status
exit 1
fi
diff --git a/tools/release-scripts/compile-release.sh b/tools/release-scripts/compile-release.sh
index 317dc5d..234f12f 100755
--- a/tools/release-scripts/compile-release.sh
+++ b/tools/release-scripts/compile-release.sh
@@ -43,7 +43,7 @@ if [[ "$1" == "4.8" ]]; then
cd build
make doc >> tmp_make.txt
echo " - [x] Build Users documentation OK"
- make doxy >> tmp_make.txty
+ make doxy >> tmp_make.txt
echo " - [x] Build developers documentation OK"
cd ..
fi
diff --git a/tools/release-scripts/notes2news.pl b/tools/release-scripts/notes2news.pl
new file mode 100755
index 0000000..6818829
--- /dev/null
+++ b/tools/release-scripts/notes2news.pl
@@ -0,0 +1,41 @@
+#!/usr/bin/perl -w
+
+use strict;
+
+sub Usage {
+ die "Usage: notes2news.pl (from the root of the repository or pre-commit hook)\n";
+}
+
+
+my $in_file = "doc/src/release_notes.rst";
+my $out_file = "NEWS";
+
+my $ofh;
+open($ofh, ">$out_file") || die "ERROR: failed to open '$out_file' for write! : $!\n";
+
+my $ifh;
+open($ifh, "$in_file") || die "ERROR: failed to open '$in_file' for read! : $!\n";
+
+my $skipping = 1;
+while (my $line = <$ifh>) {
+ if ($skipping) {
+ if ($line =~ /^\.\. _changelog_/) {
+ $skipping = 0;
+ }
+ next;
+ }
+
+ # convert urls to markdown
+ $line =~ s/`([^<]+)<([^>]+)>`_/\[$1\]($2)/g;
+
+ # convert rubric to bold
+ $line =~ s/^\.\. rubric::\s*(.+)$/*$1*/;
+
+ next if $line =~ /^\.\. _changelog/;
+
+ print $ofh $line;
+}
+
+close($ifh);
+close($ofh);
+
diff --git a/tools/curr-sig/pgrouting--2.4.1.sig b/tools/sigs/pgrouting--2.4.1.sig
similarity index 100%
rename from tools/curr-sig/pgrouting--2.4.1.sig
rename to tools/sigs/pgrouting--2.4.1.sig
diff --git a/tools/testers/update-tester.sh b/tools/testers/update-tester.sh
index 3fab357..64bac4e 100755
--- a/tools/testers/update-tester.sh
+++ b/tools/testers/update-tester.sh
@@ -39,7 +39,7 @@ echo -
# bash tools/testers/update-tester.sh
#
-CURRENT=2.4.1
+CURRENT=2.4.2
function update_test {
set -e
@@ -75,13 +75,14 @@ dropdb ___test_update
### updates from 2.3.0
#------------------------------------
+update_test 2.4.1 $CURRENT
update_test 2.4.0 $CURRENT
#------------------------------------
### updates from 2.3.0
#------------------------------------
-update_test 2.3.2 $CURRENT
+#update_test 2.3.2 $CURRENT
update_test 2.3.1 $CURRENT
update_test 2.3.0 $CURRENT
diff --git a/tools/winnie/build_pgrouting.sh b/tools/winnie/build_pgrouting.sh
index 837c269..ebcc845 100644
--- a/tools/winnie/build_pgrouting.sh
+++ b/tools/winnie/build_pgrouting.sh
@@ -22,6 +22,12 @@ JENKINS_DEBUG=1
if [ $JENKINS_DEBUG -eq 1 ]
then
+ #---------------
+ echo
+ echo "***************************"
+ echo Recived variables
+ echo "**************************"
+ #---------------
echo "OS_BUILD ${OS_BUILD}"
echo "PG_VER ${PG_VER}"
echo "PGHOST ${PGHOST}"
@@ -33,7 +39,10 @@ then
fi
#---------------
-# Deduced variables
+echo
+echo "***************************"
+echo Deduced variables
+echo "***************************"
#---------------
export PGUSER=postgres
@@ -41,12 +50,11 @@ export PROJECTS=/projects
export PGPATHEDB=${PROJECTS}/postgresql/rel/pg${PG_VER}w${OS_BUILD}${GCC_TYPE}edb #this is so winnie know's where to copy the dlls for vc++ edb compiled postgresql testing
export PGPATH=${PROJECTS}/postgresql/rel/pg${PG_VER}w${OS_BUILD}${GCC_TYPE}
export PATHOLD=$PATH
-export PATHOLD="/mingw/bin:/mingw/include:/c/Windows/system32:/c/Windows"
+#export PATHOLD="/mingw/bin:/mingw/include:/c/Windows/system32:/c/Windows"
export PGWINVER=${PG_VER}w${OS_BUILD}${GCC_TYPE}edb
-export PATH="${PATHOLD}:${PGPATH}/bin:${PGPATH}/lib:${PGPATH}/include"
+export PATH="${PATHOLD}:/usr/bin:${PGPATH}/bin:${PGPATH}/lib:${PGPATH}/include"
export PATH="${PROJECTS}/rel-libiconv-1.13.1w${OS_BUILD}${GCC_TYPE}/include:${PATH}"
-
if [ $JENKINS_DEBUG -eq 1 ]
then
echo "PGUSER ${PGUSER}"
@@ -100,6 +108,8 @@ PATH="${PATH}:${CGAL_PATH}/include:${CGAL_PATH}/lib"
export PATH="${PATH}:/cmake/bin"
export PATH="${PATH}:.:/bin:/include"
+cmake --version
+
echo "PATH ${PATH}"
cd ${PROJECTS}/pgrouting
@@ -107,23 +117,22 @@ rm -rf build${PGROUTING_VER}w${OS_BUILD}${GCC_TYPE}
mkdir build${PGROUTING_VER}w${OS_BUILD}${GCC_TYPE}
cd build${PGROUTING_VER}w${OS_BUILD}${GCC_TYPE}
-cmake -G "MSYS Makefiles" -DCMAKE_VERBOSE_MAKEFILE=ON \
- -DBOOST_ROOT:PATH=${BOOSTROOT_PATH} \
- -DCGAL_ROOT:PATH=${CGAL_PATH} \
- -DGMP_ROOT:PATH=${PROJECTS}/CGAL/rel-gmp-${GMP_VER}w${OS_BUILD}${GCC_TYPE} \
- -DBoost_USE_STATIC_LIBS=ON \
- -DBoost_USE_MULTITHREADED=ON \
- -DCMAKE_CXX_FLAGS="-I${PROJECTS}/CGAL/rel-gmp-${GMP_VER}w${OS_BUILD}${GCC_TYPE}/include \
- -I${PROJECTS}/CGAL/rel-mpfr-${MPFR_VER}w${OS_BUILD}${GCC_TYPE}/include" \
- -DCMAKE_BUILD_TYPE=Release \
- ../branches/${PGROUTING_VER}
-
-#first delete old pgrouting files from installed folder before we reinstall
+#---------------
+echo
+echo "***************************"
echo "Current contents of PGPATH ${PGPATH}"
+echo "***************************"
+#---------------
ls ${PGPATH}/lib/libpgrouting*
ls ${PGPATH}/share/extension/pgrouting*
+
+#---------------
+echo
+echo "***************************"
echo "Current contents of PGPATHEDB ${PGPATHEDB}"
+echo "***************************"
+#---------------
ls ${PGPATHEDB}/lib/libpgrouting*
ls ${PGPATHEDB}/share/extension/pgrouting*
@@ -132,26 +141,84 @@ rm ${PGPATH}/share/extension/pgrouting*
rm ${PGPATHEDB}/lib/libpgrouting*
rm ${PGPATHEDB}/share/extension/pgrouting*
+#---------------
+echo
+echo "***************************"
echo "After removing in PGPATH ${PGPATH}"
+echo "***************************"
+#---------------
ls ${PGPATH}/lib/libpgrouting*
ls ${PGPATH}/share/extension/pgrouting*
+
+#---------------
+echo
+echo "***************************"
echo "After removing in PGPATHEDB ${PGPATHEDB}"
+echo "***************************"
+#---------------
ls ${PGPATHEDB}/lib/libpgrouting*
ls ${PGPATHEDB}/share/extension/pgrouting*
+cmake --version
+cmake -G "MSYS Makefiles" -DCMAKE_VERBOSE_MAKEFILE=ON \
+ -DBOOST_ROOT:PATH=${BOOSTROOT_PATH} \
+ -DCGAL_ROOT:PATH=${CGAL_PATH} \
+ -DGMP_ROOT:PATH=${PROJECTS}/CGAL/rel-gmp-${GMP_VER}w${OS_BUILD}${GCC_TYPE} \
+ -DBoost_USE_STATIC_LIBS=ON \
+ -DBoost_USE_MULTITHREADED=ON \
+ -DCMAKE_CXX_FLAGS="-I${PROJECTS}/CGAL/rel-gmp-${GMP_VER}w${OS_BUILD}${GCC_TYPE}/include \
+ -I${PROJECTS}/CGAL/rel-mpfr-${MPFR_VER}w${OS_BUILD}${GCC_TYPE}/include" \
+ -DCMAKE_BUILD_TYPE=Release \
+ ../branches/${PGROUTING_VER}
+
+#---------------
+echo
+echo "***************************"
+echo make
+echo "***************************"
+#---------------
make
+
+#---------------
+echo
+echo "***************************"
+echo make install
+echo "***************************"
+#---------------
make install
+#---------------
+echo
+echo "***************************"
+echo "Current contents of PGPATH ${PGPATH}"
+echo "***************************"
+#---------------
+ls ${PGPATH}/lib/libpgrouting*
+ls ${PGPATH}/share/extension/pgrouting*
+
+#---------------
+echo
+echo "***************************"
+echo "Current contents of PGPATHEDB ${PGPATHEDB}"
+echo Should be empty
+echo "***************************"
+#---------------
+ls ${PGPATHEDB}/lib/libpgrouting*
+ls ${PGPATHEDB}/share/extension/pgrouting*
+
+
#we need uninstall and reinstall copy to VC++ EDB instance if we want to test on standard Windows installed versions
#cp *.dll ${PGPATHEDB}/lib/ #TODO remove this once we fix so the .dlls are created in lib folder
-cp lib/*.dll ${PGPATHEDB}/lib/
-cp lib/*.sql ${PGPATHEDB}/share/extension/
-cp lib/*.control ${PGPATHEDB}/share/extension/
+cp ${PGPATH}/lib/*.dll ${PGPATHEDB}/lib/
+cp ${PGPATH}/share/extension/pgrouting*.sql ${PGPATHEDB}/share/extension/
+cp ${PGPATH}/share/extension/*.control ${PGPATHEDB}/share/extension/
-echo "After copy in PGPATH ${PGPATH}"
-ls ${PGPATH}/lib/libpgrouting*
-ls ${PGPATH}/share/extension/pgrouting*
-echo "After copyin PGPATHEDB ${PGPATHEDB}"
+#---------------
+echo
+echo "***************************"
+echo "After copying to PGPATHEDB ${PGPATHEDB}"
+echo "***************************"
+#---------------
ls ${PGPATHEDB}/lib/libpgrouting*
ls ${PGPATHEDB}/share/extension/pgrouting*
@@ -161,8 +228,21 @@ cd ${PROJECTS}/pgrouting/branches/${PGROUTING_VER}
#perl tools/testers/algorithm-tester.pl -pgver ${PG_VER} -pgisver "${POSTGIS_VER}" -pgport "${PGPORT}" -alg common -clean -v
#perl tools/testers/algorithm-tester.pl -pgver ${PG_VER} -pgisver "${POSTGIS_VER}" -pgport "${PGPORT}" -alg dijkstra -clean -v
#perl tools/testers/algorithm-tester.pl -pgver ${PG_VER} -pgisver "${POSTGIS_VER}" -pgport "${PGPORT}" -alg contraction
-perl tools/testers/algorithm-tester.pl -pgver ${PG_VER} -pgisver "${POSTGIS_VER}" -pgport "${PGPORT}"
+#perl tools/testers/algorithm-tester.pl -pgver ${PG_VER} -pgisver "${POSTGIS_VER}" -pgport "${PGPORT}"
+
+if [ $OS_BUILD -eq 32 ]
+then
+
+ perl tools/testers/algorithm-tester.pl -pgver ${PG_VER} -pgisver "${POSTGIS_VER}" -pgport "${PGPORT}"
+
+else
+
+ psql -c "CREATE DATABASE ___pgr___test___"
+ sh tools/testers/pg_prove_tests.sh ${PGUSER}
+ psql -c "DROP DATABASE ___pgr___test___"
+
+fi
cd ${PROJECTS}/pgrouting/build${PGROUTING_VER}w${OS_BUILD}${GCC_TYPE}/lib
strip *.dll
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/pgrouting.git
More information about the Pkg-grass-devel
mailing list