feedc0de/boost_beast
1
0 Fork 0
forked from boostorg/beast
Code Pull Requests Activity

Jamfile cleanup:

Browse Source 
- Don't set the global link settings (`<link>`) to avoid dependency
ordering issues in the future.
- Allow the user to decide on the link settings for dependencies
(filesystem/coroutine).
- Make dependencies in examples explicit.
- Remove dependency of examples on Boost.Filesystem (was not used there).
- Deduplicate build settings.
- Speed up test compilation by avoiding rebuilding of main test file.

Signed-off-by: Damian Jarek <damian.jarek93@gmail.com>
This commit is contained in:
Damian Jarek committed 2019-03-21 17:23:49 +01:00
1 parent 1f560692ac
commit 222dcf7b18
51 files changed
+114 -122
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

test/Jamfile
+10 -2
View File
@@ -10,6 +10,12 @@
import testing ;
import ../../config/checks/config : requires ;
lib test_main
: $(TEST_MAIN)
: requirements
;
project /boost/beast/test
: requirements
[ requires
@@ -23,8 +29,10 @@ project /boost/beast/test
<include>./extern
<define>BOOST_BEAST_ALLOW_DEPRECATED
<define>BOOST_BEAST_TESTS
<define>BOOST_ASIO_SEPARATE_COMPILATION
<library>/boost/beast//static_ssl_asio
<library>/boost/beast//static_ssl_asio/<link>static
<library>/boost/beast/test//test_main/<link>static
<library>/boost/filesystem//boost_filesystem
<library>/boost/coroutine//boost_coroutine
;
path-constant ZLIB_SOURCES :
test/beast/_experimental/Jamfile
+3 -3
View File
@@ -17,15 +17,15 @@ local RUN_TESTS ;
for local f in $(SOURCES)
{
RUN_TESTS += [ run $(f) $(TEST_MAIN) ] ;
RUN_TESTS += [ run $(f) ] ;
}
alias run-tests : $(RUN_TESTS) ;
exe fat-tests : $(TEST_MAIN) $(SOURCES) ;
exe fat-tests : $(SOURCES) ;
explicit fat-tests ;
run $(TEST_MAIN) $(SOURCES) : : : : run-fat-tests ;
run $(SOURCES) : : : : run-fat-tests ;
explicit run-fat-tests ;
test/beast/core/Jamfile
+3 -3
View File
@@ -61,15 +61,15 @@ local RUN_TESTS ;
for local f in $(SOURCES)
{
RUN_TESTS += [ run $(f) $(TEST_MAIN) ] ;
RUN_TESTS += [ run $(f) ] ;
}
alias run-tests : $(RUN_TESTS) ;
exe fat-tests : $(TEST_MAIN) $(SOURCES) ;
exe fat-tests : $(SOURCES) ;
explicit fat-tests ;
run $(TEST_MAIN) $(SOURCES) : : : : run-fat-tests ;
run $(SOURCES) : : : : run-fat-tests ;
explicit run-fat-tests ;
test/beast/http/Jamfile
+3 -3
View File
@@ -36,15 +36,15 @@ local RUN_TESTS ;
for local f in $(SOURCES)
{
RUN_TESTS += [ run $(f) $(TEST_MAIN) ] ;
RUN_TESTS += [ run $(f) ] ;
}
alias run-tests : $(RUN_TESTS) ;
exe fat-tests : $(TEST_MAIN) $(SOURCES) ;
exe fat-tests : $(SOURCES) ;
explicit fat-tests ;
run $(TEST_MAIN) $(SOURCES) : : : : run-fat-tests ;
run $(SOURCES) : : : : run-fat-tests ;
explicit run-fat-tests ;
test/beast/ssl/Jamfile
+3 -3
View File
@@ -15,15 +15,15 @@ local RUN_TESTS ;
for local f in $(SOURCES)
{
RUN_TESTS += [ run $(f) $(TEST_MAIN) ] ;
RUN_TESTS += [ run $(f) ] ;
}
alias run-tests : $(RUN_TESTS) ;
exe fat-tests : $(TEST_MAIN) $(SOURCES) ;
exe fat-tests : $(SOURCES) ;
explicit fat-tests ;
run $(TEST_MAIN) $(SOURCES) : : : : run-fat-tests ;
run $(SOURCES) : : : : run-fat-tests ;
explicit run-fat-tests ;
test/beast/websocket/Jamfile
+3 -3
View File
@@ -37,15 +37,15 @@ local RUN_TESTS ;
for local f in $(SOURCES)
{
RUN_TESTS += [ run $(f) $(TEST_MAIN) ] ;
RUN_TESTS += [ run $(f) ] ;
}
alias run-tests : $(RUN_TESTS) ;
exe fat-tests : $(TEST_MAIN) $(SOURCES) ;
exe fat-tests : $(SOURCES) ;
explicit fat-tests ;
run $(TEST_MAIN) $(SOURCES) : : : : run-fat-tests ;
run $(SOURCES) : : : : run-fat-tests ;
explicit run-fat-tests ;
test/beast/zlib/Jamfile
+3 -3
View File
@@ -18,15 +18,15 @@ local RUN_TESTS ;
for local f in $(SOURCES)
{
RUN_TESTS += [ run $(f) $(TEST_MAIN) $(ZLIB_SOURCES) ] ;
RUN_TESTS += [ run $(f) $(ZLIB_SOURCES) ] ;
}
alias run-tests : $(RUN_TESTS) ;
exe fat-tests : $(TEST_MAIN) $(ZLIB_SOURCES) $(SOURCES) ;
exe fat-tests : $(ZLIB_SOURCES) $(SOURCES) ;
explicit fat-tests ;
run $(TEST_MAIN) $(ZLIB_SOURCES) $(SOURCES) : : : : run-fat-tests ;
run $(ZLIB_SOURCES) $(SOURCES) : : : : run-fat-tests ;
explicit run-fat-tests ;
test/bench/buffers/Jamfile
+1 -1
View File
@@ -8,7 +8,7 @@
#
exe bench-buffers :
$(TEST_MAIN)
bench_buffers.cpp
;
test/bench/parser/Jamfile
+1 -1
View File
@@ -7,7 +7,7 @@
# Official repository: https://github.com/boostorg/beast
#
run $(TEST_MAIN) nodejs_parser.cpp bench_parser.cpp : : : : bench-parser ;
run nodejs_parser.cpp bench_parser.cpp : : : : bench-parser ;
explicit bench-parser ;
test/bench/utf8_checker/Jamfile
+1 -1
View File
@@ -8,7 +8,7 @@
#
exe bench-utf8-checker :
$(TEST_MAIN)
bench_utf8_checker.cpp
;
test/bench/zlib/Jamfile
+1 -1
View File
@@ -9,7 +9,7 @@
exe bench-zlib :
$(ZLIB_SOURCES)
$(TEST_MAIN)
deflate_stream.cpp
inflate_stream.cpp
;
test/doc/Jamfile
+16 -24
View File
@@ -7,35 +7,27 @@
# Official repository: https://github.com/boostorg/beast
#
import ac ;
project
: requirements
[ ac.check-library /boost/beast//ssl : <library>/boost/beast//ssl : <build>no ]
<library>/boost/beast//crypto
;
alias run-tests :
[ compile core_snippets.cpp ]
[ compile http_snippets.cpp ]
[ run core_1_refresher.cpp $(TEST_MAIN) ]
[ run core_3_timeouts.cpp $(TEST_MAIN) ]
[ run core_4_layers.cpp $(TEST_MAIN) ]
[ run http_10_custom_parser.cpp $(TEST_MAIN) ]
[ run http_examples.cpp $(TEST_MAIN) ]
[ run websocket.cpp $(TEST_MAIN) ]
[ run websocket_1_connecting.cpp $(TEST_MAIN) ]
[ run websocket_2_handshaking.cpp $(TEST_MAIN) ]
[ run websocket_3_decorator.cpp $(TEST_MAIN) ]
[ run websocket_4_messages.cpp $(TEST_MAIN) ]
[ run websocket_5_control_frames.cpp $(TEST_MAIN) ]
[ run websocket_6_timeouts.cpp $(TEST_MAIN) ]
[ run websocket_7_teardown.cpp $(TEST_MAIN) ]
[ run websocket_8_notes.cpp $(TEST_MAIN) ]
[ run core_1_refresher.cpp ]
[ run core_3_timeouts.cpp ]
[ run core_4_layers.cpp ]
[ run http_10_custom_parser.cpp ]
[ run http_examples.cpp ]
[ run websocket.cpp ]
[ run websocket_1_connecting.cpp ]
[ run websocket_2_handshaking.cpp ]
[ run websocket_3_decorator.cpp ]
[ run websocket_4_messages.cpp ]
[ run websocket_5_control_frames.cpp ]
[ run websocket_6_timeouts.cpp ]
[ run websocket_7_teardown.cpp ]
[ run websocket_8_notes.cpp ]
;
exe fat-tests :
$(TEST_MAIN)
core_1_refresher.cpp
core_3_timeouts.cpp
core_4_layers.cpp
@@ -54,6 +46,6 @@ exe fat-tests :
explicit fat-tests ;
run $(TEST_MAIN) $(SOURCES) : : : : run-fat-tests ;
run fat-tests : : : : run-fat-tests ;
explicit run-fat-tests ;
test/example/Jamfile
+1 -1
View File
@@ -15,6 +15,6 @@ alias fat-tests ;
explicit fat-tests ;
run $(TEST_MAIN) $(SOURCES) : : : : run-fat-tests ;
alias run-fat-tests : common//run-tests ;
explicit run-fat-tests ;