-
Notifications
You must be signed in to change notification settings - Fork 107
Add support for modular build structure. #1030
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
Closed
Closed
Changes from all commits
Commits
Show all changes
23 commits
Select commit
Hold shift + click to select a range
6434409
Make the library modular usable.
grafikrobot 8a54b9b
Sync from upstream.
grafikrobot 2af8477
Sync from upstream.
grafikrobot 6737e6b
Switch to library requirements instead of source. As source puts extr…
grafikrobot ea94f96
Sync from upstream.
grafikrobot 5ddea06
Add missing b2 testing module import.
grafikrobot cc3f35f
Replace relative docca refs with project based.
grafikrobot b50d7ee
Add missing NO_LIB usage requirements.
grafikrobot 432d609
Add missing import-search for cconfig/predef checks.
grafikrobot c17d422
Add requires-b2 check to top-level build file.
grafikrobot 7363e2f
Sync from upstream.
grafikrobot e31f3db
Update dependencies.
grafikrobot 458c009
Sync from upstream.
grafikrobot f0d6566
Sync from upstream.
grafikrobot e57748d
Sync from upstream.
grafikrobot dc05190
Bump B2 require to 5.2
grafikrobot 049ce18
Sync from upstream.
grafikrobot fef67e5
Sync from upstream.
grafikrobot 1aaf863
Sync from upstream.
grafikrobot dfd4928
Update copyright dates.
grafikrobot 22713a3
Move inter-lib dependencies to a project variable and into the build …
grafikrobot c0c826a
Sync from upstream.
grafikrobot 73ab6af
Sync from upstream.
grafikrobot File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file was deleted.
Oops, something went wrong.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,37 @@ | ||
| # 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/container//boost_container | ||
| /boost/container_hash//boost_container_hash | ||
| /boost/core//boost_core | ||
| /boost/describe//boost_describe | ||
| /boost/endian//boost_endian | ||
| /boost/mp11//boost_mp11 | ||
| /boost/static_assert//boost_static_assert | ||
| /boost/system//boost_system | ||
| /boost/throw_exception//boost_throw_exception ; | ||
|
|
||
| project /boost/json | ||
| : common-requirements | ||
| <include>include | ||
| ; | ||
|
|
||
| explicit | ||
grisumbras marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| [ alias boost_json : build//boost_json ] | ||
grisumbras marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| [ alias json_deps : build//json_deps ] | ||
| [ alias json_sources : build//json_sources ] | ||
| [ alias all : boost_json json_deps json_sources bench example fuzzing test ] | ||
| ; | ||
|
|
||
| call-if : boost-library json | ||
| : install boost_json | ||
| ; | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -9,7 +9,8 @@ | |
| # | ||
|
|
||
| import modules ; | ||
| import ../../config/checks/config ; | ||
| import-search /boost/config/checks ; | ||
| import config ; | ||
|
|
||
| # These make sure we only build on compatible C++11 or later toolchains. | ||
| obj cxx11_basic_alignas : ../check/basic_alignas.cpp ; | ||
|
|
@@ -54,7 +55,8 @@ rule warn-if-requested ( properties * ) | |
| } | ||
| } | ||
|
|
||
| project boost/json | ||
| project | ||
| : common-requirements <library>$(boost_dependencies) | ||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Shouldn't this be
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Actually, through local testing I discovered, that I need |
||
| : requirements | ||
| [ requires | ||
| config/cxx11_constexpr | ||
|
|
@@ -74,26 +76,25 @@ project boost/json | |
| <link>shared:<define>BOOST_JSON_DYN_LINK=1 | ||
| <link>static:<define>BOOST_JSON_STATIC_LINK=1 | ||
| <toolset>msvc:<define>_SCL_SECURE_NO_WARNINGS | ||
| <define>BOOST_JSON_NO_LIB=1 | ||
grisumbras marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| : source-location ../src | ||
| ; | ||
|
|
||
| alias json_deps | ||
| : usage-requirements | ||
| <library>/boost//container/<warnings-as-errors>off | ||
| <library>/boost/container//boost_container/<warnings-as-errors>off | ||
| ; | ||
|
|
||
| alias json_sources | ||
| : src.cpp | ||
| : usage-requirements | ||
| <library>/boost//container/<warnings-as-errors>off | ||
| <library>/boost/container//boost_container/<warnings-as-errors>off | ||
| ; | ||
|
|
||
| explicit json_deps json_sources ; | ||
|
|
||
| lib boost_json | ||
| : json_sources | ||
| : usage-requirements | ||
| <library>/boost//container/<warnings-as-errors>off | ||
| <library>/boost/container//boost_container/<warnings-as-errors>off | ||
| ; | ||
|
|
||
| boost-install boost_json ; | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.