boostorg/beast
1
0
Fork 1
mirror of https://github.com/boostorg/beast.git synced 2025-07-31 05:17:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

Remove the need for OpenSSL in examples that don't use it

Browse Source 
close #1524

It is now possible to compile examples without OpenSSL. Examples that
do require OpenSSL will be omitted.

Signed-off-by: Damian Jarek <damian.jarek93@gmail.com>
This commit is contained in:
Damian Jarek
2019-03-18 22:42:31 +01:00
committed by Vinnie Falco
parent 0c3ca62590
commit 05f3f8a5ce
21 changed files with 61 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
CHANGELOG.md
View File

@ -1,3 +1,9 @@
Version 234:
* Don't link to OpenSSL needlessly (bjam)
--------------------------------------------------------------------------------
Version 233: Version 233:
* Check __ANDROID__ instead * Check __ANDROID__ instead

26
Jamfile
View File

@ -76,6 +76,29 @@ lib static_beast
<toolset>msvc:<define>_SILENCE_CXX17_ADAPTOR_TYPEDEFS_DEPRECATION_WARNING <toolset>msvc:<define>_SILENCE_CXX17_ADAPTOR_TYPEDEFS_DEPRECATION_WARNING
<target-os>windows:<define>_WIN32_WINNT=0x0601 <target-os>windows:<define>_WIN32_WINNT=0x0601
<link>static <link>static
: usage-requirements
<define>BOOST_BEAST_SPLIT_COMPILATION
<define>BOOST_ASIO_SEPARATE_COMPILATION
<define>BOOST_ASIO_NO_DEPRECATED=1
<define>BOOST_ASIO_DISABLE_BOOST_ARRAY=1
<define>BOOST_ASIO_DISABLE_BOOST_BIND=1
<define>BOOST_ASIO_DISABLE_BOOST_DATE_TIME=1
<define>BOOST_ASIO_DISABLE_BOOST_REGEX=1
<define>BOOST_COROUTINES_NO_DEPRECATION_WARNING=1
<toolset>msvc-14.1:<cxxflags>"/permissive-"
<toolset>msvc:<define>_SCL_SECURE_NO_WARNINGS=1
<toolset>msvc:<define>_CRT_SECURE_NO_WARNINGS=1
<toolset>msvc:<define>_SILENCE_CXX17_ALLOCATOR_VOID_DEPRECATION_WARNING
<toolset>msvc:<define>_SILENCE_CXX17_ADAPTOR_TYPEDEFS_DEPRECATION_WARNING
<target-os>windows:<define>_WIN32_WINNT=0x0601
;
lib static_ssl_asio
: test/lib_ssl.cpp
: requirements
<link>static
<library>static_beast
[ ac.check-library /boost/beast//ssl : <library>/boost/beast//ssl/<link>shared : <build>no ]
[ ac.check-library /boost/beast//crypto : <library>/boost/beast//crypto/<link>shared : <build>no ]
; ;
project /boost/beast project /boost/beast
@ -84,14 +107,11 @@ project /boost/beast
<include>./test/extras/include <include>./test/extras/include
<library>/boost/coroutine//boost_coroutine <library>/boost/coroutine//boost_coroutine
<library>/boost/filesystem//boost_filesystem <library>/boost/filesystem//boost_filesystem
#<library>static_asio
<library>static_beast <library>static_beast
<implicit-dependency>/boost//headers <implicit-dependency>/boost//headers
<threading>multi <threading>multi
<debug-symbols>on <debug-symbols>on
<runtime-link>shared <runtime-link>shared
[ ac.check-library /boost/beast//ssl : <library>/boost/beast//ssl : <build>no ]
<library>/boost/beast//crypto
<define>BOOST_ALL_NO_LIB=1 <define>BOOST_ALL_NO_LIB=1
<define>BOOST_BEAST_SPLIT_COMPILATION <define>BOOST_BEAST_SPLIT_COMPILATION
<define>BOOST_ASIO_SEPARATE_COMPILATION <define>BOOST_ASIO_SEPARATE_COMPILATION

3
example/advanced/server-flex/Jamfile
View File

@ -11,8 +11,7 @@ import ac ;
project project
: requirements : requirements
[ ac.check-library /boost/beast//ssl : <library>/boost/beast//ssl : <build>no ] [ ac.check-library /boost/beast//static_ssl_asio : <library>/boost/beast//static_ssl_asio : <build>no ]
<library>/boost/beast//crypto
; ;
exe advanced-server-flex : exe advanced-server-flex :

3
example/http/client/async-ssl/Jamfile
View File

@ -11,8 +11,7 @@ import ac ;
project project
: requirements : requirements
[ ac.check-library /boost/beast//ssl : <library>/boost/beast//ssl : <build>no ] [ ac.check-library /boost/beast//static_ssl_asio : <library>/boost/beast//static_ssl_asio : <build>no ]
<library>/boost/beast//crypto
; ;
exe http-client-async-ssl : exe http-client-async-ssl :

3
example/http/client/coro-ssl/Jamfile
View File

@ -11,8 +11,7 @@ import ac ;
project project
: requirements : requirements
[ ac.check-library /boost/beast//ssl : <library>/boost/beast//ssl : <build>no ] [ ac.check-library /boost/beast//static_ssl_asio : <library>/boost/beast//static_ssl_asio : <build>no ]
<library>/boost/beast//crypto
; ;
exe http-client-coro-ssl : exe http-client-coro-ssl :

3
example/http/client/sync-ssl/Jamfile
View File

@ -11,8 +11,7 @@ import ac ;
project project
: requirements : requirements
[ ac.check-library /boost/beast//ssl : <library>/boost/beast//ssl : <build>no ] [ ac.check-library /boost/beast//static_ssl_asio : <library>/boost/beast//static_ssl_asio : <build>no ]
<library>/boost/beast//crypto
; ;
exe http-client-sync-ssl : exe http-client-sync-ssl :

3
example/http/server/async-ssl/Jamfile
View File

@ -11,8 +11,7 @@ import ac ;
project project
: requirements : requirements
[ ac.check-library /boost/beast//ssl : <library>/boost/beast//ssl : <build>no ] [ ac.check-library /boost/beast//static_ssl_asio : <library>/boost/beast//static_ssl_asio : <build>no ]
<library>/boost/beast//crypto
; ;
exe http-server-async-ssl : exe http-server-async-ssl :

3
example/http/server/coro-ssl/Jamfile
View File

@ -11,8 +11,7 @@ import ac ;
project project
: requirements : requirements
[ ac.check-library /boost/beast//ssl : <library>/boost/beast//ssl : <build>no ] [ ac.check-library /boost/beast//static_ssl_asio : <library>/boost/beast//static_ssl_asio : <build>no ]
<library>/boost/beast//crypto
; ;
exe http-server-coro-ssl : exe http-server-coro-ssl :

3
example/http/server/flex/Jamfile
View File

@ -11,8 +11,7 @@ import ac ;
project project
: requirements : requirements
[ ac.check-library /boost/beast//ssl : <library>/boost/beast//ssl : <build>no ] [ ac.check-library /boost/beast//static_ssl_asio : <library>/boost/beast//static_ssl_asio : <build>no ]
<library>/boost/beast//crypto
; ;
exe http-server-flex : exe http-server-flex :

3
example/http/server/stackless-ssl/Jamfile
View File

@ -11,8 +11,7 @@ import ac ;
project project
: requirements : requirements
[ ac.check-library /boost/beast//ssl : <library>/boost/beast//ssl : <build>no ] [ ac.check-library /boost/beast//static_ssl_asio : <library>/boost/beast//static_ssl_asio : <build>no ]
<library>/boost/beast//crypto
; ;
exe http-server-stackless-ssl : exe http-server-stackless-ssl :

3
example/http/server/sync-ssl/Jamfile
View File

@ -11,8 +11,7 @@ import ac ;
project project
: requirements : requirements
[ ac.check-library /boost/beast//ssl : <library>/boost/beast//ssl : <build>no ] [ ac.check-library /boost/beast//static_ssl_asio : <library>/boost/beast//static_ssl_asio : <build>no ]
<library>/boost/beast//crypto
; ;
exe http-server-sync-ssl : exe http-server-sync-ssl :

3
example/websocket/client/async-ssl/Jamfile
View File

@ -11,8 +11,7 @@ import ac ;
project project
: requirements : requirements
[ ac.check-library /boost/beast//ssl : <library>/boost/beast//ssl : <build>no ] [ ac.check-library /boost/beast//static_ssl_asio : <library>/boost/beast//static_ssl_asio : <build>no ]
<library>/boost/beast//crypto
; ;
exe websocket-client-async-ssl : exe websocket-client-async-ssl :

3
example/websocket/client/coro-ssl/Jamfile
View File

@ -11,8 +11,7 @@ import ac ;
project project
: requirements : requirements
[ ac.check-library /boost/beast//ssl : <library>/boost/beast//ssl : <build>no ] [ ac.check-library /boost/beast//static_ssl_asio : <library>/boost/beast//static_ssl_asio : <build>no ]
<library>/boost/beast//crypto
; ;
exe websocket-client-coro-ssl : exe websocket-client-coro-ssl :

3
example/websocket/client/sync-ssl/Jamfile
View File

@ -11,8 +11,7 @@ import ac ;
project project
: requirements : requirements
[ ac.check-library /boost/beast//ssl : <library>/boost/beast//ssl : <build>no ] [ ac.check-library /boost/beast//static_ssl_asio : <library>/boost/beast//static_ssl_asio : <build>no ]
<library>/boost/beast//crypto
; ;
exe websocket-client-sync-ssl : exe websocket-client-sync-ssl :

3
example/websocket/server/async-ssl/Jamfile
View File

@ -11,8 +11,7 @@ import ac ;
project project
: requirements : requirements
[ ac.check-library /boost/beast//ssl : <library>/boost/beast//ssl : <build>no ] [ ac.check-library /boost/beast//static_ssl_asio : <library>/boost/beast//static_ssl_asio : <build>no ]
<library>/boost/beast//crypto
; ;
exe websocket-server-async-ssl : exe websocket-server-async-ssl :

3
example/websocket/server/coro-ssl/Jamfile
View File

@ -11,8 +11,7 @@ import ac ;
project project
: requirements : requirements
[ ac.check-library /boost/beast//ssl : <library>/boost/beast//ssl : <build>no ] [ ac.check-library /boost/beast//static_ssl_asio : <library>/boost/beast//static_ssl_asio : <build>no ]
<library>/boost/beast//crypto
; ;
exe websocket-server-coro-ssl : exe websocket-server-coro-ssl :

3
example/websocket/server/stackless-ssl/Jamfile
View File

@ -11,8 +11,7 @@ import ac ;
project project
: requirements : requirements
[ ac.check-library /boost/beast//ssl : <library>/boost/beast//ssl : <build>no ] [ ac.check-library /boost/beast//static_ssl_asio : <library>/boost/beast//static_ssl_asio : <build>no ]
<library>/boost/beast//crypto
; ;
exe websocket-server-stackless-ssl : exe websocket-server-stackless-ssl :

3
example/websocket/server/sync-ssl/Jamfile
View File

@ -11,8 +11,7 @@ import ac ;
project project
: requirements : requirements
[ ac.check-library /boost/beast//ssl : <library>/boost/beast//ssl : <build>no ] [ ac.check-library /boost/beast//static_ssl_asio : <library>/boost/beast//static_ssl_asio : <build>no ]
<library>/boost/beast//crypto
; ;
exe websocket-server-sync-ssl : exe websocket-server-sync-ssl :

1
test/Jamfile
View File

@ -24,6 +24,7 @@ project /boost/beast/test
<define>BOOST_BEAST_ALLOW_DEPRECATED <define>BOOST_BEAST_ALLOW_DEPRECATED
<define>BOOST_BEAST_TESTS <define>BOOST_BEAST_TESTS
<define>BOOST_ASIO_SEPARATE_COMPILATION <define>BOOST_ASIO_SEPARATE_COMPILATION
<library>/boost/beast//static_ssl_asio
; ;
path-constant ZLIB_SOURCES : path-constant ZLIB_SOURCES :

1
test/lib_beast.cpp
View File

@ -12,7 +12,6 @@
// BOOST_ASIO_SEPARATE_COMPILATION for asio // BOOST_ASIO_SEPARATE_COMPILATION for asio
#include <boost/asio/impl/src.hpp> #include <boost/asio/impl/src.hpp>
#include <boost/asio/ssl/impl/src.hpp>
// BOOST_BEAST_SPLIT_COMPILATION for beast // BOOST_BEAST_SPLIT_COMPILATION for beast
#include <boost/beast/src.hpp> #include <boost/beast/src.hpp>

15
test/lib_ssl.cpp Normal file
View File

@ -0,0 +1,15 @@
//
// Copyright (c) 2016-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/beast
//
// This file is used to build a static library with
// asio and beast definitions, to reduce compilation time.
// BOOST_ASIO_SEPARATE_COMPILATION for asio::ssl
#include <boost/asio/ssl/impl/src.hpp>