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.

Sign up for GitHub

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

Jump to bottom

Add support for modular build structure. #850

Closed
wants to merge 22 commits into from
Closed

Add support for modular build structure. #850

Show file tree
Hide file tree
Changes from 21 commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
83fe833
Make the library modular usable.
grafikrobot Mar 11, 2024
17783d8
Sync from upstream.
grafikrobot Mar 16, 2024
0efa853
Switch to library requirements instead of source. As source puts extr…
grafikrobot Mar 30, 2024
26efc9f
Fix missing install targets.
grafikrobot Apr 7, 2024
b6fde8e
Sync from upstream.
grafikrobot Apr 10, 2024
292cfb9
Sync from upstream.
grafikrobot Apr 20, 2024
0847fc5
Replace relative docca refs with project based.
grafikrobot Apr 27, 2024
98f4319
Add missing NO_LIB usage requirements.
grafikrobot Apr 29, 2024
90dac0c
Add missing import-search for cconfig/predef checks.
grafikrobot May 5, 2024
6901f9f
Add requires-b2 check to top-level build file.
grafikrobot May 5, 2024
c5b3c53
Bump B2 require to 5.2
grafikrobot Jun 14, 2024
ec58078
Sync from upstream.
grafikrobot Jul 12, 2024
61b0ac0
Update copyright dates.
grafikrobot Jul 21, 2024
682b843
Move inter-lib dependencies to a project variable and into the build …
grafikrobot Jul 24, 2024
81be485
Sync from upstream.
grafikrobot Jul 25, 2024
c062190
Split b2 dependencies into public and private.
grafikrobot Jul 27, 2024
ff7a700
Sync from upstream.
grafikrobot Jul 27, 2024
01e458e
Sync from upstream.
grafikrobot Aug 2, 2024
8d8ef54
Sync from upstream.
grafikrobot Aug 9, 2024
8a80c9f
Update build deps.
grafikrobot Aug 11, 2024
a0c6521
Sync from upstream.
grafikrobot Aug 17, 2024
ea2ecb8
Sync from upstream.
grafikrobot Aug 20, 2024
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
20 changes: 0 additions & 20 deletions Jamfile
View file
Open in desktop

This file was deleted.

34 changes: 34 additions & 0 deletions build.jam
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>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
;

25 changes: 22 additions & 3 deletions build/Jamfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 <library>$(boost_dependencies)
: requirements
<library>$(boost_dependencies_private)
$(c11-requires)
<define>BOOST_URL_SOURCE
<toolset>msvc-14.0:<build>no
Expand All @@ -19,6 +38,8 @@ project boost/url
: common-requirements
<link>shared:<define>BOOST_URL_DYN_LINK=1
<link>static:<define>BOOST_URL_STATIC_LINK=1
: usage-requirements
<define>BOOST_URL_NO_LIB=1
: source-location ../src
;

Expand All @@ -31,5 +52,3 @@ explicit url_sources ;
lib boost_url
: url_sources
;

boost-install boost_url ;
3 changes: 2 additions & 1 deletion doc/Jamfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 0 additions & 2 deletions example/file_router/Jamfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,6 @@
# Official repository: https://github.com/boostorg/url
#

project : requirements ;

project
: requirements
<library>/boost/url//boost_url
Expand Down
2 changes: 0 additions & 2 deletions example/finicky/Jamfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,6 @@
# Official repository: https://github.com/boostorg/url
#

project : requirements ;

project
: requirements
<library>/boost/url//boost_url
Expand Down
2 changes: 0 additions & 2 deletions example/magnet/Jamfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,6 @@
# Official repository: https://github.com/boostorg/url
#

project : requirements ;

project
: requirements
<library>/boost/url//boost_url
Expand Down
2 changes: 0 additions & 2 deletions example/mailto/Jamfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,6 @@
# Official repository: https://github.com/boostorg/url
#

project : requirements ;

project
: requirements
<library>/boost/url//boost_url
Expand Down
2 changes: 0 additions & 2 deletions example/qrcode/Jamfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,6 @@
# Official repository: https://github.com/boostorg/url
#

project : requirements ;

project
: requirements
<library>/boost/url//boost_url
Expand Down
4 changes: 2 additions & 2 deletions example/router/Jamfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,14 @@
# Official repository: https://github.com/boostorg/url
#

project : requirements ;

project
: requirements
<toolset>clang-4:<warnings-as-errors>off
<toolset>clang-5:<warnings-as-errors>off
<define>BOOST_ASIO_DISABLE_FENCED_BLOCK
<library>/boost/url//boost_url
<library>/boost/beast//boost_beast/<link>static
<library>/boost/beast//boost_beast_asio/<link>static
<toolset>gcc-7:<cxxflags>"-Wno-maybe-uninitialized"
;

Expand Down
2 changes: 0 additions & 2 deletions example/suffix_list/Jamfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,6 @@
# Official repository: https://github.com/boostorg/url
#

project : requirements ;

project
: requirements
<library>/boost/url//boost_url
Expand Down
20 changes: 4 additions & 16 deletions test/Jamfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,28 +22,16 @@ project
<toolset>gcc:<cxxflags>"-Wno-maybe-uninitialized"
<toolset>clang:<cxxflags>"-Wno-unused-but-set-variable"
<toolset>gcc,<target-os>windows:<cxxflags>"-Wno-error=array-bounds"
<toolset>clang:<cxxflags>"-Wno-unknown-warning-option"
<toolset>clang-13:<cxxflags>"-Wno-unused-but-set-variable"
<toolset>clang-14:<cxxflags>"-Wno-unused-but-set-variable"
<toolset>clang-15:<cxxflags>"-Wno-unused-but-set-variable"

# Different typeinfos confuse ubsan
<undefined-sanitizer>norecover:<link>static
<undefined-sanitizer>norecover:<visibility>global
;

project
: default-build

<warnings>extra

: requirements

<toolset>gcc:<cxxflags>"-Wno-unused-but-set-variable" # Warnings in dependencies
<toolset>clang:<cxxflags>"-Wno-unknown-warning-option"
<toolset>clang-13:<cxxflags>"-Wno-unused-but-set-variable" # Warnings in dependencies
<toolset>clang-14:<cxxflags>"-Wno-unused-but-set-variable" # Warnings in dependencies
<toolset>clang-15:<cxxflags>"-Wno-unused-but-set-variable" # Warnings in dependencies

;

build-project extra ;
build-project limits ;
build-project unit ;

2 changes: 1 addition & 1 deletion test/extra/Jamfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ import testing ;

project
: requirements
$(c11-requires)
<source>../../extra/test_main.cpp
<include>.
<include>../../extra
<library>/boost/assert//boost_assert
;


Expand Down
1 change: 0 additions & 1 deletion test/limits/Jamfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ import testing ;

project
: requirements
$(c11-requires)
<source>../../extra/test_main.cpp
<include>.
<include>../../extra
Expand Down
3 changes: 0 additions & 3 deletions test/unit/Jamfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ import testing ;

project
: requirements
$(c11-requires)
<library>/boost/filesystem//boost_filesystem/<warnings>off
<library>/boost/url//boost_url
<source>../../extra/test_main.cpp
Expand Down Expand Up @@ -52,7 +51,6 @@ local SOURCES =
segments_encoded_view.cpp
segments_ref.cpp
segments_view.cpp
snippets.cpp
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this a mistake?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Probably a merge misstep at some point in the past months.

static_url.cpp
string_view.cpp
url.cpp
Expand All @@ -64,7 +62,6 @@ local SOURCES =
grammar/alnum_chars.cpp
grammar/alpha_chars.cpp
grammar/charset.cpp
grammar/ci_string.cpp
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

And this?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same.. Probably a merge misstep at some point in the past months.

grammar/dec_octet_rule.cpp
grammar/delim_rule.cpp
grammar/digit_chars.cpp
Expand Down
Loading