Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove boost requirement #47

Merged
merged 7 commits into from
Jul 22, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 0 additions & 23 deletions BOOST_LICENSE_1_0.txt

This file was deleted.

20 changes: 0 additions & 20 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -54,13 +54,11 @@ include(pgr/Configure)
set(DOXYGEN_MINIMUM_VERSION "1.7")
set(SPHINX_MINIMUM_VERSION "1.8")
set(POSTGRESQL_MINIMUM_VERSION "12.0")
set(BOOST_MINIMUM_VERSION "1.65.0")
set(VROOM_MINIMUM_VERSION "1.12.0")

message(STATUS "DOXYGEN_MINIMUM_VERSION=${DOXYGEN_MINIMUM_VERSION}")
message(STATUS "SPHINX_MINIMUM_VERSION=${SPHINX_MINIMUM_VERSION}")
message(STATUS "POSTGRESQL_MINIMUM_VERSION=${POSTGRESQL_MINIMUM_VERSION}")
message(STATUS "BOOST_MINIMUM_VERSION=${BOOST_MINIMUM_VERSION}")
message(STATUS "VROOM_MINIMUM_VERSION=${VROOM_MINIMUM_VERSION}")

# cmake 3.2 adds unwanted flags
Expand All @@ -79,19 +77,6 @@ endif()
set(CMAKE_CXX_STANDARD 17)
set(CMAKE_C_STANDARD 11)

#---------------------------------------------
#---------------------------------------------
# Boost
#---------------------------------------------
#---------------------------------------------
find_package(Boost ${BOOST_MINIMUM_VERSION} REQUIRED)
if (NOT Boost_VERSION_MACRO)
set(Boost_VERSION_MACRO ${Boost_VERSION})
endif()
add_definitions(-DBoost_VERSION_MACRO=${Boost_VERSION_MACRO})
add_definitions(-DBOOST_ALLOW_DEPRECATED_HEADERS)
include_directories(SYSTEM ${Boost_INCLUDE_DIRS})


#---------------------------------------------
# Windows compiler flags
Expand All @@ -104,13 +89,9 @@ if(WIN32 AND NOT MSVC)
set(OS_BUILD "64")
endif()
set(CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH}:/c/ming${OS_BUILD}/projects/pgx${OS_BUILD}/pg92)
if (NOT BOOST_ROOT)
set(BOOST_ROOT c:/ming${OS_BUILD}/msys/local)
endif()

if (PROJECT_DEBUG)
message(STATUS "OS_BUILD=${OS_BUILD}")
message(STATUS "BOOST_ROOT=${BOOST_ROOT}")
message(STATUS "CMAKE_PREFIX_PATH=${CMAKE_PREFIX_PATH}")
endif()
endif(WIN32 AND NOT MSVC)
Expand Down Expand Up @@ -193,7 +174,6 @@ add_definitions(-DCMAKE_BUILD_TYPE="${CMAKE_BUILD_TYPE}")
add_definitions(-DPROJECT_LIB_NAME="${PROJECT_NAME_LOWER}-${PROJECT_VERSION}")
add_definitions(-DPROJECT_GIT_HASH="${PROJECT_GIT_HASH}")
string(TIMESTAMP COMPILATION_DATE "\"%Y/%m/%d\"")
add_definitions(-DBOOST_VERSION="${Boost_MAJOR_VERSION}.${Boost_MINOR_VERSION}.${Boost_SUBMINOR_VERSION}")
add_definitions(-DCOMPILATION_DATE=${COMPILATION_DATE})
add_definitions(-DCOMPILER_VERSION="${CMAKE_CXX_COMPILER_ID}-${CMAKE_CXX_COMPILER_VERSION}")
add_definitions(-DPostgreSQL_VERSION_STRING="${PostgreSQL_VERSION_STRING}")
Expand Down
21 changes: 17 additions & 4 deletions NEWS
Original file line number Diff line number Diff line change
Expand Up @@ -3,25 +3,38 @@
v0.4.1 Release Notes
-------------------------------------------------------------------------------

No Changes Yet
**Removal of Boost on the build**

* vrp_full_version
* vrp_version

.. include:: vrp_full_version.rst
:start-after: Version 0.4.1
:end-before: Version

v0.4.0 Release Notes
*******************************************************************************

To see all issues & pull requests closed by this release see the [Git closed milestone for 0.4.0](https://github.com/pgRouting/vrprouting/issues?utf8=%E2%9C%93&q=milestone%3A%22Release%200.4.0%22) on Github.
To see all issues & pull requests closed by this release see the `Git closed
milestone for 0.4.0
<https://github.com/pgRouting/vrprouting/issues?utf8=%E2%9C%93&q=milestone%3A%22Release%200.4.0%22>`_
on Github.

**Added support for VROOM 1.12.0 ([#34](https://github.com/pgRouting/vrprouting/issues/34))**

- No visible changes on user side with respect to signatures.
- Adjusted to VROOM v1.12.0 due to internal breaking changes:
- Adjusted to VROOM v1.12.0 due to internal breaking changes:

- Made changes according to new vroom::Input signature.
- CI changes to compile without routing support, with Position Independent Code.

v0.3.0 Release Notes
*******************************************************************************

To see all issues & pull requests closed by this release see the [Git closed milestone for 0.3.0](https://github.com/pgRouting/vrprouting/issues?utf8=%E2%9C%93&q=milestone%3A%22Release%200.3.0%22) on Github.
To see all issues & pull requests closed by this release see the `Git closed
milestone for 0.3.0
<https://github.com/pgRouting/vrprouting/issues?utf8=%E2%9C%93&q=milestone%3A%22Release%200.3.0%22>`_
on Github.

**Modification of experimental functions**

Expand Down
1 change: 0 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,6 @@ Building requirements
* Perl
* C and C++ compilers with C++17 standard support
* Postgresql >= TBD
* The Boost Graph Library (BGL) >= 1.65
* CMake >= 3.12
* Sphinx > 4.0.0
* VROOM >= 1.12.0
Expand Down
4 changes: 1 addition & 3 deletions doc/general/installation.rst
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,6 @@ To be able to compile vrpRouting, make sure that the following dependencies are

* C and C++ compilers with C++17 standard support
* Postgresql version >= TBD
* The Boost Graph Library (BGL) >= 1.65
* CMake >= 3.12
* VROOM >= ${VROOM_MINIMUM_VERSION}

Expand Down Expand Up @@ -156,8 +155,7 @@ This example is for PostgreSQL 13 and PostGIS 3

sudo apt-get install
cmake \
g++ \
libboost-graph-dev
g++

.. rubric:: Build dependencies (VROOM)

Expand Down
6 changes: 1 addition & 5 deletions doc/general/introduction.rst
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@ The following licenses can be found in vrpRouting:

* For code in any language.

* Boost extensions are available under `Boost Software License - Version 1.0 <https://www.boost.org/LICENSE_1_0.txt>`__.
* Creative Commons Attribution-Share Alike 3.0 License `CC BY-SA 3.0 <https://creativecommons.org/licenses/by-sa/3.0/>`__.

* For user's & developer's documentation
Expand Down Expand Up @@ -81,7 +80,6 @@ Corporate Sponsors (in alphabetical order)

These are corporate entities that have contributed developer time, hosting, or direct monetary funding to the vrpRouting project:

- `Georepublic <https://georepublic.info/en/>`__
- `Paragon Corporation <https://www.paragoncorporation.com/>`__

Contributors Past & Present:
Expand Down Expand Up @@ -117,6 +115,4 @@ More Information
* The latest software, documentation and news items are available at the vrpRouting web site https://vrp.pgrouting.org.
* PostgreSQL database server at the PostgreSQL main site https://www.postgresql.org.
* PostGIS extension at the PostGIS project web site https://postgis.net.
* pgRouting extension at the pgRouting project web site https://pgRouting.org.
* Boost C++ source libraries at https://www.boost.org.

* vrpRouting extension at the pgRouting project web site https://pgRouting.org.
21 changes: 17 additions & 4 deletions doc/general/release_notes.rst
Original file line number Diff line number Diff line change
Expand Up @@ -26,25 +26,38 @@ To see the full list of changes check the list of `Git commits <https://github.c
v0.4.1 Release Notes
-------------------------------------------------------------------------------

No Changes Yet
.. rubric:: Removal of Boost on the build

* vrp_full_version
* vrp_version

.. include:: vrp_full_version.rst
:start-after: Version 0.4.1
:end-before: Version

v0.4.0 Release Notes
*******************************************************************************

To see all issues & pull requests closed by this release see the `Git closed milestone for 0.4.0 <https://github.com/pgRouting/vrprouting/issues?utf8=%E2%9C%93&q=milestone%3A%22Release%200.4.0%22>`_ on Github.
To see all issues & pull requests closed by this release see the `Git closed
milestone for 0.4.0
<https://github.com/pgRouting/vrprouting/issues?utf8=%E2%9C%93&q=milestone%3A%22Release%200.4.0%22>`_
on Github.

.. rubric:: Added support for VROOM 1.12.0 (`#34 <https://github.com/pgRouting/vrprouting/issues/34>`_)

- No visible changes on user side with respect to signatures.
- Adjusted to VROOM v1.12.0 due to internal breaking changes:
- Adjusted to VROOM v1.12.0 due to internal breaking changes:

- Made changes according to new vroom::Input signature.
- CI changes to compile without routing support, with Position Independent Code.

v0.3.0 Release Notes
*******************************************************************************

To see all issues & pull requests closed by this release see the `Git closed milestone for 0.3.0 <https://github.com/pgRouting/vrprouting/issues?utf8=%E2%9C%93&q=milestone%3A%22Release%200.3.0%22>`_ on Github.
To see all issues & pull requests closed by this release see the `Git closed
milestone for 0.3.0
<https://github.com/pgRouting/vrprouting/issues?utf8=%E2%9C%93&q=milestone%3A%22Release%200.3.0%22>`_
on Github.

.. rubric:: Modification of experimental functions

Expand Down
1 change: 0 additions & 1 deletion doc/images/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@

SET(LOCAL_FILES
boost-inside.jpeg
Fig1-originalData.png
Fig2-cost.png
Fig4-costUndirected.png
Expand Down
Binary file removed doc/images/boost-inside.jpeg
Binary file not shown.
29 changes: 22 additions & 7 deletions doc/version/vrp_full_version.rst
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,11 @@ vrp_full_version

.. rubric:: Availability

Version 0.4.1

* Boost removed from the result columns


Version 0.0.0

* New **official** function
Expand All @@ -37,9 +42,11 @@ Get the details of vrpRouting version information
Signatures
-------------------------------------------------------------------------------

.. include:: ../sql/version/full_version.sql
:start-after: signature start
:end-before: signature end
.. admonition:: \ \
:class: signatures

| pgr_full_version()
| RETURNS ``(version, build_type, compile_date, library, system, PostgreSQL, compiler, hash)``

:Example: Get the version installed for this documentation.

Expand All @@ -50,10 +57,18 @@ Signatures
Result Columns
-------------------------------------------------------------------------------

.. include:: ../sql/version/version.sql
:start-after: result start
:end-before: result end

================ =========== ===============================
Column Type Description
================ =========== ===============================
``version`` ``TEXT`` vrpRouting version
``build_type`` ``TEXT`` The Build type
``compile_date`` ``TEXT`` Compilation date
``library`` ``TEXT`` Library name and version
``system`` ``TEXT`` Operative system
``postgreSQL`` ``TEXT`` pgsql used
``compiler`` ``TEXT`` Compiler and version
``hash`` ``TEXT`` Git hash of vrpRouting build
================ =========== ===============================

.. rubric:: See also

Expand Down
16 changes: 10 additions & 6 deletions doc/version/vrp_version.rst
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,11 @@ Returns vrpRouting version information.
Signatures
-------------------------------------------------------------------------------

.. include:: ../sql/version/version.sql
:start-after: signature start
:end-before: signature end
.. admonition:: \ \
:class: signatures

| pgr_version()
| RETURNS ``TEXT``

:Example: vrpRouting Version for this documentatoin

Expand All @@ -51,9 +53,11 @@ Signatures
Result Columns
-------------------------------------------------------------------------------

.. include:: ../sql/version/version.sql
:start-after: result start
:end-before: result end
=========== ===============================
Type Description
=========== ===============================
``TEXT`` vrpRouting version
=========== ===============================


.. rubric:: See Also
Expand Down
6 changes: 3 additions & 3 deletions docqueries/version/doc-full_version.result
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ SET client_min_messages TO NOTICE;
SET
/* -- q1 */
SELECT version, library FROM vrp_full_version();
version | library
-----------+------------------
0.4.0-dev | vrprouting-0.4.0
version | library
---------+------------------
0.4.1 | vrprouting-0.4.1
(1 row)

/* -- q2 */
Expand Down
2 changes: 1 addition & 1 deletion docqueries/version/doc-version.result
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ SET
SELECT vrp_version();
vrp_version
-------------
0.4.0-dev
0.4.1
(1 row)

/* -- q2 */
Expand Down
2 changes: 1 addition & 1 deletion doxygen/Doxyfile.in
Original file line number Diff line number Diff line change
Expand Up @@ -789,7 +789,7 @@ RECURSIVE = YES
# Note that relative paths are relative to the directory from which doxygen is
# run.

EXCLUDE = @CMAKE_CURRENT_SOURCE_DIR@/../include/boost
EXCLUDE =
# ../../tools ../../doc ../../build ../../cmake ../../.tx

# The EXCLUDE_SYMLINKS tag can be used to select whether or not files or
Expand Down
Loading
Loading