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

Add support for modular build structure. #320

Merged
merged 30 commits into from
Aug 19, 2024
Merged
Show file tree
Hide file tree
Changes from 24 commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
717b2ab
Make the library modular usable.
grafikrobot Mar 11, 2024
e2a31c2
Sync from upstream.
grafikrobot Mar 16, 2024
09d36a6
Be verbose on what submods we fetch.
grafikrobot Mar 19, 2024
cb8dfb7
Sync from upstream.
grafikrobot Mar 23, 2024
f817558
Switch to library requirements instead of source. As source puts extr…
grafikrobot Mar 30, 2024
08361d5
Sync from upstream.
grafikrobot Apr 10, 2024
be115e1
Sync from upstream.
grafikrobot Apr 20, 2024
0b01df4
Replace relative docca refs with project based.
grafikrobot Apr 27, 2024
3dff2fa
Update library dependencies.
grafikrobot Apr 29, 2024
912b5ca
Sync from upstream.
grafikrobot May 3, 2024
32f7772
Add requires-b2 check to top-level build file.
grafikrobot May 5, 2024
c458662
Sync from upstream.
grafikrobot May 11, 2024
e648359
Sync from upstream.
grafikrobot May 16, 2024
95926cb
Sync from upstream.
grafikrobot May 17, 2024
b7cdf90
Sync from upstream.
grafikrobot May 20, 2024
d168ceb
Sync from upstream.
grafikrobot May 30, 2024
b770693
Sync from upstream.
grafikrobot Jun 11, 2024
a3cdc54
Bump B2 require to 5.2
grafikrobot Jun 14, 2024
1b9ef41
Sync from upstream.
grafikrobot Jun 18, 2024
35932bd
Sync from upstream.
grafikrobot Jul 12, 2024
f77e4d6
Sync from upstream.
grafikrobot Jul 18, 2024
c5cd12f
Move inter-lib dependencies to a project variable and into the build …
grafikrobot Jul 24, 2024
e3ff58e
Remove mis-merge openssl. And remove not needed define.
grafikrobot Jul 24, 2024
bc1beee
Sync from upstream.
grafikrobot Jul 25, 2024
38a3815
Sync from upstream.
grafikrobot Jul 27, 2024
d713fb0
Sync from upstream.
grafikrobot Jul 30, 2024
fb63fb3
Sync from upstream.
grafikrobot Aug 2, 2024
949fd1c
Update build deps.
grafikrobot Aug 4, 2024
4f427d3
Sync from upstream.
grafikrobot Aug 9, 2024
a7604c4
Sync from upstream.
grafikrobot Aug 17, 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
36 changes: 36 additions & 0 deletions build.jam
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
# Copyright René Ferdinand Rivera Morell 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/asio//boost_asio
/boost/assert//boost_assert
/boost/charconv//boost_charconv
/boost/config//boost_config
/boost/core//boost_core
/boost/describe//boost_describe
/boost/endian//boost_endian
/boost/intrusive//boost_intrusive
/boost/mp11//boost_mp11
/boost/optional//boost_optional
/boost/pfr//boost_pfr
/boost/system//boost_system
/boost/throw_exception//boost_throw_exception
/boost/variant2//boost_variant2 ;

project /boost/mysql
: common-requirements
<include>include
;

explicit
[ alias boost_mysql : : : : <library>$(boost_dependencies) ]
[ alias all : boost_mysql example test ]
grafikrobot marked this conversation as resolved.
Show resolved Hide resolved
;

call-if : boost-library mysql
;

3 changes: 2 additions & 1 deletion doc/Jamfile
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@ project mysql/doc ;

import boostbook ;
import os ;
import ../../../tools/docca/docca.jam ;
import-search /boost/docca ;
import docca ;


# Note: adding server-specific error codes and collations to the reference
Expand Down
1 change: 1 addition & 0 deletions example/Jamfile
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,7 @@ run
/boost/mysql/test//boost_context_lib
/boost/json//boost_json
/boost/url//boost_url
/boost/beast//boost_beast
: requirements
<testing.launcher>"python $(this_dir)/private/run_connection_pool.py"
<testing.arg>$(hostname)
Expand Down
12 changes: 7 additions & 5 deletions test/Jamfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,17 @@
# file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
#

require-b2 5.0.1 ;
import-search /boost/config/checks ;

import os ;
import path ;
import feature ;
import ac ;
import indirect ;
import ../config/checks/config : requires ;
import config : requires ;

project /boost/mysql/test ;
project ;

# Support header-only builds
feature.feature boost.mysql.separate-compilation : on off : propagated composite ;
Expand Down Expand Up @@ -43,7 +46,7 @@ alias fail_if_no_openssl
explicit fail_if_no_openssl ;

# Requirements to use across targets
local requirements =
local requirements =
anarthal marked this conversation as resolved.
Show resolved Hide resolved
<define>BOOST_ALL_NO_LIB=1
<define>BOOST_ASIO_NO_DEPRECATED=1
<define>BOOST_ASIO_DISABLE_BOOST_ARRAY=1
Expand All @@ -53,7 +56,7 @@ local requirements =
<define>BOOST_ASIO_DISABLE_BOOST_COROUTINE=1
<define>BOOST_ASIO_HAS_DEFAULT_FUNCTION_TEMPLATE_ARGUMENTS=1
<define>BOOST_ALLOW_DEPRECATED_HEADERS=1
# Disable warning C4702: unreachable code, produced by Boost.Asio buffer.hpp
# Disable warning C4702: unreachable code, produced by Boost.Asio buffer.hpp
<toolset>msvc:<cxxflags>"/bigobj /wd4702 /permissive-"
<toolset>msvc:<define>_SCL_SECURE_NO_WARNINGS=1
<toolset>msvc:<define>_SILENCE_CXX17_ALLOCATOR_VOID_DEPRECATION_WARNING
Expand All @@ -68,7 +71,6 @@ local requirements =
<target-os>linux:<define>_XOPEN_SOURCE=600
<target-os>linux:<define>_GNU_SOURCE=1
<target-os>windows:<define>_WIN32_WINNT=0x0601
<include>../include
<boost.mysql.use-ts-executor>on:<define>BOOST_ASIO_USE_TS_EXECUTOR_AS_DEFAULT
# Disable assertions when doing coverage, as they distort coverage data
<coverage>on:<define>BOOST_DISABLE_ASSERTS
Expand Down
2 changes: 1 addition & 1 deletion test/unit/Jamfile
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ run
test/constant_string_view.cpp
test/pfr.cpp
test/pipeline.cpp

: requirements
<include>include
: target-name boost_mysql_unittests
Expand Down