Remove unnecessary build script code

This commit is contained in:
Dmitry Arkhipov 2021-10-03 17:13:21 +03:00
parent a9b1cecae4
commit a30b76c51b
6 changed files with 37 additions and 74 deletions

23
Jamfile
View File

@ -7,29 +7,6 @@
# Official repository: https://github.com/boostorg/json # Official repository: https://github.com/boostorg/json
# #
import ../config/checks/config : requires ;
# These make sure we only build on
# compatible C++11 or later toolchains.
obj check_basic_alignas : check/basic_alignas.cpp ;
explicit check_basic_alignas ;
constant c11-requires :
[ requires
cxx11_constexpr
cxx11_decltype
cxx11_hdr_tuple
cxx11_template_aliases
cxx11_variadic_templates
]
# We only require limited alignas support,
# so we have to use a custom check
[ check-target-builds
..//check_basic_alignas cxx11_basic_alignas : : <build>no
]
;
path-constant LIB_DIR : . ;
build-project bench ; build-project bench ;
build-project test ; build-project test ;

View File

@ -22,8 +22,6 @@ else
LIB = <library>/boost/json//boost_json ; LIB = <library>/boost/json//boost_json ;
} }
project : requirements $(c11-requires) ;
exe bench : exe bench :
bench.cpp bench.cpp
: :

View File

@ -1,5 +1,6 @@
# #
# Copyright (c) 2019 Vinnie Falco (vinnie dot falco at gmail dot com) # Copyright (c) 2019 Vinnie Falco (vinnie dot falco at gmail dot com)
# Copyright (c) 2021 Dmitry Arkhipov (grisumbras@gmail.com)
# #
# Distributed under the Boost Software License, Version 1.0. (See accompanying # 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) # file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@ -9,17 +10,32 @@
import ../../config/checks/config : requires ; import ../../config/checks/config : requires ;
# These make sure we only build on compatible C++11 or later toolchains.
obj check_basic_alignas : ../check/basic_alignas.cpp ;
explicit check_basic_alignas ;
project boost/json project boost/json
: requirements : requirements
$(c11-requires) [ requires
cxx11_constexpr
cxx11_decltype
cxx11_hdr_tuple
cxx11_template_aliases
cxx11_variadic_templates
]
# We only require limited alignas support,
# so we have to use a custom check
[ check-target-builds
check_basic_alignas cxx11_basic_alignas : : <build>no
]
<link>shared:<define>BOOST_JSON_DYN_LINK=1 <link>shared:<define>BOOST_JSON_DYN_LINK=1
<link>static:<define>BOOST_JSON_STATIC_LINK=1 <link>static:<define>BOOST_JSON_STATIC_LINK=1
<library>/boost//container/<warnings-as-errors>off <library>/boost//container/<warnings-as-errors>off
<define>BOOST_JSON_SOURCE <define>BOOST_JSON_SOURCE
: usage-requirements : usage-requirements
$(c11-requires)
<link>shared:<define>BOOST_JSON_DYN_LINK=1 <link>shared:<define>BOOST_JSON_DYN_LINK=1
<link>static:<define>BOOST_JSON_STATIC_LINK=1 <link>static:<define>BOOST_JSON_STATIC_LINK=1
<library>/boost//container/<warnings-as-errors>off
: source-location ../src : source-location ../src
; ;

View File

@ -22,8 +22,6 @@ else
LIB = <library>/boost/json//boost_json ; LIB = <library>/boost/json//boost_json ;
} }
project : requirements $(c11-requires) ;
exe path : exe path :
path.cpp path.cpp
: : : :

View File

@ -22,8 +22,6 @@ else
LIB = <library>/boost/json//boost_json ; LIB = <library>/boost/json//boost_json ;
} }
project : requirements $(c11-requires) ;
# See the comments in CMakeLists.txt for why # See the comments in CMakeLists.txt for why
# these are libraries and not exe targets. # these are libraries and not exe targets.
lib fuzzerlib_basic_parser : lib fuzzerlib_basic_parser :

View File

@ -39,6 +39,7 @@ local SOURCES =
fwd.cpp fwd.cpp
json.cpp json.cpp
kind.cpp kind.cpp
memory_resource.cpp
monotonic_resource.cpp monotonic_resource.cpp
natvis.cpp natvis.cpp
null_resource.cpp null_resource.cpp
@ -66,55 +67,30 @@ local SOURCES =
ryu/d2s_test.cpp ryu/d2s_test.cpp
; ;
local LIMIT_SOURCES = project : requirements <include>. ;
limits.cpp
;
local RUN_TESTS ;
project : requirements $(c11-requires) ;
for local f in $(SOURCES) for local f in $(SOURCES)
{ {
RUN_TESTS += [
run $(f) main.cpp run $(f) main.cpp
/boost//container/<warnings-as-errors>off : : : $(LIB)
: : : $(LIB) <include>. ;
] ;
} }
RUN_TESTS += [ run limits.cpp main.cpp
run memory_resource.cpp main.cpp /boost/json//json_sources
/boost//container/<warnings-as-errors>off
: : : : : :
$(LIB)
<include>.
] ;
for local f in $(LIMIT_SOURCES)
{
RUN_TESTS += [
run $(f) main.cpp
/boost//container/<warnings-as-errors>off
: : :
<source>../src/src.cpp
<include>.
<define>BOOST_JSON_MAX_STRING_SIZE=1000 <define>BOOST_JSON_MAX_STRING_SIZE=1000
<define>BOOST_JSON_MAX_STRUCTURED_SIZE=20 <define>BOOST_JSON_MAX_STRUCTURED_SIZE=20
<define>BOOST_JSON_STACK_BUFFER_SIZE=256 <define>BOOST_JSON_STACK_BUFFER_SIZE=256
] ; ;
}
if ! $(STANDALONE) if ! $(STANDALONE)
{ {
RUN_TESTS += [
compile standalone_with_boost.cpp compile standalone_with_boost.cpp
: [ requires : [ requires
cxx17_hdr_string_view cxx17_hdr_string_view
cxx17_hdr_memory_resource cxx17_hdr_memory_resource
] ]
<define>BOOST_JSON_STANDALONE=1 <define>BOOST_JSON_STANDALONE=1
] ; ;
} }
alias run-tests : $(RUN_TESTS) ;