merging master latest changes

CMakeLists.txt

@@ -184,6 +184,7 @@ set(PGROUTING_VERSION_MAJOR "2")
 set(PGROUTING_VERSION_MINOR "6")
 set(PGROUTING_VERSION_PATCH "0")
 set(PGROUTING_VERSION_DEV "-dev")
+set(PGROUTING_VERSION_DEV "")
 
 set(PGROUTING_SHORT_VERSION "${PGROUTING_VERSION_MAJOR}.${PGROUTING_VERSION_MINOR}")
 set(PGROUTING_VERSION "${PGROUTING_VERSION_MAJOR}.${PGROUTING_VERSION_MINOR}.${PGROUTING_VERSION_PATCH}")
@@ -301,7 +302,7 @@ endif()
 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})
+string(REGEX REPLACE "^([0-9]+)[beta|alpha|rc|devel].*" "\\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})
@@ -323,6 +324,7 @@ endif(WIN32)
 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DPGSQL_VERSION=${PGSQL_VERSION}")
 set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -DPGSQL_VERSION=${PGSQL_VERSION}")
 set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -DPGSQL_VERSION=${PGSQL_VERSION}")
+message(STATUS "PGSQL_VERSION=${PGSQL_VERSION}")
 
 
 #---------------------------------------------

NEWS

@@ -5,6 +5,10 @@ pgRouting 2.6.0 Release Notes
 To see the issues closed by this release see the [Git closed milestone for 2.6.0 ](https://github.com/pgRouting/pgrouting/issues?utf8=%E2%9C%93&q=milestone%3A%22Release%202.6.0%22%20) on Github.
 
 
+*New fexperimental functions*
+
+*  pgr_lineGraphFull
+
 *Bug fixes*
 
 * Fix pgr_trsp(text,integer,double precision,integer,double precision,boolean,boolean[,text])
@@ -29,6 +33,25 @@ To see the issues closed by this release see the [Git closed milestone for 2.6.0
 
 
 
+pgRouting 2.5.3 Release Notes
+-------------------------------------------------------------------------------
+
+To see the issues closed by this release see the [Git closed milestone for 2.5.3 ](https://github.com/pgRouting/pgrouting/issues?utf8=%E2%9C%93&q=milestone%3A%22Release%202.5.3%22%20) on Github.
+
+*Bug fixes*
+
+* Fix for postgresql 11: Removed a compilation error when compiling with postgreSQL
+
+
+pgRouting 2.5.2 Release Notes
+-------------------------------------------------------------------------------
+
+To see the issues closed by this release see the [Git closed milestone for 2.5.2 ](https://github.com/pgRouting/pgrouting/issues?utf8=%E2%9C%93&q=milestone%3A%22Release%202.5.2%22%20) on Github.
+
+*Bug fixes*
+
+* Fix for postgresql 10.1: Removed a compiler condition
+
 
 
 pgRouting 2.5.1 Release Notes

README.md

@@ -6,8 +6,8 @@
 
 ### Branches
 
-* The *master* branch has the release  2.5.1
-* The *release/2.5* branch has the next micro-release 2.5.2 (if needed)
+* The *master* branch has the release  2.5.2
+* The *release/2.5* branch has the next micro-release 2.5.3 (if needed)
 * The *develop* branch has the development of the next minor-release 2.6.0-dev
 
 For the complete list of releases go to:

VERSION

@@ -1 +1 @@
-6700-48ae8a4 release/2.6
+6709-4de9050 release/2.6

appveyor.yml

@@ -55,4 +55,4 @@ test_script:
   - 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/%PG_VER%/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\""

ci/debbie/regress.sh

@@ -0,0 +1,87 @@
+#!/bin/bash
+#--
+# Jenkins variables passed in
+#--
+#
+# export BRANCH=develop
+export PGROUTING_VER=$BRANCH
+export OS_BUILD=64
+export PG_VER=11
+export PGSQL_VERSION=110
+export PGPORT=5411
+export GEOS_VER=3.7.0dev
+export GDAL_VER=2.2
+export PROJECTS=${JENKINS_HOME}/workspace
+export PGPATH=${PROJECTS}/pg/rel/pg${PG_VER}w${OS_BUILD}
+export PGDATA=${PGPATH}/data_${PGPORT}
+export PGDATABASE=postgres
+export PGUSER=postgres
+export LD_LIBRARY_PATH="${PROJECTS}/gdal/rel-${GDAL_VER}w${OS_BUILD}/lib:${PROJECTS}/geos/rel-${GEOS_VER}w${OS_BUILD}/lib:${PGPATH}/lib"
+export PATH="${PATH}:${PGPATH}/bin:${PGPATH}/lib:${PGPATH}/include"
+export POSTGIS_VER=2.5.0dev
+
+#---
+# start the pg sever
+# --
+export PGLOCALEDIR=${PGPATH}/share/locale
+
+DAEMON=${PGPATH}/bin/postmaster
+PGSTARTLOG=${PGDATA}/start_log.log
+
+
+#initialize the database
+${PGPATH}/bin/initdb -U postgres -D ${PGDATA} -A trust
+
+# check to see if pg is already running
+state=`${PGPATH}/bin/pg_ctl status -D ${PGDATA} -l ${PGDATA}/logfile | grep "server is running" `
+
+# start pg if not running
+if [ "0" == "0$state" ]; then
+  ${PGPATH}/bin/pg_ctl start -D ${PGDATA} -l ${PGDATA}/logfile >> ${PGSTARTLOG} 2>&1
+fi
+echo "ok"
+
+#--
+# end start pg server
+#
+
+#-------------------------
+# File used in Jenkins setup
+#-------------------------
+
+echo $PATH
+export PGUSER=postgres
+export PGROUTING_VER=$BRANCH
+
+rm -rf ${WORKSPACE}/build${BRANCH}
+mkdir ${WORKSPACE}/build${BRANCH}
+
+cmake --version
+
+cd ../build${BRANCH}
+cmake ../${BRANCH}
+
+make
+make install
+cd ../${BRANCH}
+export PERL5LIB=$(echo pwd)
+perl tools/testers/algorithm-tester.pl -pgisver "${POSTGIS_VER}" -pgport "${PGPORT}"
+
+#pgTap tests disable for now until we have installed
+if false; then
+psql -c "CREATE DATABASE ___pgr___test___"
+sh tools/testers/pg_prove_tests.sh ${PGUSER}
+psql -c "DROP DATABASE ___pgr___test___"
+fi
+
+#stop the postgres server
+state=`${PGPATH}/bin/pg_ctl status -D ${PGDATA} -l ${PGPATH}/data/logfile | grep "server is running"`
+echo $state
+
+if [ "0" != "0$state" ]; then
+  ${PGPATH}/bin/pg_ctl stop -D ${PGDATA} -l logfile -m fast
+  rm -rf ${PGDATA}
+fi
+echo "done"
+
+

doc/allpairs/allpairs-family.rst

@@ -13,7 +13,7 @@
 All Pairs - Family of Functions
 ===============================================================================
 
-The following functions work an all vertices pair combinations
+The following functions work on all vertices pair combinations
 
 .. index from here
 

doc/allpairs/pgr_floydWarshall.rst

@@ -30,7 +30,7 @@ pair of nodes in the graph using Floyd-Warshall algorithm.
 
 The Floyd-Warshall algorithm, also known as Floyd's algorithm,
 is a good choice to calculate the sum of the costs of the shortest path for each
-pair of nodes in the graph, for *dense graphs*. We make use of the  Boost's
+pair of nodes in the graph, for *dense graphs*. We use Boost's
 implementation which runs in :math:`\Theta(V^3)` time,
 
 

doc/src/release_notes.rst

@@ -19,6 +19,8 @@ To see the full list of changes check the list of `Git commits <https://github.c
 .. changelog start
 
 * :ref:`changelog_2_6_0`
+* :ref:`changelog_2_5_3`
+* :ref:`changelog_2_5_2`
 * :ref:`changelog_2_5_1`
 * :ref:`changelog_2_5_0`
 * :ref:`changelog_2_4_2`
@@ -47,6 +49,10 @@ pgRouting 2.6.0 Release Notes
 To see the issues closed by this release see the `Git closed milestone for 2.6.0 <https://github.com/pgRouting/pgrouting/issues?utf8=%E2%9C%93&q=milestone%3A%22Release%202.6.0%22%20>`_ on Github.
 
 
+.. rubric:: New fexperimental functions
+
+*  pgr_lineGraphFull
+
 .. rubric:: Bug fixes
 
 * Fix pgr_trsp(text,integer,double precision,integer,double precision,boolean,boolean[,text])
@@ -70,6 +76,27 @@ To see the issues closed by this release see the `Git closed milestone for 2.6.0
 * Cleaned the internal code of withPoints
 
 
+.. _changelog_2_5_3:
+
+pgRouting 2.5.3 Release Notes
+-------------------------------------------------------------------------------
+
+To see the issues closed by this release see the `Git closed milestone for 2.5.3 <https://github.com/pgRouting/pgrouting/issues?utf8=%E2%9C%93&q=milestone%3A%22Release%202.5.3%22%20>`_ on Github.
+
+.. rubric:: Bug fixes
+
+* Fix for postgresql 11: Removed a compilation error when compiling with postgreSQL
+
+.. _changelog_2_5_2:
+
+pgRouting 2.5.2 Release Notes
+-------------------------------------------------------------------------------
+
+To see the issues closed by this release see the `Git closed milestone for 2.5.2 <https://github.com/pgRouting/pgrouting/issues?utf8=%E2%9C%93&q=milestone%3A%22Release%202.5.2%22%20>`_ on Github.
+
+.. rubric:: Bug fixes
+
+* Fix for postgresql 10.1: Removed a compiler condition
 
 
 .. _changelog_2_5_1:

include/c_common/postgres_connection.h

@@ -32,6 +32,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #endif
 
 #ifdef __clang__
+#pragma clang diagnostic push
 #pragma clang diagnostic ignored "-pedantic"
 #endif
 
@@ -49,7 +50,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #endif
 
 #ifdef __clang__
+#pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wsign-conversion"
+#pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wunused-parameter"
 #endif
 
@@ -75,6 +78,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #endif
 
 #ifdef __clang__
+#pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wunused-parameter"
 #endif
 

sql/sigs/CMakeLists.txt

@@ -1,4 +1,5 @@
 SET(OLD_SIGNATURES
+    2.5.3
     2.5.2
     2.5.1
     2.5.0