diff --git a/build.jam b/build.jam new file mode 100644 index 000000000..a3bb20e1e --- /dev/null +++ b/build.jam @@ -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 + ; + +explicit + [ alias boost_mysql : : : : $(boost_dependencies) ] + [ alias all : boost_mysql example test ] + ; + +call-if : boost-library mysql + ; + diff --git a/doc/Jamfile b/doc/Jamfile index 1d1243c4b..87458d147 100644 --- a/doc/Jamfile +++ b/doc/Jamfile @@ -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 diff --git a/example/Jamfile b/example/Jamfile index ec1ead3a7..0e27f6bbf 100644 --- a/example/Jamfile +++ b/example/Jamfile @@ -7,6 +7,8 @@ import os ; +project : requirements /boost/mysql//boost_mysql ; + path-constant this_dir : . ; # The hostname to use for examples @@ -110,6 +112,7 @@ run /boost/mysql/test//boost_context_lib /boost/json//boost_json /boost/url//boost_url + /boost/beast//boost_beast : requirements "python $(this_dir)/private/run_connection_pool.py" $(hostname) diff --git a/test/Jamfile b/test/Jamfile index feda4a741..513e889c4 100644 --- a/test/Jamfile +++ b/test/Jamfile @@ -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 : requirements /boost/mysql//boost_mysql ; # Support header-only builds feature.feature boost.mysql.separate-compilation : on off : propagated composite ; @@ -43,7 +46,7 @@ alias fail_if_no_openssl explicit fail_if_no_openssl ; # Requirements to use across targets -local requirements = +local requirements = BOOST_ALL_NO_LIB=1 BOOST_ASIO_NO_DEPRECATED=1 BOOST_ASIO_DISABLE_BOOST_ARRAY=1 @@ -53,7 +56,7 @@ local requirements = BOOST_ASIO_DISABLE_BOOST_COROUTINE=1 BOOST_ASIO_HAS_DEFAULT_FUNCTION_TEMPLATE_ARGUMENTS=1 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 msvc:"/bigobj /wd4702 /permissive-" msvc:_SCL_SECURE_NO_WARNINGS=1 msvc:_SILENCE_CXX17_ALLOCATOR_VOID_DEPRECATION_WARNING @@ -68,7 +71,6 @@ local requirements = linux:_XOPEN_SOURCE=600 linux:_GNU_SOURCE=1 windows:_WIN32_WINNT=0x0601 - ../include on:BOOST_ASIO_USE_TS_EXECUTOR_AS_DEFAULT # Disable assertions when doing coverage, as they distort coverage data on:BOOST_DISABLE_ASSERTS diff --git a/test/unit/Jamfile b/test/unit/Jamfile index 4e3ea64a7..b76d2353b 100644 --- a/test/unit/Jamfile +++ b/test/unit/Jamfile @@ -136,7 +136,7 @@ run test/pfr.cpp test/pipeline.cpp test/with_diagnostics.cpp - + : requirements include : target-name boost_mysql_unittests