pgRouting · vidhan13j07 · May 26, 2017 · May 18, 2017 · May 19, 2017 · May 19, 2017
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -325,8 +325,14 @@ 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)
+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})
+
+#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}")
@@ -343,9 +349,8 @@ if(WIN32)
 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}")
-
 
 
 #---------------------------------------------
@@ -476,24 +481,28 @@ endif()
 #compiler directives
 #+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 
+# for UNIX & JENKINS
 if(UNIX OR (WIN32 AND NOT MSVC))
     set(CMAKE_C_FLAGS   "${CMAKE_C_FLAGS}  -std=gnu99")
 endif()
 
-
-CHECK_C_COMPILER_FLAG("-frounding-math" C_COMPILER_SUPPORTS_ROUNDING_MATH)
-CHECK_CXX_COMPILER_FLAG("-frounding-math" CXX_COMPILER_SUPPORTS_ROUNDING_MATH)
-
-
 if(NOT WIN32)
-    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC ")
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC ")
+    CHECK_C_COMPILER_FLAG("-fPIC" C_COMPILER_SUPPORTS_FPIC)
+    CHECK_CXX_COMPILER_FLAG("-fPIC" CXX_COMPILER_SUPPORTS_FPIC)
+    if(C_COMPILER_SUPPORTS_FPIC)
+        set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC ")
+    endif()
+    if(CXX_COMPILER_SUPPORTS_FPIC)
+        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC ")
+    endif()
 endif()
 
 if(WIN32 AND MSVC)
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_C_FLAGS}")
 endif()
 
+CHECK_C_COMPILER_FLAG("-frounding-math" C_COMPILER_SUPPORTS_ROUNDING_MATH)
+CHECK_CXX_COMPILER_FLAG("-frounding-math" CXX_COMPILER_SUPPORTS_ROUNDING_MATH)
 if(C_COMPILER_SUPPORTS_ROUNDING_MATH)
     set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -frounding-math ")
 endif()
@@ -505,6 +514,8 @@ endif()
 set(CMAKE_C_FLAGS_DEBUG   "${CMAKE_C_FLAGS_DEBUG}   -Wall -Wconversion -pedantic -Wmissing-prototypes -W -Wunused -Wuninitialized -Wextra -Wdouble-promotion")
 set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -Wall -fno-implicit-inline-templates -Wconversion -pedantic -W -Wunused -Wuninitialized -Wextra -Wdouble-promotion")
 
+
+
 #+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 
 if (PGROUTING_DEBUG)
@@ -583,7 +594,6 @@ add_library(${PGROUTING_LIB_NAME}
     ${LIBRARY_MODE_TARGET}
     ${PGROUTING_OBJECTS})
 
-install(TARGETS ${PGROUTING_LIB_NAME} DESTINATION ${LIBRARY_INSTALL_PATH})
 
 
 if(APPLE)
@@ -612,24 +622,8 @@ add_subdirectory(sql)
 #-----------------------------------------------------------------------------
 #-----------------------------------------------------------------------------
 
-if (WIN32 AND MSVC)
-    SET (LIBS_TO_INSTALL "${CMAKE_BINARY_DIR}/lib/Release/libpgrouting-2.5.dll")
-else()
-    SET (LIBS_TO_INSTALL "${CMAKE_BINARY_DIR}/lib/libpgrouting-2.5.so")
-endif()
-
-# this will create the commands in the makefile under the install target
-#if(UNIX)
-#    file(GLOB_RECURSE LIBS_TO_INSTALL "${CMAKE_BINARY_DIR}/lib/*.so")
-#else()
-#    file(GLOB_RECURSE LIBS_TO_INSTALL "${CMAKE_BINARY_DIR}/lib/*.dll")
-#endif()
-
-message(STATUS "LIBS_TO_INSTALL=${LIBS_TO_INSTALL}")
-
-install(FILES ${LIBS_TO_INSTALL}  DESTINATION ${LIB_DIR})
-
 
+install(TARGETS ${PGROUTING_LIB_NAME} DESTINATION ${LIBRARY_INSTALL_PATH})
 install(FILES
     ${PgRouting_SQL_FILES_TO_INSTALL}
     DESTINATION "${SHARE_DIR}"

diff --git a/README.md b/README.md
@@ -6,8 +6,8 @@
 
 ### Branches
 
-* The *master* branch has the latest minor release.
-* The *develop* branch has the next minor release.
+* The *master* branch has the latest minor release. (2.4.0)
+* The *develop* branch has the next minor release. (2.5.0-dev)
 
 For the complete list of releases go to:
 https://github.com/pgRouting/pgrouting/releases
@@ -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>
@@ -96,7 +95,7 @@ Family of functions include:
 
 Building reqirements
 --------------------
-* perl 
+* Perl 
 * C and C++ compilers
   * GNU >= 4.6
   * MSVC >= 18.0
@@ -126,7 +125,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
@@ -1 +1 @@
-5332-de02a9548 release/2.5
+5440-c5f4530ab develop
diff --git a/ci/appveyor/install.bat b/ci/appveyor/install.bat
@@ -20,7 +20,7 @@ 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 PG_VERSION set PG_VERSION=2.3.2
 if not defined BOOST_VERSION set BOOST_VERSION=1.58.0
 if not defined CGAL_VERSION set CGAL_VERSION=4.8.1
 

diff --git a/include/c_common/arrays_input.h b/include/c_common/arrays_input.h
@@ -26,8 +26,21 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #define INCLUDE_C_COMMON_ARRAYS_INPUT_H_
 #pragma once
 
-#include "c_types/pgr_types.h"
+
+// first file to include
+#ifdef __GNUC__
+#pragma GCC diagnostic ignored "-pedantic"
+#endif
+
+#include <postgres.h>
+
+#ifdef __GNUC__
+#pragma GCC diagnostic pop
+#endif
+
+// for ArrayType
 #include "utils/array.h"
+#include <stdint.h>
 
 
 /** @brief enforces the input array to be @b NOT empty */

diff --git a/include/c_common/postgres_connection.h b/include/c_common/postgres_connection.h
@@ -31,6 +31,10 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #pragma GCC diagnostic ignored "-pedantic"
 #endif
 
+#ifdef __clang__
+#pragma clang diagnostic ignored "-pedantic"
+#endif
+
 #include <postgres.h>
 
 
@@ -40,6 +44,11 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #pragma GCC diagnostic ignored "-Wunused-parameter"
 #endif
 
+#ifdef __clang__
+#pragma clang diagnostic ignored "-Wsign-conversion"
+#pragma clang diagnostic ignored "-Wunused-parameter"
+#endif
+
 #include "executor/spi.h"
 
 #ifdef __GNUC__
@@ -48,12 +57,21 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #pragma GCC diagnostic pop
 #endif
 
+#ifdef __clang__
+#pragma clang diagnostic pop
+#pragma clang diagnostic pop
+#pragma clang diagnostic pop
+#endif
+
 #include "utils/builtins.h"  // for text_to_cstring
 
 #if PGSQL_VERSION > 92
 #include "access/htup_details.h"
 #endif
 
+#ifdef __clang__
+#pragma clang diagnostic ignored "-Wunused-parameter"
+#endif
 
 #ifdef __GNUC__
 #pragma GCC diagnostic ignored "-Wunused-parameter"
@@ -66,6 +84,10 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #pragma GCC diagnostic pop
 #endif
 
+#ifdef __clang__
+#pragma clang diagnostic pop
+#endif
+
 
 void pgr_send_error(int errcode);
 void pgr_SPI_finish(void);

diff --git a/include/c_types/pgr_types.h → include/c_types/contracted_rt.h b/include/c_types/pgr_types.h → include/c_types/contracted_rt.h
@@ -1,8 +1,8 @@
 /*PGR-GNU*****************************************************************
-File: pgr_types.h
+File: contracted_rt.h
 
-Copyright (c) 2015 Celia Virginia Vergara Castillo
-Mail: vicky_vergara@hotmail.com
+Copyright (c) 2017 pgRouting developers
+Mail: project@pgrouting.org
 
 ------
 
@@ -23,8 +23,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 ********************************************************************PGR-GNU*/
 /*! @file */
 
-#ifndef INCLUDE_C_TYPES_PGR_TYPES_H_
-#define INCLUDE_C_TYPES_PGR_TYPES_H_
+#ifndef INCLUDE_C_TYPES_CONTRACTED_RT_H_
+#define INCLUDE_C_TYPES_CONTRACTED_RT_H_
 #pragma once
 
 
@@ -55,22 +55,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #include <stdint.h>
 
 
-typedef struct {
-    int64_t vertex_id;
-    int64_t edge_id;
-    double cost;
-} path_element_t;
-
-
-
-typedef struct {
-    int seq;
-    int64_t source;
-    int64_t edge;
-    double cost;
-} pgr_path_t;
-
-
 /**************************************************************************
  * return type for contraction
  * ***********************************************************************/
@@ -82,6 +66,6 @@ typedef struct {
     double cost;
     int64_t *contracted_vertices;
     int contracted_vertices_size;
-} pgr_contracted_blob;
+} contracted_rt;
 
-#endif  // INCLUDE_C_TYPES_PGR_TYPES_H_
+#endif  // INCLUDE_C_TYPES_CONTRACTED_RT_H_
diff --git a/include/vrp/fleet.h b/include/vrp/fleet.h
@@ -107,9 +107,9 @@ class Fleet : public PD_problem {
              Vehicle_t,
              double factor,
              std::unique_ptr<Base_node>,
-             Vehicle_node,
+             const Vehicle_node&,
              std::unique_ptr<Base_node>,
-             Vehicle_node);
+             const Vehicle_node&);
 
      template <typename T> std::unique_ptr<Base_node> create_b_start(
              const Vehicle_t &vehicle,

diff --git a/include/vrp/vehicle.h b/include/vrp/vehicle.h
@@ -98,7 +98,7 @@ class Vehicle : public Identifier, public PD_problem {
 
 
      bool is_phony() const {return id() < 0;}
-     bool speed() const;
+     double speed() const;
 
      /*! @name deque like functions