From 2eedbfedfc1632d88f69219e890656d2512b7d13 Mon Sep 17 00:00:00 2001
From: Damian Jarek <damian.jarek93@gmail.com>
Date: Sun, 26 May 2019 17:09:08 +0200
Subject: [PATCH] Add b2 features for compile-time options used in testing:

- `boost.beast.allow-deprecated=on` disables deprecated features.
- `boost.beast.separate-compilation=on` enables separate compilation.
- Add CI matrix items to check header-only, no-deprecated build.

Signed-off-by: Damian Jarek <damian.jarek93@gmail.com>
---
 CHANGELOG.md        |  6 ++++++
 Jamfile             |  7 ++++++-
 azure-pipelines.yml | 17 +++++++++++++++++
 example/Jamfile     |  2 +-
 test/Jamfile        |  3 +--
 5 files changed, 31 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1b804bc8..27f17039 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,9 @@
+Version 257:
+
+* Add b2 features for compile-time options used in testing
+
+--------------------------------------------------------------------------------
+
 Version 256:
 
 * Remove uses of the deprecated `buffers` function
diff --git a/Jamfile b/Jamfile
index b3172341..5c2d1409 100644
--- a/Jamfile
+++ b/Jamfile
@@ -31,6 +31,12 @@ lib crypt32 ;
 lib ssl : : <target-os>windows <name>ssleay32 ;
 lib crypto : : <target-os>windows <name>libeay32 ;
 
+feature.feature boost.beast.allow-deprecated : on off : optional propagated composite ;
+feature.compose <boost.beast.allow-deprecated>on : <define>BOOST_BEAST_ALLOW_DEPRECATED ;
+
+feature.feature boost.beast.separate-compilation : on off : optional propagated composite ;
+feature.compose <boost.beast.separate-compilation>on : <define>BOOST_BEAST_SEPARATE_COMPILATION ;
+
 variant beast_coverage
   : debug
   : <cxxflags>"-msse4.2 --coverage"
@@ -70,7 +76,6 @@ local defines =
     <define>BOOST_ASIO_DISABLE_BOOST_BIND=1
     <define>BOOST_ASIO_DISABLE_BOOST_DATE_TIME=1
     <define>BOOST_ASIO_DISABLE_BOOST_REGEX=1
-    <define>BOOST_BEAST_SEPARATE_COMPILATION
     <define>BOOST_COROUTINES_NO_DEPRECATION_WARNING=1
     <toolset>msvc:<cxxflags>"/bigobj"
     <toolset>msvc-14.1:<cxxflags>"/permissive-"
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 35780309..7c5f93d0 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -45,6 +45,14 @@ jobs:
           B2_FLAGS: <define>BOOST_BEAST_USE_STD_STRING_VIEW
           CXXSTD: 17
           B2_TARGETS: libs/beast/test//run-fat-tests libs/beast/example
+        GCC 8 C++11 HEADER_ONLY NO_DEPRECATED:
+          TOOLSET: gcc
+          CXX: g++-8
+          PACKAGES: g++-8
+          VARIANT: release
+          B2_FLAGS: <boost.beast.separate-compilation>off <boost.beast.allow-deprecated>off
+          CXXSTD: 11
+          B2_TARGETS: libs/beast/test//run-fat-tests
         GCC 8 C++11 UBASAN:
           TOOLSET: gcc
           CXX: g++-8
@@ -136,6 +144,15 @@ jobs:
           CXXSTD: 11
           CXX_FLAGS: <cxxflags>"-stdlib=libc++ -msse4.2 -funsigned-char -fno-omit-frame-pointer" <linkflags>-stdlib=libc++
           B2_TARGETS: libs/beast/test//run-fat-tests
+        Clang 8 libc++ C++11 Release HEADER_ONLY NO_DEPRECATED:
+          TOOLSET: clang
+          CXX: clang++-8
+          PACKAGES: clang-8 libc++-8-dev libc++abi-8-dev
+          VARIANT: release
+          B2_FLAGS: <boost.beast.separate-compilation>off <boost.beast.allow-deprecated>off
+          CXXSTD: 11
+          CXX_FLAGS: <cxxflags>"-stdlib=libc++ -msse4.2 -funsigned-char -fno-omit-frame-pointer" <linkflags>-stdlib=libc++
+          B2_TARGETS: libs/beast/test//run-fat-tests
     steps:
       - bash: |
             sudo apt update && sudo apt install -y $PACKAGES
diff --git a/example/Jamfile b/example/Jamfile
index 0a78a0b2..8b49d5fd 100644
--- a/example/Jamfile
+++ b/example/Jamfile
@@ -21,7 +21,7 @@ project /boost/beast/example
         cxx11_variadic_templates
     ]
     <library>/boost/beast//lib-asio/<link>static
-    <library>/boost/beast//lib-beast/<link>static
+    <boost.beast.separate-compilation>on:<library>/boost/beast//lib-beast/<link>static
     ;
 
 build-project advanced ;
diff --git a/test/Jamfile b/test/Jamfile
index 19d5b0e0..02c8a7d0 100644
--- a/test/Jamfile
+++ b/test/Jamfile
@@ -31,10 +31,9 @@ project /boost/beast/test
         cxx11_variadic_templates
     ]
     <include>./extern
-    <define>BOOST_BEAST_ALLOW_DEPRECATED
     <define>BOOST_BEAST_TESTS
     <library>/boost/beast//lib-asio/<link>static
-    <library>/boost/beast//lib-beast/<link>static
+    <boost.beast.separate-compilation>on:<library>/boost/beast//lib-beast/<link>static
     <library>/boost/filesystem//boost_filesystem
     <library>/boost/coroutine//boost_coroutine
     ;