diff --git a/Jamfile b/Jamfile deleted file mode 100644 index 4ab8fe781..000000000 --- a/Jamfile +++ /dev/null @@ -1,15 +0,0 @@ -# -# Copyright (c) 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/json -# - -import feature ; - -build-project bench ; -build-project test ; -build-project fuzzing ; -build-project example ; diff --git a/bench/Jamfile b/bench/Jamfile index f6fcdf1f8..679f13c31 100644 --- a/bench/Jamfile +++ b/bench/Jamfile @@ -11,6 +11,7 @@ import common ; import os ; import path ; import property ; +import notfile ; import bench.jam ; import feature ; diff --git a/build.jam b/build.jam new file mode 100644 index 000000000..2001b3303 --- /dev/null +++ b/build.jam @@ -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 + ; + +explicit + [ alias boost_json : build//boost_json ] + [ 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 + ; + diff --git a/build/Jamfile b/build/Jamfile index 3eb4d55df..4700d2c83 100644 --- a/build/Jamfile +++ b/build/Jamfile @@ -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 $(boost_dependencies) : requirements [ requires config/cxx11_constexpr @@ -74,18 +76,19 @@ project boost/json shared:BOOST_JSON_DYN_LINK=1 static:BOOST_JSON_STATIC_LINK=1 msvc:_SCL_SECURE_NO_WARNINGS + BOOST_JSON_NO_LIB=1 : source-location ../src ; alias json_deps : usage-requirements - /boost//container/off + /boost/container//boost_container/off ; alias json_sources : src.cpp : usage-requirements - /boost//container/off + /boost/container//boost_container/off ; explicit json_deps json_sources ; @@ -93,7 +96,5 @@ explicit json_deps json_sources ; lib boost_json : json_sources : usage-requirements - /boost//container/off + /boost/container//boost_container/off ; - -boost-install boost_json ; diff --git a/doc/Jamfile b/doc/Jamfile index 5b9399de0..9be086cb4 100644 --- a/doc/Jamfile +++ b/doc/Jamfile @@ -11,7 +11,8 @@ project json/doc ; import boostbook ; -import ../../../tools/docca/docca.jam ; +import-search /boost/docca ; +import docca ; import path ; local include-prefix = [ path.root $(__file__:D) [ path.pwd ] ] ; diff --git a/fuzzing/Jamfile b/fuzzing/Jamfile index e81395114..99ef3f139 100644 --- a/fuzzing/Jamfile +++ b/fuzzing/Jamfile @@ -16,6 +16,7 @@ import os ; import path ; import property ; import sequence ; +import testing ; # set the maximum size of the input, to avoid