[Git][debian-gis-team/pgrouting][master] 4 commits: New upstream version 3.2.2
Bas Couwenberg (@sebastic)
gitlab at salsa.debian.org
Sat Oct 23 19:03:50 BST 2021
Bas Couwenberg pushed to branch master at Debian GIS Project / pgrouting
Commits:
c35c2a21 by Bas Couwenberg at 2021-10-23T19:40:49+02:00
New upstream version 3.2.2
- - - - -
53077ce9 by Bas Couwenberg at 2021-10-23T19:41:12+02:00
Update upstream source from tag 'upstream/3.2.2'
Update to upstream version '3.2.2'
with Debian dir 4c6de8447c57e248911a8669d47e749ff5115198
- - - - -
99bca7a0 by Bas Couwenberg at 2021-10-23T19:41:51+02:00
New upstream release.
- - - - -
3452a6fd by Bas Couwenberg at 2021-10-23T19:44:11+02:00
Set distribution to unstable.
- - - - -
25 changed files:
- .editorconfig
- .github/workflows/update.yml
- .github/workflows/windows.yml
- CMakeLists.txt
- NEWS
- − appveyor.yml
- − ci/appveyor/install-boost.bat
- − ci/appveyor/install.bat
- − ci/appveyor/msbuild_pgrouting.bat
- − ci/appveyor/vercompare.bat
- debian/changelog
- doc/src/pgRouting-introduction.rst
- doc/src/release_notes.rst
- docqueries/version/doc-full_version.result
- docqueries/version/doc-version.result
- include/cpp_common/interruption.h
- include/cpp_common/pgr_base_graph.hpp
- pgtap/tsp/performance/qa194.sql
- src/contraction/contractGraph_driver.cpp
- src/pickDeliver/pickDeliverEuclidean.c
- src/transitiveClosure/transitiveClosure_driver.cpp
- src/tsp/TSP_driver.cpp
- src/tsp/euclideanTSP_driver.cpp
- src/tsp/tsp.cpp
- src/withPoints/get_new_queries.cpp
Changes:
=====================================
.editorconfig
=====================================
@@ -30,6 +30,7 @@ indent_size = 2
# YML files want space indentation
[*.yml]
+indent_size = 2
indent_style = space
[.github/workflow/*.yml]
=====================================
.github/workflows/update.yml
=====================================
@@ -16,7 +16,7 @@ jobs:
strategy:
fail-fast: false
matrix:
- old_pgr: [3.0.0, 3.0.1, 3.0.2, 3.0.3, 3.0.4, 3.0.5, 3.1.0, 3.1.1, 3.1.2, 3.1.3, 3.2.0]
+ old_pgr: [3.0.0, 3.0.1, 3.0.2, 3.0.3, 3.0.4, 3.0.5, 3.1.0, 3.1.1, 3.1.2, 3.1.3, 3.2.0, 3.2.1]
steps:
- uses: actions/checkout at v2
@@ -98,7 +98,7 @@ jobs:
- name: Test old version after update
run: |
sudo service postgresql start
- sudo -u postgres psql -p 5432 -d ___pgr___test___ -c "ALTER EXTENSION pgrouting UPDATE TO '3.2.1';"
+ sudo -u postgres psql -p 5432 -d ___pgr___test___ -c "ALTER EXTENSION pgrouting UPDATE TO '3.2.2';"
sudo -u postgres psql -p 5432 -d ___pgr___test___ -c "SELECT * FROM pgr_full_version();"
sudo -u postgres bash ./tools/testers/pg_prove_tests.sh postgres 5432
sudo -u postgres dropdb -p 5432 ___pgr___test___
@@ -114,6 +114,6 @@ jobs:
- name: Test old version with new lib after update
run: |
- sudo -u postgres psql -p 5432 -d ___pgr___test___ -c "ALTER EXTENSION pgrouting UPDATE TO '3.2.1';"
+ sudo -u postgres psql -p 5432 -d ___pgr___test___ -c "ALTER EXTENSION pgrouting UPDATE TO '3.2.2';"
sudo -u postgres psql -p 5432 -d ___pgr___test___ -c "SELECT * FROM pgr_full_version();"
sudo -u postgres bash ./tools/testers/pg_prove_tests.sh postgres 5432
=====================================
.github/workflows/windows.yml
=====================================
@@ -3,62 +3,59 @@ name: Build for Windows
on:
push:
branches-ignore:
- - '**'
+ - 'gh-pages'
+
+env:
+ postgis_version: 3
jobs:
build:
name: Build
- runs-on: ${{ matrix.os }}
+ runs-on: windows-latest
strategy:
- matrix:
- psql: [10]
- os: [windows-latest]
+ matrix:
+ pg_major: [11.13, 12.8, 13.4]
steps:
- # - name: Add PostgreSQL APT repository
- # run: |
- # sudo apt-get install curl ca-certificates gnupg
- # curl https://www.postgresql.org/media/keys/ACCC4CF8.asc | sudo apt-key add -
- # sudo sh -c 'echo "deb http://apt.postgresql.org/pub/repos/apt/ \
- # $(lsb_release -cs)-pgdg main" > /etc/apt/sources.list.d/pgdg.list'
-
- # - name: Install dependencies
- # run: |
- # sudo apt-get update
- # sudo apt-get install -y \
- # libboost-graph-dev \
- # libtap-parser-sourcehandler-pgtap-perl \
- # postgresql-${{ matrix.psql }} \
- # postgresql-${{ matrix.psql }}-pgtap \
- # postgresql-${{ matrix.psql }}-postgis-${{ matrix.postgis }} \
- # postgresql-${{ matrix.psql }}-postgis-${{ matrix.postgis }}-scripts \
- # postgresql-server-dev-${{ matrix.psql }} \
- # python-sphinx
-
- name: Checkout repository
uses: actions/checkout at v2
- # - name: Prepare
- # run: |
- # sphinx-build --version
- # sudo -u postgres psql -p 5432 -c "CREATE EXTENSION postgis"
- # export PATH=/usr/lib/postgresql/${{ matrix.psql }}/bin:$PATH
- # sudo -u postgres createdb ___pgr___test___
- # sudo -u postgres createdb pgr_test__db__test
-
- # - name: Configure
- # run: |
- # mkdir build
- # cd build
- # cmake -DPOSTGRESQL_VERSION=${{ matrix.psql }} -DCMAKE_BUILD_TYPE=Release -DWITH_DOC=OFF ..
-
- # - name: Build
- # run: |
- # cd build
- # make
- # sudo make install
-
- # - name: Test
- # run: |
- # sudo -u postgres bash ./tools/testers/pg_prove_tests.sh postgres 5432 Release
+ - name: Install boost
+ uses: MarkusJx/install-boost at v1.0.1
+ id: install-boost
+ with:
+ # REQUIRED: Specify the required boost version
+ # A list of supported versions can be found here:
+ # https://github.com/actions/boost-versions/blob/main/versions-manifest.json
+ boost_version: 1.73.0
+
+ - name: Add msbuild to PATH
+ uses: microsoft/setup-msbuild at v1.0.3
+
+ - name: Install PostgreSQL
+ run: |
+ curl https://get.enterprisedb.com/postgresql/postgresql-${{ matrix.pg_major }}-1-windows-x64-binaries.zip --output pgsql.zip
+ Expand-Archive 'pgsql.zip' -Force
+ $env:path += ";$(Get-Location)\pgsql\pgsql\bin\"
+ $env:path -split ";"
+ initdb -D pgsql\data -U postgres
+ pg_ctl -D pgsql\data start
+ echo "POSTGRESQL_DIR=$pwd\pgsql\pgsql" >> $env:GITHUB_ENV
+
+ - name: Check Postgres running
+ run: |
+ ${{ env.POSTGRESQL_DIR }}\bin\psql -U postgres -d postgres -c "SELECT version()"
+
+ - name: Configure
+ run: |
+ mkdir build
+ cd build
+ cmake -DPOSTGRESQL_BIN=${{ env.POSTGRESQL_DIR }}\bin -DPOSTGRESQL_INCLUDE_DIR="${{ env.POSTGRESQL_DIR }}\include;${{ env.POSTGRESQL_DIR }}\include\server" -G"Visual Studio 16 2019" -DCMAKE_BUILD_TYPE=Release -DWITH_DOC=OFF ..
+ env:
+ BOOST_ROOT: ${{ steps.install-boost.outputs.BOOST_ROOT }}
+
+ - name: build
+ run: |
+ cd build
+ msbuild PGROUTING.sln /target:Build /property:Configuration=Release
=====================================
CMakeLists.txt
=====================================
@@ -18,7 +18,7 @@ include(pgr/BuildType)
#---------------------------------------------
#---------------------------------------------
-project(PGROUTING VERSION 3.2.1
+project(PGROUTING VERSION 3.2.2
LANGUAGES C CXX )
set(PROJECT_VERSION_DEV "")
string(TOLOWER "${PROJECT_NAME}" PROJECT_NAME_LOWER)
@@ -33,9 +33,9 @@ string(TIMESTAMP COMPILATION_DATE "%Y/%m/%d")
set(MINORS 3.2 3.1 3.0 2.6)
set(OLD_SIGNATURES
- 3.2.0
- 3.1.3 3.1.2 3.1.1 3.1.0
- 3.0.5 3.0.4 3.0.3 3.0.2 3.0.1 3.0.0
+ 3.2.1 3.2.0
+ 3.1.4 3.1.3 3.1.2 3.1.1 3.1.0
+ 3.0.6 3.0.5 3.0.4 3.0.3 3.0.2 3.0.1 3.0.0
2.6.3 2.6.2 2.6.1 2.6.0
)
=====================================
NEWS
=====================================
@@ -1,3 +1,13 @@
+pgRouting 3.2.2 Release Notes
+-------------------------------------------------------------------------------
+
+To see all issues & pull requests closed by this release see the [Git closed milestone for 3.2.2](https://github.com/pgRouting/pgrouting/issues?utf8=%E2%9C%93&q=milestone%3A%22Release%203.2.2%22) on Github.
+
+**Issues**
+
+* [#2093](https://github.com/pgRouting/pgrouting/issues/2093): Compilation on Visual Studio
+* [#2189](https://github.com/pgRouting/pgrouting/issues/2189): Build error on RHEL 7
+
pgRouting 3.2.1 Release Notes
-------------------------------------------------------------------------------
@@ -86,6 +96,16 @@ To see all issues & pull requests closed by this release see the [Git closed mil
* pgr_withPoints(Combinations)
* pgr_withPointsCost(Combinations)
+pgRouting 3.1.4 Release Notes
+--------------------------------------------------------------------------------
+
+To see all issues & pull requests closed by this release see the `Git closed milestone for 3.1.4
+<https://github.com/pgRouting/pgrouting/issues?utf8=%E2%9C%93&q=milestone%3A%22Release%203.1.4%22>`_ on Github.
+
+**Issues fixes**
+
+* [#2189](https://github.com/pgRouting/pgrouting/issues/2189): Build error on RHEL 7
+
pgRouting 3.1.3 Release Notes
-------------------------------------------------------------------------------
@@ -142,6 +162,16 @@ To see all issues & pull requests closed by this release see the [Git closed mil
* Minimal requirement for Sphinx: version 1.8
+pgRouting 3.0.6 Release Notes
+--------------------------------------------------------------------------------
+
+To see all issues & pull requests closed by this release see the `Git closed milestone for 3.0.6
+<https://github.com/pgRouting/pgrouting/issues?utf8=%E2%9C%93&q=milestone%3A%22Release%203.0.6%22>`_ on Github.
+
+**Issues fixes**
+
+* [#2189](https://github.com/pgRouting/pgrouting/issues/2189): Build error on RHEL 7
+
pgRouting 3.0.5 Release Notes
-------------------------------------------------------------------------------
=====================================
appveyor.yml deleted
=====================================
@@ -1,57 +0,0 @@
-# ------------------------------------------------------------------------------
-# appVeyor script
-# Copyright(c) pgRouting Contributors
-#
-# Main configuration
-# ------------------------------------------------------------------------------
-
-version: 2.6.{build}
-
-image: Visual Studio 2013
-configuration: Release
-platform: x64
-
-clone_depth: 1
-clone_folder: c:\build\pgrouting
-
-cache:
- - downloads -> appveyor.yml
- - c:\build\local\msvc120\x64 -> appveyor
-
-services:
- - postgresql96
-
-environment:
- CONFIGURATION: Release
- MSVC_VER: 12.0
- BUILD_ROOT_DIR: c:\build
- PGIS_VERSION: 2.4
- PG_VER: 9.6
-
-
-init:
- - git config --global core.autocrlf false
-
-install:
- # Install pgRouting prerequisites:
- # cmake
- # postGIS
- # CGAL
- - call ci\appveyor\install.bat
-
-
-build_script:
- - cd c:\build\pgrouting\ci\appveyor
- - msbuild_pgrouting.bat %PG_VER%
- - cd %PGROUTING_BUILD_DIR%
- - msbuild PGROUTING.sln /target:Build /property:Configuration=%CONFIGURATION%
- - msbuild INSTALL.vcxproj /target:Build /property:Configuration=%CONFIGURATION%
-
-test_script:
- - set PGUSER=postgres
- - set PGPASSWORD=Password12!
- - 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/doc_queries_generator.pl -psql \"/cygdrive/c/Progra~1/PostgreSQL/%PG_VER%/bin/psql\""
=====================================
ci/appveyor/install-boost.bat deleted
=====================================
@@ -1,149 +0,0 @@
- at echo off
-
-
-Setlocal EnableDelayedExpansion EnableExtensions
-
-
-if not defined BOOST_VERSION goto _error
-if not defined COMMON_INSTALL_DIR goto _error
-if not defined MSVC_VER goto _error
-if not defined ARCH goto _error
-if not defined BUILD_ROOT_DIR goto _error
-if not defined CONFIGURATION goto _error
-
-if defined BOOST_LOCAL_DEBUG (
- echo "install-boost.bat"
- echo received environment
- echo BOOST_VERSION %BOOST_VERSION%
- echo COMMON_INSTALL_DIR %COMMON_INSTALL_DIR%
- echo MSVC_VER %MSVC_VER%
- echo ARCH %ARCH%
- echo BUILD_ROOT_DIR %BUILD_ROOT_DIR%
- echo CONFIGURATION %CONFIGURATION%
-)
-:: create a download & install directories:
-mkdir %APPVEYOR_BUILD_FOLDER%\downloads 2>NUL
-mkdir %COMMON_INSTALL_DIR% 2>NUL
-if defined BOOST_LOCAL_DEBUG dir %DOWNLOADS_DIR%
-if defined BOOST_LOCAL_DEBUG dir %COMMON_INSTALL_DIR%
-
-echo ==================================== BOOST
-
-
-:: deducing variables
-set BOOST_VER_USC=%BOOST_VERSION:.=_%
-set BOOST_SHORT_VER=%BOOST_VER_USC:_0=%
-
-set BOOST_INSTALL_DIR=%COMMON_INSTALL_DIR%
-set BOOST_INCLUDE_DIR=%BOOST_INSTALL_DIR%\include\boost-%BOOST_SHORT_VER%
-set BOOST_LIBRARY_DIR=%BOOST_INSTALL_DIR%\lib
-set BOOST_THREAD_LIB=%BOOST_INSTALL_DIR%\lib\libboost_thread-vc%MSVC_VER:.=%-mt-%BOOST_SHORT_VER%.lib
-set BOOST_SYSTEM_LIB=%BOOST_INSTALL_DIR%\lib\libboost_system-vc%MSVC_VER:.=%-mt-%BOOST_SHORT_VER%.lib
-set BOOST_ADDRESS_MODEL=%ARCH%
-set BOOST_TOOLSET=msvc-%MSVC_VER%
-set BOOST_SRC_DIR=%BUILD_ROOT_DIR%\boost_%BOOST_VER_USC%
-set MSBUILD_CONFIGURATION=%CONFIGURATION%
-
-if defined BOOST_LOCAL_DEBUG (
- echo BOOST_VERSION %BOOST_VERSION%
- echo BOOST_VER_USC %BOOST_VER_USC%
- echo BOOST_SHORT_VER %BOOST_SHORT_VER%
- echo BOOST_INSTALL_DIR %BOOST_INSTALL_DIR%
- echo BOOST_INCLUDE_DIR %BOOST_INCLUDE_DIR%
- echo BOOST_LIBRARY_DIR %BOOST_LIBRARY_DIR%
- echo BOOST_THREAD_LIB %BOOST_THREAD_LIB%
- echo BOOST_SYSTEM_LIB %BOOST_SYSTEM_LIB%
- echo BOOST_ADDRESS_MODEL %BOOST_ADDRESS_MODEL%
- echo BOOST_TOOLSET %BOOST_TOOLSET%
-)
-
-:: check that everything needed from boost is there
-set BOOST_INSTALL_FLAG=10
-if not exist %BOOST_INCLUDE_DIR%\ ( set BOOST_INSTALL_FLAG=1 )
-if not exist %BOOST_LIBRARY_DIR%\ ( set BOOST_INSTALL_FLAG=2 )
-if not exist %BOOST_THREAD_LIB% ( set BOOST_INSTALL_FLAG=3 )
-if not exist %BOOST_SYSTEM_LIB% ( set BOOST_INSTALL_FLAG=4 )
-
-
-if defined BOOST_LOCAL_DEBUG echo BOOST_INSTALL_FLAG %BOOST_INSTALL_FLAG%
-
-
-if not "%BOOST_INSTALL_FLAG%"=="10" (
-
- :: download if needed
- if not exist %DOWNLOADS_DIR%\boost_%BOOST_VER_USC%.zip (
- echo ***** Downloading Boost %BOOST_VERSION% ...
- pushd %DOWNLOADS_DIR%
- curl -L -O -S -s http://downloads.sourceforge.net/project/boost/boost/%BOOST_VERSION%/boost_%BOOST_VER_USC%.zip
- popd
- if not exist %DOWNLOADS_DIR%\boost_%BOOST_VER_USC%.zip (
- echo something went wrong on boost %BOOST_VERSION% download !!!!!!!!!
- if defined BOOST_LOCAL_DEBUG dir %DOWNLOADS_DIR%
- Exit \B 1
- )
- ) else (
- echo **** Boost_%BOOST_VER_USC% already downloaded
- )
-
- echo **** Extracting Boost_%BOOST_VERSION%.zip ...
- pushd %DOWNLOADS_DIR%
- 7z x -o%BUILD_ROOT_DIR%\ boost_%BOOST_VER_USC%.zip
- popd
- if not exist %BOOST_SRC_DIR% (
- echo something went wrong on boost extraction!!!!!!!!!
- if defined BOOST_LOCAL_DEBUG dir %BOOST_SRC_DIR%
- Exit \B 1
- )
-
- echo **** Executing bootstrap.bat...
- if not exist "%BOOST_SRC_DIR%\b2.exe" (
- pushd %BOOST_SRC_DIR%
- call "bootstrap.bat"
- popd
- if not exist "%BOOST_SRC_DIR%\b2.exe" (
- echo something went wrong on booststrap.bat execution!!!!!!!!!
- if defined BOOST_LOCAL_DEBUG dir %BOOST_SRC_DIR%
- Exit \B 1
- )
- )
-
- echo **** Executing %BOOST_SRC_DIR%\b2.exe ...
- pushd %BOOST_SRC_DIR%
- if defined BOOST_LOCAL_DEBUG @echo on
- b2 toolset=%BOOST_TOOLSET% variant=release link=static threading=multi address-model=%BOOST_ADDRESS_MODEL% ^
- --with-thread --with-system --prefix=%BOOST_INSTALL_DIR% -d0 install
- if defined BOOST_LOCAL_DEBUG @echo off
- popd
-) else (
- echo Boost_%BOOST_VERSION% already installed
-)
-
-echo ------------------------------
-echo Environment variables set:
-
-echo BOOST_INCLUDE_DIR %BOOST_INCLUDE_DIR%
-echo BOOST_LIBRARY_DIR %BOOST_LIBRARY_DIR%
-echo BOOST_THREAD_LIB %BOOST_THREAD_LIB%
-echo BOOST_SYSTEM_LIB %BOOST_SYSTEM_LIB%
-echo ======================================================
-
-
-endlocal & (
- set BOOST_INCLUDE_DIR=%BOOST_INCLUDE_DIR%
- set BOOST_LIBRARY_DIR=%BOOST_LIBRARY_DIR%
- set BOOST_THREAD_LIB=%BOOST_THREAD_LIB%
- set BOOST_SYSTEM_LIB=%BOOST_SYSTEM_LIB%
-)
-
-goto :eof
-
-:_error
-echo an environment variable is missing:
-echo -- BOOST_VERSION
-echo -- COMMON_INSTALL_DIR
-echo -- MSVC_VER
-echo -- ARCH
-echo -- BUILD_ROOT_DIR
-echo -- CONFIGURATION
-echo -- BOOST_LOCAL_DEBUG (if defined will print debug information)
-
=====================================
ci/appveyor/install.bat deleted
=====================================
@@ -1,178 +0,0 @@
- at echo off
-
-::set LOCAL_DEBUG=1
-
-Setlocal EnableDelayedExpansion EnableExtensions
-
-if defined LOCAL_DEBUG echo APPVEYOR_BUILD_FOLDER %APPVEYOR_BUILD_FOLDER%
-echo platform %platform%
-
-:: =========================================================
-:: Set some defaults. Infer some variables.
-::
-
-if not defined MSVC_VER set MSVC_VER=12.0
-if not defined RUNTIME set RUNTIME=msvc%MSVC_VER:.=%
-if not defined MSVC_YEAR set MSVC_YEAR=2013
-if not defined BUILD_ROOT_DIR set BUILD_ROOT_DIR=c:\build
-if not defined DOWNLOADS_DIR set DOWNLOADS_DIR=%APPVEYOR_BUILD_FOLDER%\downloads
-if not defined COMMON_INSTALL_DIR set COMMON_INSTALL_DIR=%BUILD_ROOT_DIR%\local\%RUNTIME%\%PLATFORM%
-
-:: 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
-if not defined BOOST_VERSION set BOOST_VERSION=1.58.0
-set PG_VER_NO_DOT=pg%PG_VER:.=%
-
-
-set CMAKE_GENERATOR=Visual Studio %MSVC_VER:.0=% %MSVC_YEAR%
-if "%platform%"=="x64" (
- set CMAKE_GENERATOR=%CMAKE_GENERATOR% Win64
-)
-
-:: 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)
-
-::
-:: =========================================================
-
-:: create a download directory:
-pushd %APPVEYOR_BUILD_FOLDER%
-mkdir downloads 2>NUL
-popd
-mkdir %COMMON_INSTALL_DIR% 2>NUL
-if defined LOCAL_DEBUG dir %DOWNLOADS_DIR%
-if defined LOCAL_DEBUG dir %COMMON_INSTALL_DIR%
-
-
-:: =========================================================
-:: Download and install cmake
-::
-
-echo ==================================== CMAKE
-for /f "tokens=* delims=" %%a in ('cmake --version') do (
- set CURR_CMAKE=%%a& goto _ExitForLoop1
-)
-:_ExitForLoop1
-set CURR_CMAKE=%CURR_CMAKE:~14%
-echo cmake %CURR_CMAKE% found
-
-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
- popd
-
- echo Installing cmake %CMAKE_VERSION%
- pushd %DOWNLOADS_DIR%
- start /wait msiexec /i cmake-%CMAKE_VERSION%-win32-%platform%.msi /qn
- popd
-
- for /f "tokens=* delims=" %%a in ('cmake --version') do (
- set CURR_CMAKE=%%a& goto _ExitForLoop2
- )
- :_ExitForLoop2
- set CURR_CMAKE=%CURR_CMAKE:~14%
- if "%CURR_CMAKE%" == "%CMAKE_VERSION%" (
- echo cmake %CMAKE_VERSION% installed
- ) else (
- echo something went wrong on cmake installation!!!!!!!!!
- Exit \B 1
- )
-)
-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%\%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/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 !!!!!!!!!
- if defined LOCAL_DEBUG dir %DOWNLOADS_DIR%
- Exit \B 1
- )
- )
-
- 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%
- 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%\postgis*
- ) else (
- echo **** PostGIS %PGIS_VERSION% %arch% installed
- )
-) else (
- echo PostGIS %PGIS_VERSION% %arch% already installed
-)
-echo ====================================
-
-
-:: =========================================================
-:: Download and install Boost
-::
-
-:: set BOOST_LOCAL_DEBUG=1
-call ci/appveyor/install-boost.bat
-
-echo ======================================================
-echo Installation of Prerequisites done.
-echo Environment variables set:
-
-echo BOOST_THREAD_LIB %BOOST_THREAD_LIB%
-echo BOOST_SYSTEM_LIB %BOOST_SYSTEM_LIB%
-echo BOOST_INCLUDE_DIR %BOOST_INCLUDE_DIR%
-echo CMAKE_GENERATOR %CMAKE_GENERATOR%
-
-echo ======================================================
-echo.
-
-endlocal & (
- set BOOST_THREAD_LIB=%BOOST_THREAD_LIB%
- set BOOST_SYSTEM_LIB=%BOOST_SYSTEM_LIB%
- set BOOST_INCLUDE_DIR=%BOOST_INCLUDE_DIR%
- set CMAKE_GENERATOR=%CMAKE_GENERATOR%
-)
-
-goto :eof
=====================================
ci/appveyor/msbuild_pgrouting.bat deleted
=====================================
@@ -1,48 +0,0 @@
- at echo off
-
-set PG_VER=%1
-
-echo MSVC_VER %MSVC_VER%
-echo BUILD_ROOT_DIR %BUILD_ROOT_DIR%
-echo CMAKE_GENERATOR %CMAKE_GENERATOR%
-echo BOOST_THREAD_LIB %BOOST_THREAD_LIB%
-echo BOOST_SYSTEM_LIB %BOOST_SYSTEM_LIB%
-echo BOOST_INCLUDE_DIR %BOOST_INCLUDE_DIR%
-echo PLATFORM %PLATFORM%
-echo PG_VER %PG_VER%
-echo PROGRAMFILES %PROGRAMFILES%
-
-set POSTGRESQL_DIR=%PROGRAMFILES%\PostgreSQL\%PG_VER%
-
-set PGROUTING_SRC_DIR=%~dp0..\..\
-echo PGROUTING_SRC_DIR %PGROUTING_SRC_DIR%
-
-path %PATH%;%PROGRAMFILES% (x86)\CMake\bin
-
-set PGROUTING_BUILD_DIR=%PGROUTING_SRC_DIR%build\pg%PG_VER:.=%\%PLATFORM%
-set PGROUTING_INSTALL_DIR=%PGROUTING_SRC_DIR%lib\pg%PG_VER:.=%\%PLATFORM%
-
-
-echo PGROUTING_BUILD_DIR %PGROUTING_BUILD_DIR%
-echo PGROUTING_INSTALL_DIR %PGROUTING_INSTALL_DIR%
-echo POSTGRESQL_DIR %POSTGRESQL_DIR%
-
-rem ### pgRouting ###
-
-if exist %PGROUTING_BUILD_DIR% (
- rmdir /S /Q %PGROUTING_BUILD_DIR%
-)
-
-mkdir %PGROUTING_BUILD_DIR%
-pushd %PGROUTING_BUILD_DIR%
- at echo on
-cmake -G "%CMAKE_GENERATOR%" -DPOSTGRESQL_INCLUDE_DIR:PATH="%POSTGRESQL_DIR%\include;%POSTGRESQL_DIR%\include\server;%POSTGRESQL_DIR%\include\server\port;%POSTGRESQL_DIR%\include\server\port\win32;%POSTGRESQL_DIR%\include\server\port\win32_msvc" ^
- -DPOSTGRESQL_LIBRARIES:FILEPATH="%POSTGRESQL_DIR%\lib\postgres.lib" ^
- -DPOSTGRESQL_EXECUTABLE:FILEPATH="%POSTGRESQL_DIR%\bin\postgres.exe" ^
- -DPOSTGRESQL_PG_CONFIG:FILEPATH="%POSTGRESQL_DIR%\bin\pg_config.exe" ^
- -DBoost_INCLUDE_DIR:PATH=%BOOST_INCLUDE_DIR% ^
- -DCMAKE_BUILD_TYPE=Release ^
- -DBOOST_THREAD_LIBRARIES:FILEPATH="%BOOST_THREAD_LIB%;%BOOST_SYSTEM_LIB%" ..\..\..\
- at echo off
-popd
-
=====================================
ci/appveyor/vercompare.bat deleted
=====================================
@@ -1,50 +0,0 @@
- at echo off
-
-:: left: the installed version
-:: right: the required min version
-
-:: return 0 when installed version < required version
-:: return 1 when installed version >= required 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 required
-if "%VersionLeftMajor%" GTR "%VersionRight.Major%" (
- EXIT /B 0
-)
-
-:: 1.2.12 > 3.3.1 ===> 0 installed does not fulfill required
-if %VersionLeftMajor% LSS %VersionRightMajor% (
- EXIT /B 1
-)
-
-:: the Major's are equal
-:: 3.5.12 >= 3.3.1 ===> 1 installed does fulfill required
-if %VersionLeftMinor% GEQ %VersionRightMinor% (
- EXIT /B 0
-)
-
-:: 3.2.12 > 3.3.1 ===> 0 installed does not fulfill required regardless of build
-EXIT /B 1
-
-:exit
-exit /b
=====================================
debian/changelog
=====================================
@@ -1,3 +1,10 @@
+pgrouting (3.2.2-1) unstable; urgency=medium
+
+ * Team upload.
+ * New upstream release.
+
+ -- Bas Couwenberg <sebastic at debian.org> Sat, 23 Oct 2021 19:43:33 +0200
+
pgrouting (3.2.1-2) unstable; urgency=medium
* Team upload.
=====================================
doc/src/pgRouting-introduction.rst
=====================================
@@ -30,7 +30,7 @@ pgRouting is an extension of `PostGIS <https://postgis.net>`__ and `PostgreSQL
<https://www.postgresql.org>`__ geospatial database and adds routing and other
network analysis functionality. A predecessor of pgRouting – pgDijkstra, written
by Sylvain Pasche from `Camptocamp <http://camptocamp.com>`__, was later extended
-by `Orkney <http://www.orkney.co.jp>`_ and renamed to pgRouting. The project is
+by Orkney and renamed to pgRouting. The project is
now supported and maintained by `Georepublic <https://georepublic.info>`__,
`Paragon Corporation <https://www.paragoncorporation.com/>`__ and a broad user community.
=====================================
doc/src/release_notes.rst
=====================================
@@ -32,6 +32,15 @@ To see the full list of changes check the list of `Git commits <https://github.c
:local:
+pgRouting 3.2.2 Release Notes
+-------------------------------------------------------------------------------
+
+To see all issues & pull requests closed by this release see the `Git closed milestone for 3.2.2 <https://github.com/pgRouting/pgrouting/issues?utf8=%E2%9C%93&q=milestone%3A%22Release%203.2.2%22>`_ on Github.
+
+.. rubric:: Issues
+
+* `#2093 <https://github.com/pgRouting/pgrouting/issues/2093>`__: Compilation on Visual Studio
+* `#2189 <https://github.com/pgRouting/pgrouting/issues/2189>`__: Build error on RHEL 7
pgRouting 3.2.1 Release Notes
-------------------------------------------------------------------------------
@@ -121,6 +130,16 @@ To see all issues & pull requests closed by this release see the `Git closed mil
* pgr_withPoints(Combinations)
* pgr_withPointsCost(Combinations)
+pgRouting 3.1.4 Release Notes
+--------------------------------------------------------------------------------
+
+To see all issues & pull requests closed by this release see the `Git closed milestone for 3.1.4
+<https://github.com/pgRouting/pgrouting/issues?utf8=%E2%9C%93&q=milestone%3A%22Release%203.1.4%22>`_ on Github.
+
+.. rubric:: Issues fixes
+
+* `#2189 <https://github.com/pgRouting/pgrouting/issues/2189>`__: Build error on RHEL 7
+
pgRouting 3.1.3 Release Notes
-------------------------------------------------------------------------------
@@ -177,6 +196,16 @@ To see all issues & pull requests closed by this release see the `Git closed mil
* Minimal requirement for Sphinx: version 1.8
+pgRouting 3.0.6 Release Notes
+--------------------------------------------------------------------------------
+
+To see all issues & pull requests closed by this release see the `Git closed milestone for 3.0.6
+<https://github.com/pgRouting/pgrouting/issues?utf8=%E2%9C%93&q=milestone%3A%22Release%203.0.6%22>`_ on Github.
+
+.. rubric:: Issues fixes
+
+* `#2189 <https://github.com/pgRouting/pgrouting/issues/2189>`__: Build error on RHEL 7
+
pgRouting 3.0.5 Release Notes
-------------------------------------------------------------------------------
=====================================
docqueries/version/doc-full_version.result
=====================================
@@ -6,7 +6,7 @@ SET
SELECT version, library FROM pgr_full_version();
version | library
---------+-----------------
- 3.2.1 | pgrouting-3.2.1
+ 3.2.2 | pgrouting-3.2.2
(1 row)
-- q2
=====================================
docqueries/version/doc-version.result
=====================================
@@ -6,7 +6,7 @@ SET
SELECT pgr_version();
pgr_version
-------------
- 3.2.1
+ 3.2.2
(1 row)
-- q2
=====================================
include/cpp_common/interruption.h
=====================================
@@ -27,9 +27,15 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
#ifndef INCLUDE_CPP_COMMON_INTERRUPTION_H_
#define INCLUDE_CPP_COMMON_INTERRUPTION_H_
+#ifdef _MSC_VER
+#define __PGR_PRETTY_FUNCTION__ __FUNCSIG__
+#else
+#define __PGR_PRETTY_FUNCTION__ __PRETTY_FUNCTION__
+#endif
+
extern "C" {
-#if 0
+#ifdef _MSC_VER
#include <postgres.h>
#include <miscadmin.h>
@@ -76,9 +82,9 @@ extern "C" {
if (INTERRUPTS_PENDING_CONDITION()) \
ProcessInterrupts(); \
} while (0)
+#endif
}
-#endif
#endif // INCLUDE_CPP_COMMON_INTERRUPTION_H_
=====================================
include/cpp_common/pgr_base_graph.hpp
=====================================
@@ -323,9 +323,12 @@ class Pgr_base_graph {
log << "Key: "
<< iter->first <<"\tValue:" << iter->second << "\n";
}
+#if 0
+ /* expensive assertion */
for (const auto vertex : vertices) {
pgassert(has_vertex(vertex.id));
}
+#endif
// pgassert(mapIndex.size() == vertices.size());
}
=====================================
pgtap/tsp/performance/qa194.sql
=====================================
@@ -212,6 +212,6 @@ COPY qa194 (id, x, y) FROM stdin WITH DELIMITER ' ';
UPDATE qa194 SET the_geom = ST_makePoint(x,y);
SET client_min_messages TO NOTICE;
-SELECT CASE WHEN min_lib_version('3.2.1') THEN plan(194) ELSE plan(1) END;
-SELECT tsp_performance('qa194', 194, 9352, 2);
+SELECT CASE WHEN min_lib_version('3.2.1') THEN plan(5) ELSE plan(1) END;
+SELECT tsp_performance('qa194', 5, 9352, 2);
SELECT finish();
=====================================
src/contraction/contractGraph_driver.cpp
=====================================
@@ -29,7 +29,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
#include "drivers/contraction/contractGraph_driver.h"
-#include <string.h>
+#include <string>
#include <sstream>
#include <deque>
#include <vector>
=====================================
src/pickDeliver/pickDeliverEuclidean.c
=====================================
@@ -95,7 +95,8 @@ process(
&vehicles_arr, &total_vehicles);
PGR_DBG("total vehicles %ld", total_vehicles);
- for (size_t i = 0; i < total_pd_orders; i++) {
+ size_t i;
+ for (i = 0; i < total_pd_orders; i++) {
PGR_DBG("%ld %f pick %f %f %ld - "
"%f %f %f deliver %f %f %ld - %f %f %f ",
pd_orders_arr[i].id,
@@ -120,7 +121,7 @@ process(
- for (size_t i = 0; i < total_vehicles; i++) {
+ for (i = 0; i < total_vehicles; i++) {
PGR_DBG("%ld %f %f , start %f %f %f %f %f "
"end %f %f %f %f %f number %ld ",
vehicles_arr[i].id,
=====================================
src/transitiveClosure/transitiveClosure_driver.cpp
=====================================
@@ -22,7 +22,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
#include "drivers/transitiveClosure/transitiveClosure_driver.h"
-#include <string.h>
+#include <string>
#include <sstream>
#include <deque>
#include <vector>
=====================================
src/tsp/TSP_driver.cpp
=====================================
@@ -63,10 +63,6 @@ do_pgr_tsp(
try {
pgrouting::algorithm::TSP fn_tsp{distances, total_distances, true};
-#if Boost_VERSION_MACRO >= 106800
- log << fn_tsp;
-#endif
-
if (start_vid != 0 && !fn_tsp.has_vertex(start_vid)) {
err << "Parameter 'start_id' do not exist on the data";
*err_msg = pgr_msg(err.str().c_str());
@@ -80,7 +76,6 @@ do_pgr_tsp(
}
auto tsp_path = fn_tsp.tsp(start_vid, end_vid, max_cycles);
- log << fn_tsp.get_log();
if (!tsp_path.empty()) {
*return_count = tsp_path.size();
=====================================
src/tsp/euclideanTSP_driver.cpp
=====================================
@@ -30,10 +30,11 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
#include "drivers/tsp/euclideanTSP_driver.h"
-#include <string.h>
+#include <string>
#include <sstream>
#include <vector>
#include <algorithm>
+#include <utility>
#include "tsp/tsp.hpp"
@@ -61,9 +62,6 @@ do_pgr_euclideanTSP(
try {
pgrouting::algorithm::TSP fn_tsp{coordinates, total_coordinates, true};
-#if Boost_VERSION_MACRO >= 106800
- log << fn_tsp;
-#endif
if (start_vid != 0 && !fn_tsp.has_vertex(start_vid)) {
err << "Parameter 'start_id' do not exist on the data";
*err_msg = pgr_msg(err.str().c_str());
@@ -77,7 +75,6 @@ do_pgr_euclideanTSP(
}
auto tsp_path = fn_tsp.tsp(start_vid, end_vid, max_cycles);
- log << fn_tsp.get_log();
if (!tsp_path.empty()) {
*return_count = tsp_path.size();
=====================================
src/tsp/tsp.cpp
=====================================
@@ -146,8 +146,8 @@ TSP::tsp() {
back_inserter(tsp_path));
} catch (...) {
throw std::make_pair(
- std::string("INTERNAL: something went wrong while calling boost::metric_tsp_approx_tour_from_vertex"),
- std::string(__PRETTY_FUNCTION__));
+ std::string("INTERNAL: something went wrong while calling boost::metric_tsp_approx_tour"),
+ std::string(__PGR_PRETTY_FUNCTION__));
}
pgassert(tsp_path.size() == num_vertices(graph) + 1);
@@ -163,7 +163,7 @@ TSP::tsp(int64_t start_vid) {
if (id_to_V.find(start_vid) == id_to_V.end()) {
throw std::make_pair(
std::string("INTERNAL: Verify start_vid before calling"),
- std::string(__PRETTY_FUNCTION__));
+ std::string(__PGR_PRETTY_FUNCTION__));
}
auto v = get_boost_vertex(start_vid);
@@ -177,7 +177,7 @@ TSP::tsp(int64_t start_vid) {
} catch (...) {
throw std::make_pair(
std::string("INTERNAL: something went wrong while calling boost::metric_tsp_approx_tour_from_vertex"),
- std::string(__PRETTY_FUNCTION__));
+ std::string(__PGR_PRETTY_FUNCTION__));
}
pgassert(tsp_path.size() == num_vertices(graph) + 1);
@@ -216,13 +216,13 @@ TSP::tsp(
if (id_to_V.find(start_vid) == id_to_V.end()) {
throw std::make_pair(
std::string("INTERNAL: start_id not found on data"),
- std::string(__PRETTY_FUNCTION__));
+ std::string(__PGR_PRETTY_FUNCTION__));
}
if (id_to_V.find(end_vid) == id_to_V.end()) {
throw std::make_pair(
std::string("INTERNAL: end_id not found on data"),
- std::string(__PRETTY_FUNCTION__));
+ std::string(__PGR_PRETTY_FUNCTION__));
}
auto u = get_boost_vertex(start_vid);
@@ -257,7 +257,7 @@ TSP::crossover_optimize(std::deque<std::pair<int64_t, double>> result, size_t li
for (size_t i = 1; i < result.size() - limit; ++i) {
for (size_t j = result.size() - limit; j >=i + 1; --j) {
auto tmp = result;
- std::reverse(tmp.begin() + i, tmp.begin() + j);
+ std::reverse(tmp.begin() + static_cast<ptrdiff_t>(i), tmp.begin() + static_cast<ptrdiff_t>(j));
auto new_cost = eval_tour(tmp);
if (new_cost < best_cost) {
#ifdef DEBUG_TSP
@@ -338,7 +338,7 @@ TSP::TSP(
if (!add_result.second) {
throw std::make_pair(
std::string("INTERNAL: something went wrong adding and edge\n"),
- std::string(__PRETTY_FUNCTION__));
+ std::string(__PGR_PRETTY_FUNCTION__));
}
}
@@ -427,7 +427,7 @@ TSP::TSP(Coordinate_t *coordinates,
if (!add_result.second) {
throw std::make_pair(
std::string("INTERNAL: something went wrong adding and edge\n"),
- std::string(__PRETTY_FUNCTION__));
+ std::string(__PGR_PRETTY_FUNCTION__));
}
}
}
@@ -480,7 +480,7 @@ TSP::get_boost_vertex(int64_t id) const {
} catch (...) {
throw std::make_pair(
std::string("INTERNAL: something went wrong when getting the vertex descriptor"),
- std::string(__PRETTY_FUNCTION__));
+ std::string(__PGR_PRETTY_FUNCTION__));
}
}
@@ -491,7 +491,7 @@ TSP::get_vertex_id(V v) const {
} catch (...) {
throw std::make_pair(
std::string("INTERNAL: something went wrong when getting the vertex id"),
- std::string(__PRETTY_FUNCTION__));
+ std::string(__PGR_PRETTY_FUNCTION__));
}
}
@@ -502,9 +502,7 @@ TSP::get_edge_id(E e) const {
} catch (...) {
throw std::make_pair(
std::string("INTERNAL: something went wrong when getting the edge id"),
- std::string(__PRETTY_FUNCTION__));
- pgassert(false);
- throw;
+ std::string(__PGR_PRETTY_FUNCTION__));
}
}
=====================================
src/withPoints/get_new_queries.cpp
=====================================
@@ -28,7 +28,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
********************************************************************PGR-GNU*/
#include "drivers/withPoints/get_new_queries.h"
-#include <string.h>
+#include <string>
#include <sstream>
#include "cpp_common/pgr_alloc.hpp"
View it on GitLab: https://salsa.debian.org/debian-gis-team/pgrouting/-/compare/1f982462998dcdcd185f26ea5cf06d20ee0da767...3452a6fd93971ac9f6fc11e7221f45bcb889e90b
--
View it on GitLab: https://salsa.debian.org/debian-gis-team/pgrouting/-/compare/1f982462998dcdcd185f26ea5cf06d20ee0da767...3452a6fd93971ac9f6fc11e7221f45bcb889e90b
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-grass-devel/attachments/20211023/1c3d4351/attachment-0001.htm>
More information about the Pkg-grass-devel
mailing list