Skip to content
Commits on Source (10)
......@@ -2,7 +2,9 @@
build
fix_typos
code_linter
.DS_Store
.vagrant
.directory
notUsed
*.swp
......@@ -7,7 +7,6 @@
#choose trusty
group: edge
dist: trusty
sudo: required
......@@ -22,13 +21,22 @@ env: POSTGRESQL_VERSION=9.6 PG_USER=postgres
matrix:
include:
- os: linux
env: POSTGRESQL_VERSION=9.6 PG_USER=postgres
env: POSTGRESQL_VERSION=10 PG_USER=postgres DOCUMENTATION=OFF
- os: linux
env: POSTGRESQL_VERSION=9.6 PG_USER=postgres DOCUMENTATION=OFF
- os: linux
env: POSTGRESQL_VERSION=9.5 PG_USER=postgres DOCUMENTATION=OFF
- os: linux
env: POSTGRESQL_VERSION=9.5 PG_USER=postgres
env: POSTGRESQL_VERSION=9.4 PG_USER=postgres DOCUMENTATION=OFF
- os: linux
env: POSTGRESQL_VERSION=9.3 PG_USER=postgres DOCUMENTATION=OFF
- os: linux
env: POSTGRESQL_VERSION=9.6 PG_USER=postgres DOCUMENTATION=ON
# executed. So things have to be tested oe by one.
......@@ -56,12 +64,11 @@ addons:
install:
- pip install sphinx
- sudo ./tools/travis/install-doxygen.sh
- sudo ./tools/travis/install-postgres.sh $POSTGRESQL_VERSION $PG_USER
- if [ "$TRAVIS_OS_NAME" == "linux" ]; then sudo ./tools/travis/install-doxygen.sh ; fi
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
......@@ -74,10 +81,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/testers/pg_prove_tests.sh $PG_USER DEBUG
- if [ "$DOCUMENTATION" == "OFF" ]; then ./tools/testers/pg_prove_tests.sh $PG_USER 5432 DEBUG ; fi
#after_script:
- ./tools/travis/pgrouting_test.sh $POSTGRESQL_VERSION $PG_USER -ignorenotice
- ./tools/travis/pgrouting_test.sh $POSTGRESQL_VERSION $PG_USER
#after_success:
# blank
......@@ -113,7 +113,7 @@ endif()
set(DOXYGEN_MINIMUM_VERSION "1.7")
set(SPHINX_MINIMUM_VERSION "1.1")
set(POSTGRESQL_MINIMUM_VERSION "9.2.0")
set(BOOST_MINIMUM_VERSION "1.46")
set(BOOST_MINIMUM_VERSION "1.53")
set(CGAL_CXX_MINIMUM_VERSION "4.4")
set(POSTGIS_MINIMUM_VERSION "2.0.0")
set(GNU_CXX_MINIMUM_VERSION "4.6")
......@@ -181,8 +181,8 @@ endif()
#-----------------------------------------------------------------------------
set(PGROUTING_VERSION_MAJOR "2")
set(PGROUTING_VERSION_MINOR "5")
set(PGROUTING_VERSION_PATCH "2")
set(PGROUTING_VERSION_MINOR "6")
set(PGROUTING_VERSION_PATCH "0")
set(PGROUTING_VERSION_DEV "")
set(PGROUTING_SHORT_VERSION "${PGROUTING_VERSION_MAJOR}.${PGROUTING_VERSION_MINOR}")
......@@ -301,7 +301,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 +323,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}")
#---------------------------------------------
......@@ -360,8 +361,6 @@ include_directories(${CGAL_INCLUDE_DIR})
#---------------------------------------------
set(PGROUTING_INCLUDE_DIRECTORIES
${PGROUTING_SOURCE_DIR}/src/common/src
${PGROUTING_SOURCE_DIR}/src/dijkstra/src
${PGROUTING_SOURCE_DIR}/include
)
......@@ -521,7 +520,7 @@ endif()
#-------------------
foreach (subdir ${PgRouting_SOURCE_NAMES})
add_subdirectory("${PGROUTING_SOURCE_DIR}/src/${subdir}/src")
add_subdirectory("${PGROUTING_SOURCE_DIR}/src/${subdir}")
endforeach()
......@@ -554,7 +553,6 @@ endforeach()
# PGROUTING Library names
#-----------------------------------------------------------------------------
message("Building the library names")
#----------------------
# PGROUTING installation files names have the following name
......
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])
* without restrictions
* calls pgr_dijkstra when both end points have a fraction IN (0,1)
* calls pgr_withPoints when at least one fraction NOT IN (0,1)
* with restrictions
* calls original trsp code
*Internal code*
* Cleaned the internal code of trsp(text,integer,integer,boolean,boolean [, text])
* Removed the use of pointers
* Internal code can accept BIGINT
* Cleaned the internal code of withPoints
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
-------------------------------------------------------------------------------
......@@ -6,7 +50,7 @@ To see the issues closed by this release see the [Git closed milestone for 2.5.2
*Bug fixes*
* Fix for postgresql 10.1: Removed a copiler condition
* Fix for postgresql 10.1: Removed a compiler condition
......@@ -62,6 +106,7 @@ To see the issues closed by this release see the [Git closed issues for 2.5.0 ](
* pgr_bdDijkstraCost(many to many)
* pgr_bdDijkstraCostMatrix
* pgr_lineGraph
* pgr_lineGraphFull
* pgr_connectedComponents
* pgr_strongComponents
* pgr_biconnectedComponents
......
......@@ -32,14 +32,14 @@ https://github.com/pgRouting/pgrouting/releases
<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><img src="https://winnie.postgis.net:444/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><img src="https://winnie.postgis.net:444/buildStatus/icon?job=pgRouting_matrix_branch_develop" alt="Jenkins Status"/></td>
<td></td>
</tr>
<tr>
......@@ -105,7 +105,7 @@ Building reqirements
* GNU >= 4.6
* MSVC >= 18.0
* Postgresql >= 9.2
* The Boost Graph Library (BGL) >= 1.46
* The Boost Graph Library (BGL) >= 1.53
* CMake >= 3.2
* CGAL >= 4.4
* Sphinx >= 1.2
......
6254-60585f1f7 master
6756-a6226c4 release/2.6
......@@ -5,7 +5,7 @@
# Main configuration
# ------------------------------------------------------------------------------
version: 2.5.{build}
version: 2.6.{build}
image: Visual Studio 2013
configuration: Release
......@@ -19,14 +19,15 @@ cache:
- c:\build\local\msvc120\x64 -> appveyor
services:
- postgresql94
- postgresql96
environment:
CONFIGURATION: Release
MSVC_VER: 12.0
BUILD_ROOT_DIR: c:\build
PGIS_VERSION: 2.3.3
PG_VER: 9.4
PGIS_VERSION: 2.4
PG_VER: 9.6
init:
- git config --global core.autocrlf false
......@@ -54,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\""
......@@ -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 PGIS_VERSION set PGIS_VERSION=2.3.3
if not defined PGIS_VERSION set PGIS_VERSION=2.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:.=%
......@@ -61,9 +61,14 @@ for /f "tokens=* delims=" %%a in ('cmake --version') do (
set CURR_CMAKE=%CURR_CMAKE:~14%
echo cmake %CURR_CMAKE% found
if "%CURR_CMAKE%" GTR "%CMAKE_VERSION%" (
CALL ci\appveyor\vercompare.bat "%CURR_CMAKE%" "%CMAKE_VERSION%"
echo "errorlevel %ERRORLEVEL%"
if %ERRORLEVEL% EQU 0 (
echo cmake %CMAKE_VERSION% already installed
) else (
CALL SET
echo Downloading cmake %CMAKE_VERSION%
pushd %DOWNLOADS_DIR%
curl -L -O -S -s https://cmake.org/files/v3.5/cmake-%CMAKE_VERSION%-win32-%platform%.msi
......@@ -97,13 +102,19 @@ echo ====================================
:: Download and install Postgis
::
set PGIS_WILD_FILE=postgis-%PG_VER_NO_DOT%-binaries-%PGIS_VERSION*%w%arch%gcc%GCC%.zip
set PGIS_FILE=postgis-%PG_VER_NO_DOT%-binaries-%PGIS_VERSION%w%arch%gcc%GCC%.zip
echo %PGIS_WILD_FILE%
echo %PGIS_FILE%
echo ==================================== POSTGIS
if not exist "C:\Progra~1\PostgreSQL\%PG_VER%\makepostgisdb_using_extensions.bat" (
if not exist "C:\Progra~1\PostgreSQL\%PG_VER%\%PGIS_WILD_FILE%" (
cd %APPVEYOR_BUILD_FOLDER%
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/%PG_VER_NO_DOT%/buildbot/archive/postgis-%PG_VER_NO_DOT%-binaries-%PGIS_VERSION%w%arch%gcc%GCC%.zip
curl -L -O -S -s http://winnie.postgis.net/download/windows/appveyor/postgis-%PG_VER_NO_DOT%-binaries-%PGIS_VERSION%w%arch%gcc%GCC%.zip
popd
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 !!!!!!!!!
......@@ -114,17 +125,22 @@ if not exist "C:\Progra~1\PostgreSQL\%PG_VER%\makepostgisdb_using_extensions.bat
echo Extracting PostGIS %PGIS_VERSION%
pushd %DOWNLOADS_DIR%
dir
7z x -o%BUILD_ROOT_DIR%\ postgis-%PG_VER_NO_DOT%-binaries-%PGIS_VERSION%w%arch%gcc%GCC%.zip
dir
popd
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\%PG_VER%\makepostgisdb_using_extensions.bat" (
echo something went wrong on PostGIS %PGIS_VERSION% installation !!!!!!!!!
dir %BUILD_ROOT_DIR%\postgis*
dir C:\Progra~1\PostgreSQL\%PG_VER%\postgis*
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%
dir %BUILD_ROOT_DIR%\postgis*
dir C:\Progra~1\PostgreSQL\%PG_VER%\postgis*
if not exist "C:\Progra~1\PostgreSQL\%PG_VER%\%PGIS_WILD_FILE%" (
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\%PG_VER%\
Exit \B 1
if defined LOCAL_DEBUG dir C:\Progra~1\PostgreSQL\%PG_VER%\postgis*
) else (
echo **** PostGIS %PGIS_VERSION% %arch% installed
)
......
@echo off
:: left: the installed version
:: right: the requiered min version
:: return 0 when installed version < requiered version
:: return 1 when installed version >= requiered version
SETLOCAL
set left=%1
set right=%2
for /f "tokens=1-3 delims=." %%a in (%left%) do (
set VersionLeftMajor=%%a
set VersionLeftMinor=%%b
set VersionLeftBuild=%%c
)
for /f "delims=. tokens=1,2,3" %%a in ("%right%") do (
set VersionRightMajor=%%a
set VersionRightMinor=%%b
set VersionRightBuild=%%c
)
:: examples
:: 3.2.12 > 2.3.1 ===> 1 installed does fulfill requiered
if "%VersionLeftMajor%" GTR "%VersionRight.Major%" (
EXIT /B 0
)
:: 1.2.12 > 3.3.1 ===> 0 installed does not fulfill requiered
if %VersionLeftMajor% LSS %VersionRightMajor% (
EXIT /B 1
)
:: the Major's are equal
:: 3.5.12 >= 3.3.1 ===> 1 installed does fulfill requiered
if %VersionLeftMinor% GEQ %VersionRightMinor% (
EXIT /B 0
)
:: 3.2.12 > 3.3.1 ===> 0 installed does not fulfill requiered regardless of build
EXIT /B 1
:exit
exit /b
#!/bin/sh
#--
# Jenkins variables passed in
#--
#
# export BRANCH=develop
export PGROUTING_VER=$BRANCH
#-------------------------
# File used in Jenkins setup
#-------------------------
export PATH=${PATH}:/usr/local::/usr/local/lib::/usr/local/bin
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
sudo make install
cd ../${BRANCH}
perl tools/testers/algorithm-tester.pl
psql -c "CREATE DATABASE ___pgr___test___"
sh tools/testers/pg_prove_tests.sh ${PGUSER}
psql -c "DROP DATABASE ___pgr___test___"
#!/bin/sh
#--
# Jenkins variables passed in
#--
#
# export BRANCH=develop
export PGROUTING_VER=$BRANCH
#-------------------------
# File used in Jenkins setup
#-------------------------
export PATH=${PATH}:/usr/local::/usr/local/lib::/usr/local/bin
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
sudo make install
cd ../${BRANCH}
perl tools/testers/algorithm-tester.pl
psql -c "CREATE DATABASE ___pgr___test___"
sh tools/testers/pg_prove_tests.sh ${PGUSER}
psql -c "DROP DATABASE ___pgr___test___"
#!/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"
pgrouting (2.5.2-2) UNRELEASED; urgency=medium
pgrouting (2.6.0-1) unstable; urgency=medium
* Team upload.
* New upstream release.
* Update copyright-format URL to use HTTPS.
* Add lintian overrides for vcs-deprecated-in-debian-infrastructure.
* Update copyright holders in copyright file.
* Refresh patches.
* Bump Standards-Version to 4.1.3, no changes.
* Drop unused override for hardening-no-fortify-functions.
-- Bas Couwenberg <sebastic@debian.org> Sun, 21 Jan 2018 10:23:34 +0100
-- Bas Couwenberg <sebastic@debian.org> Tue, 20 Mar 2018 17:17:00 +0100
pgrouting (2.5.2-1) unstable; urgency=medium
......
......@@ -13,7 +13,7 @@ Build-Depends: cmake (>= 3.2),
python-sphinx (>= 1.0.7+dfsg),
python3-sphinx (>= 1.0.7+dfsg),
rdfind,
Standards-Version: 4.1.1
Standards-Version: 4.1.3
Vcs-Browser: https://anonscm.debian.org/cgit/pkg-grass/pgrouting.git
Vcs-Git: https://anonscm.debian.org/git/pkg-grass/pgrouting.git
Homepage: http://www.pgrouting.org
......
......@@ -13,7 +13,7 @@ Build-Depends: cmake (>= 3.2),
python-sphinx (>= 1.0.7+dfsg),
python3-sphinx (>= 1.0.7+dfsg),
rdfind,
Standards-Version: 4.1.1
Standards-Version: 4.1.3
Vcs-Browser: https://anonscm.debian.org/cgit/pkg-grass/pgrouting.git
Vcs-Git: https://anonscm.debian.org/git/pkg-grass/pgrouting.git
Homepage: http://www.pgrouting.org
......