diff --git a/Jamfile b/Jamfile deleted file mode 100644 index cd2a84633..000000000 --- a/Jamfile +++ /dev/null @@ -1,20 +0,0 @@ -# -# Copyright (c) 2013-2019 Vinnie Falco (vinnie dot falco at gmail dot com) -# -# Distributed under the Boost Software License, Version 1.0. (See accompanying -# file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) -# -# Official repository: https://github.com/boostorg/url -# - -import ../../config/checks/config : requires ; - -constant c11-requires : - [ requires - cxx11_constexpr - cxx11_decltype - cxx11_hdr_tuple - cxx11_template_aliases - cxx11_variadic_templates - ] - ; diff --git a/build.jam b/build.jam new file mode 100644 index 000000000..1e3ba3db4 --- /dev/null +++ b/build.jam @@ -0,0 +1,34 @@ +# Copyright René Ferdinand Rivera Morell 2023-2024 +# Distributed under the Boost Software License, Version 1.0. +# (See accompanying file LICENSE_1_0.txt or copy at +# http://www.boost.org/LICENSE_1_0.txt) + +require-b2 5.2 ; + +constant boost_dependencies : + /boost/align//boost_align + /boost/assert//boost_assert + /boost/config//boost_config + /boost/core//boost_core + /boost/mp11//boost_mp11 + /boost/optional//boost_optional + /boost/static_assert//boost_static_assert + /boost/system//boost_system + /boost/type_traits//boost_type_traits + /boost/variant2//boost_variant2 ; + +project /boost/url + : common-requirements + include + ; + +explicit + [ alias boost_url : build//boost_url ] + [ alias url_sources : build//url_sources ] + [ alias all : boost_url url_sources example test ] + ; + +call-if : boost-library url + : install boost_url + ; + diff --git a/build/Jamfile b/build/Jamfile index 0c95d9bbb..bd4748fc8 100644 --- a/build/Jamfile +++ b/build/Jamfile @@ -8,8 +8,27 @@ # Official repository: https://github.com/vinniefalco/url # -project boost/url +import-search /boost/config/checks ; +import config : requires ; + +constant c11-requires : + [ requires + cxx11_constexpr + cxx11_decltype + cxx11_hdr_tuple + cxx11_template_aliases + cxx11_variadic_templates + ] + ; + +constant boost_dependencies_private : + /boost/throw_exception//boost_throw_exception + ; + +project + : common-requirements $(boost_dependencies) : requirements + $(boost_dependencies_private) $(c11-requires) BOOST_URL_SOURCE msvc-14.0:no @@ -19,6 +38,8 @@ project boost/url : common-requirements shared:BOOST_URL_DYN_LINK=1 static:BOOST_URL_STATIC_LINK=1 + : usage-requirements + BOOST_URL_NO_LIB=1 : source-location ../src ; @@ -31,5 +52,3 @@ explicit url_sources ; lib boost_url : url_sources ; - -boost-install boost_url ; diff --git a/doc/Jamfile b/doc/Jamfile index 16c7866d5..2ab896cd9 100644 --- a/doc/Jamfile +++ b/doc/Jamfile @@ -11,7 +11,8 @@ project url/doc ; import boostbook ; import os ; -import ../../../tools/docca/docca.jam ; +import-search /boost/docca ; +import docca ; docca.reference reference.qbk diff --git a/example/file_router/Jamfile b/example/file_router/Jamfile index be7dd14ec..50db477b7 100644 --- a/example/file_router/Jamfile +++ b/example/file_router/Jamfile @@ -7,8 +7,6 @@ # Official repository: https://github.com/boostorg/url # -project : requirements ; - project : requirements /boost/url//boost_url diff --git a/example/finicky/Jamfile b/example/finicky/Jamfile index 526f22740..44d433eed 100644 --- a/example/finicky/Jamfile +++ b/example/finicky/Jamfile @@ -7,8 +7,6 @@ # Official repository: https://github.com/boostorg/url # -project : requirements ; - project : requirements /boost/url//boost_url diff --git a/example/magnet/Jamfile b/example/magnet/Jamfile index 5b6b19831..917b64101 100644 --- a/example/magnet/Jamfile +++ b/example/magnet/Jamfile @@ -7,8 +7,6 @@ # Official repository: https://github.com/boostorg/url # -project : requirements ; - project : requirements /boost/url//boost_url diff --git a/example/mailto/Jamfile b/example/mailto/Jamfile index 6c36f4e21..d4f38ee02 100644 --- a/example/mailto/Jamfile +++ b/example/mailto/Jamfile @@ -7,8 +7,6 @@ # Official repository: https://github.com/boostorg/url # -project : requirements ; - project : requirements /boost/url//boost_url diff --git a/example/qrcode/Jamfile b/example/qrcode/Jamfile index 6a1a5969c..29e1c2be8 100644 --- a/example/qrcode/Jamfile +++ b/example/qrcode/Jamfile @@ -7,8 +7,6 @@ # Official repository: https://github.com/boostorg/url # -project : requirements ; - project : requirements /boost/url//boost_url diff --git a/example/router/Jamfile b/example/router/Jamfile index 86f02efd0..abe77b083 100644 --- a/example/router/Jamfile +++ b/example/router/Jamfile @@ -7,14 +7,14 @@ # Official repository: https://github.com/boostorg/url # -project : requirements ; - project : requirements clang-4:off clang-5:off BOOST_ASIO_DISABLE_FENCED_BLOCK /boost/url//boost_url + /boost/beast//boost_beast/static + /boost/beast//boost_beast_asio/static gcc-7:"-Wno-maybe-uninitialized" ; diff --git a/example/suffix_list/Jamfile b/example/suffix_list/Jamfile index 90a4d1a95..14e48c9b4 100644 --- a/example/suffix_list/Jamfile +++ b/example/suffix_list/Jamfile @@ -7,8 +7,6 @@ # Official repository: https://github.com/boostorg/url # -project : requirements ; - project : requirements /boost/url//boost_url diff --git a/test/Jamfile b/test/Jamfile index a6cd7db6e..17fe6fbe4 100644 --- a/test/Jamfile +++ b/test/Jamfile @@ -23,28 +23,16 @@ project clang:"-Wno-unused-but-set-variable" clang:"-Wno-unused-parameter" gcc,windows:"-Wno-error=array-bounds" + clang:"-Wno-unknown-warning-option" + clang-13:"-Wno-unused-but-set-variable" + clang-14:"-Wno-unused-but-set-variable" + clang-15:"-Wno-unused-but-set-variable" # Different typeinfos confuse ubsan norecover:static norecover:global ; -project - : default-build - - extra - - : requirements - - gcc:"-Wno-unused-but-set-variable" # Warnings in dependencies - clang:"-Wno-unknown-warning-option" - clang-13:"-Wno-unused-but-set-variable" # Warnings in dependencies - clang-14:"-Wno-unused-but-set-variable" # Warnings in dependencies - clang-15:"-Wno-unused-but-set-variable" # Warnings in dependencies - - ; - build-project extra ; build-project limits ; build-project unit ; - diff --git a/test/extra/Jamfile b/test/extra/Jamfile index 237fc5263..ec910acb4 100644 --- a/test/extra/Jamfile +++ b/test/extra/Jamfile @@ -11,10 +11,10 @@ import testing ; project : requirements - $(c11-requires) ../../extra/test_main.cpp . ../../extra + /boost/assert//boost_assert ; diff --git a/test/limits/Jamfile b/test/limits/Jamfile index 8ef9973d5..af9edf191 100644 --- a/test/limits/Jamfile +++ b/test/limits/Jamfile @@ -11,7 +11,6 @@ import testing ; project : requirements - $(c11-requires) ../../extra/test_main.cpp . ../../extra diff --git a/test/unit/Jamfile b/test/unit/Jamfile index 38ea7d62d..76d107220 100644 --- a/test/unit/Jamfile +++ b/test/unit/Jamfile @@ -11,7 +11,6 @@ import testing ; project : requirements - $(c11-requires) /boost/filesystem//boost_filesystem/off /boost/url//boost_url ../../extra/test_main.cpp @@ -52,7 +51,6 @@ local SOURCES = segments_encoded_view.cpp segments_ref.cpp segments_view.cpp - snippets.cpp static_url.cpp string_view.cpp url.cpp @@ -64,7 +62,6 @@ local SOURCES = grammar/alnum_chars.cpp grammar/alpha_chars.cpp grammar/charset.cpp - grammar/ci_string.cpp grammar/dec_octet_rule.cpp grammar/delim_rule.cpp grammar/digit_chars.cpp