Skip to content

Commit

Permalink
Jamfile cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
@ashtum
ashtum committed Sep 4, 2024
1 parent 333b551 commit 3ddcf4e
Show file tree
Hide file tree
Showing 31 changed files with 146 additions and 164 deletions.
1 change: 1 addition & 0 deletions .github/workflows/fuzz.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ jobs:
- name: Run fuzzer
run: |
cd ../boost-root/libs/beast
mkdir build
cd build
cmake \
-DCMAKE_CXX_COMPILER=clang++ \
Expand Down
30 changes: 2 additions & 28 deletions build.jam
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,39 +36,13 @@ project /boost/beast
;

explicit
[ alias boost_beast : build//boost_beast ]
[ alias boost_beast_asio : build//boost_beast_asio ]
[ alias boost_beast_asio_ssl : build//boost_beast_asio_ssl ]
[ alias all : boost_beast boost_beast_asio boost_beast_asio_ssl example test ]
# Old-style targets. Remove once the rest of Beast changes.
[ alias lib-beast : boost_beast ]
[ alias lib-asio : boost_beast_asio ]
[ alias lib-asio-ssl : boost_beast_asio_ssl ]
[ alias boost_beast : : : : <library>$(boost_dependencies) ]
[ alias all : boost_beast example test ]
;

call-if : boost-library beast
: install boost_beast boost_beast_asio boost_beast_asio_ssl
;

feature.feature boost.beast.allow-deprecated : on off : propagated ;
feature.feature boost.beast.separate-compilation : on off : propagated ;
feature.feature boost.beast.valgrind : on off : optional propagated ;

variant beast_coverage
: debug
: <cxxflags>"-msse4.2 --coverage"
<linkflags>"--coverage"
;

variant beast_valgrind
: release
: <boost.beast.valgrind>on
;

variant beast_ubasan
: release
: <cxxflags>"-msse4.2 -funsigned-char -fno-omit-frame-pointer -fsanitize=address,undefined -fno-sanitize-recover=address,undefined -fsanitize-blacklist=libs/beast/tools/blacklist.supp"
<linkflags>"-fsanitize=address,undefined"
<define>BOOST_USE_ASAN=1
;

99 changes: 0 additions & 99 deletions build/Jamfile
View file

This file was deleted.

4 changes: 2 additions & 2 deletions example/Jamfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ project /boost/beast/example
cxx11_template_aliases
cxx11_variadic_templates
]
<library>/boost/beast//lib-asio/<link>static
<boost.beast.separate-compilation>on:<library>/boost/beast//lib-beast/<link>static
<library>/boost/beast/test//lib-asio/<link>static
<boost.beast.separate-compilation>on:<library>/boost/beast/test//lib-beast/<link>static
<include>..
;

Expand Down
2 changes: 1 addition & 1 deletion example/advanced/server-flex-awaitable/Jamfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import ac ;

project
: requirements
[ ac.check-library /boost/beast//lib-asio-ssl : <library>/boost/beast//lib-asio-ssl/<link>static : <build>no ]
[ ac.check-library /boost/beast/test//lib-asio-ssl : <library>/boost/beast/test//lib-asio-ssl/<link>static : <build>no ]
<library>/boost/scope//boost_scope
;

Expand Down
2 changes: 1 addition & 1 deletion example/advanced/server-flex/Jamfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import ac ;

project
: requirements
[ ac.check-library /boost/beast//lib-asio-ssl : <library>/boost/beast//lib-asio-ssl/<link>static : <build>no ]
[ ac.check-library /boost/beast/test//lib-asio-ssl : <library>/boost/beast/test//lib-asio-ssl/<link>static : <build>no ]
;

exe advanced-server-flex :
Expand Down
2 changes: 1 addition & 1 deletion example/http/client/async-ssl-system-executor/Jamfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import ac ;

project
: requirements
[ ac.check-library /boost/beast//lib-asio-ssl : <library>/boost/beast//lib-asio-ssl/<link>static : <build>no ]
[ ac.check-library /boost/beast/test//lib-asio-ssl : <library>/boost/beast/test//lib-asio-ssl/<link>static : <build>no ]
;

exe http-client-async-ssl-system-executor :
Expand Down
2 changes: 1 addition & 1 deletion example/http/client/async-ssl/Jamfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import ac ;

project
: requirements
[ ac.check-library /boost/beast//lib-asio-ssl : <library>/boost/beast//lib-asio-ssl/<link>static : <build>no ]
[ ac.check-library /boost/beast/test//lib-asio-ssl : <library>/boost/beast/test//lib-asio-ssl/<link>static : <build>no ]
;

exe http-client-async-ssl :
Expand Down
2 changes: 1 addition & 1 deletion example/http/client/awaitable-ssl/Jamfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import ac ;

project
: requirements
[ ac.check-library /boost/beast//lib-asio-ssl : <library>/boost/beast//lib-asio-ssl/<link>static : <build>no ]
[ ac.check-library /boost/beast/test//lib-asio-ssl : <library>/boost/beast/test//lib-asio-ssl/<link>static : <build>no ]
;

exe http-client-awaitable-ssl :
Expand Down
2 changes: 1 addition & 1 deletion example/http/client/coro-ssl/Jamfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import ac ;

project
: requirements
[ ac.check-library /boost/beast//lib-asio-ssl : <library>/boost/beast//lib-asio-ssl/<link>static : <build>no ]
[ ac.check-library /boost/beast/test//lib-asio-ssl : <library>/boost/beast/test//lib-asio-ssl/<link>static : <build>no ]
;

exe http-client-coro-ssl :
Expand Down
2 changes: 1 addition & 1 deletion example/http/client/sync-ssl/Jamfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import ac ;

project
: requirements
[ ac.check-library /boost/beast//lib-asio-ssl : <library>/boost/beast//lib-asio-ssl/<link>static : <build>no ]
[ ac.check-library /boost/beast/test//lib-asio-ssl : <library>/boost/beast/test//lib-asio-ssl/<link>static : <build>no ]
;

exe http-client-sync-ssl :
Expand Down
2 changes: 1 addition & 1 deletion example/http/server/async-ssl/Jamfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import ac ;

project
: requirements
[ ac.check-library /boost/beast//lib-asio-ssl : <library>/boost/beast//lib-asio-ssl/<link>static : <build>no ]
[ ac.check-library /boost/beast/test//lib-asio-ssl : <library>/boost/beast/test//lib-asio-ssl/<link>static : <build>no ]
;

exe http-server-async-ssl :
Expand Down
2 changes: 1 addition & 1 deletion example/http/server/coro-ssl/Jamfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import ac ;

project
: requirements
[ ac.check-library /boost/beast//lib-asio-ssl : <library>/boost/beast//lib-asio-ssl/<link>static : <build>no ]
[ ac.check-library /boost/beast/test//lib-asio-ssl : <library>/boost/beast/test//lib-asio-ssl/<link>static : <build>no ]
;

exe http-server-coro-ssl :
Expand Down
2 changes: 1 addition & 1 deletion example/http/server/flex/Jamfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import ac ;

project
: requirements
[ ac.check-library /boost/beast//lib-asio-ssl : <library>/boost/beast//lib-asio-ssl/<link>static : <build>no ]
[ ac.check-library /boost/beast/test//lib-asio-ssl : <library>/boost/beast/test//lib-asio-ssl/<link>static : <build>no ]
;

exe http-server-flex :
Expand Down
2 changes: 1 addition & 1 deletion example/http/server/stackless-ssl/Jamfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import ac ;

project
: requirements
[ ac.check-library /boost/beast//lib-asio-ssl : <library>/boost/beast//lib-asio-ssl/<link>static : <build>no ]
[ ac.check-library /boost/beast/test//lib-asio-ssl : <library>/boost/beast/test//lib-asio-ssl/<link>static : <build>no ]
;

exe http-server-stackless-ssl :
Expand Down
2 changes: 1 addition & 1 deletion example/http/server/sync-ssl/Jamfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import ac ;

project
: requirements
[ ac.check-library /boost/beast//lib-asio-ssl : <library>/boost/beast//lib-asio-ssl/<link>static : <build>no ]
[ ac.check-library /boost/beast/test//lib-asio-ssl : <library>/boost/beast/test//lib-asio-ssl/<link>static : <build>no ]
;

exe http-server-sync-ssl :
Expand Down
2 changes: 1 addition & 1 deletion example/websocket/client/async-ssl-system-executor/Jamfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import ac ;

project
: requirements
[ ac.check-library /boost/beast//lib-asio-ssl : <library>/boost/beast//lib-asio-ssl/<link>static : <build>no ]
[ ac.check-library /boost/beast/test//lib-asio-ssl : <library>/boost/beast/test//lib-asio-ssl/<link>static : <build>no ]
;

exe websocket-client-async-ssl-system-executor :
Expand Down
2 changes: 1 addition & 1 deletion example/websocket/client/async-ssl/Jamfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import ac ;

project
: requirements
[ ac.check-library /boost/beast//lib-asio-ssl : <library>/boost/beast//lib-asio-ssl/<link>static : <build>no ]
[ ac.check-library /boost/beast/test//lib-asio-ssl : <library>/boost/beast/test//lib-asio-ssl/<link>static : <build>no ]
;

exe websocket-client-async-ssl :
Expand Down
2 changes: 1 addition & 1 deletion example/websocket/client/coro-ssl/Jamfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import ac ;

project
: requirements
[ ac.check-library /boost/beast//lib-asio-ssl : <library>/boost/beast//lib-asio-ssl/<link>static : <build>no ]
[ ac.check-library /boost/beast/test//lib-asio-ssl : <library>/boost/beast/test//lib-asio-ssl/<link>static : <build>no ]
;

exe websocket-client-coro-ssl :
Expand Down
2 changes: 1 addition & 1 deletion example/websocket/client/sync-ssl/Jamfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import ac ;

project
: requirements
[ ac.check-library /boost/beast//lib-asio-ssl : <library>/boost/beast//lib-asio-ssl/<link>static : <build>no ]
[ ac.check-library /boost/beast/test//lib-asio-ssl : <library>/boost/beast/test//lib-asio-ssl/<link>static : <build>no ]
;

exe websocket-client-sync-ssl :
Expand Down
2 changes: 1 addition & 1 deletion example/websocket/server/async-ssl/Jamfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import ac ;

project
: requirements
[ ac.check-library /boost/beast//lib-asio-ssl : <library>/boost/beast//lib-asio-ssl/<link>static : <build>no ]
[ ac.check-library /boost/beast/test//lib-asio-ssl : <library>/boost/beast/test//lib-asio-ssl/<link>static : <build>no ]
;

exe websocket-server-async-ssl :
Expand Down
2 changes: 1 addition & 1 deletion example/websocket/server/coro-ssl/Jamfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import ac ;

project
: requirements
[ ac.check-library /boost/beast//lib-asio-ssl : <library>/boost/beast//lib-asio-ssl/<link>static : <build>no ]
[ ac.check-library /boost/beast/test//lib-asio-ssl : <library>/boost/beast/test//lib-asio-ssl/<link>static : <build>no ]
;

exe websocket-server-coro-ssl :
Expand Down
2 changes: 1 addition & 1 deletion example/websocket/server/stackless-ssl/Jamfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import ac ;

project
: requirements
[ ac.check-library /boost/beast//lib-asio-ssl : <library>/boost/beast//lib-asio-ssl/<link>static : <build>no ]
[ ac.check-library /boost/beast/test//lib-asio-ssl : <library>/boost/beast/test//lib-asio-ssl/<link>static : <build>no ]
;

exe websocket-server-stackless-ssl :
Expand Down
2 changes: 1 addition & 1 deletion example/websocket/server/sync-ssl/Jamfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import ac ;

project
: requirements
[ ac.check-library /boost/beast//lib-asio-ssl : <library>/boost/beast//lib-asio-ssl/<link>static : <build>no ]
[ ac.check-library /boost/beast/test//lib-asio-ssl : <library>/boost/beast/test//lib-asio-ssl/<link>static : <build>no ]
;

exe websocket-server-sync-ssl :
Expand Down
Loading

0 comments on commit 3ddcf4e

Please sign in to comment.