Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .drone/drone.bat
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ pushd !BOOST_ROOT!\libs
git clone https://github.com/cppalliance/capy -b !BOOST_BRANCH! --depth 1
popd
pushd !BOOST_ROOT!\libs
git clone https://github.com/cppalliance/http_proto -b !BOOST_BRANCH! --depth 1
git clone https://github.com/cppalliance/http -b !BOOST_BRANCH! --depth 1
popd

echo '==================================> COMPILE'
Expand Down
8 changes: 4 additions & 4 deletions .drone/drone.sh
Original file line number Diff line number Diff line change
Expand Up @@ -47,9 +47,9 @@ common_install () {
popd
fi

if [ ! -d "$BOOST_ROOT/libs/http_proto" ]; then
if [ ! -d "$BOOST_ROOT/libs/http" ]; then
pushd $BOOST_ROOT/libs
git clone https://github.com/cppalliance/http_proto -b $BOOST_BRANCH --depth 1
git clone https://github.com/cppalliance/http -b $BOOST_BRANCH --depth 1
popd
fi
}
Expand Down Expand Up @@ -139,9 +139,9 @@ if [ ! -d "$BOOST_ROOT/libs/capy" ]; then
popd
fi

if [ ! -d "$BOOST_ROOT/libs/http_proto" ]; then
if [ ! -d "$BOOST_ROOT/libs/http" ]; then
pushd $BOOST_ROOT/libs
git clone https://github.com/cppalliance/http_proto -b $BOOST_BRANCH --depth 1
git clone https://github.com/cppalliance/http -b $BOOST_BRANCH --depth 1
popd
fi

Expand Down
14 changes: 7 additions & 7 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -694,7 +694,7 @@ jobs:
- name: Clone Boost.Http.Proto
uses: actions/checkout@v3
with:
repository: cppalliance/http_proto
repository: cppalliance/http
path: http-proto-root
ref: develop

Expand Down Expand Up @@ -745,7 +745,7 @@ jobs:
capy-root
scan-modules-ignore: |
beast2
http_proto
http
buffers
capy

Expand Down Expand Up @@ -822,7 +822,7 @@ jobs:

# Patch boost-root with workspace module
cp -r "$workspace_root"/http-io-root "libs/$module"
cp -r "$workspace_root"/http-proto-root libs/http_proto
cp -r "$workspace_root"/http-proto-root libs/http
cp -r "$workspace_root"/buffers-root libs/buffers
cp -r "$workspace_root"/capy-root libs/capy

Expand All @@ -846,7 +846,7 @@ jobs:
cxxflags: ${{ (matrix.asan && '-fsanitize=pointer-subtract') || '' }}
user-config: ${{ ((startsWith(matrix.runs-on, 'windows') || startsWith(matrix.runs-on, 'macOS')) && format('{0}/user-config.jam', steps.patch.outputs.workspace_root)) || '' }}
stop-on-error: true
extra-args: "libs/beast2/example" # https://github.com/ashtum/cpp-actions/issues/23
extra-args: "libs/beast2/example"

- name: Boost CMake Workflow
uses: alandefreitas/cpp-actions/cmake-workflow@v1.9.0
Expand Down Expand Up @@ -1041,7 +1041,7 @@ jobs:
- name: Clone Boost.Http.Proto
uses: actions/checkout@v3
with:
repository: cppalliance/http_proto
repository: cppalliance/http
path: http-proto-root
ref: develop

Expand Down Expand Up @@ -1073,7 +1073,7 @@ jobs:
capy-root
scan-modules-ignore: |
beast2
http_proto
http
buffers
capy

Expand Down Expand Up @@ -1108,7 +1108,7 @@ jobs:

# Patch boost-root with workspace module
cp -r "$workspace_root"/http-io-root "libs/$module"
cp -r "$workspace_root"/http-proto-root libs/http_proto
cp -r "$workspace_root"/http-proto-root libs/http
cp -r "$workspace_root"/buffers-root libs/buffers
cp -r "$workspace_root"/capy-root libs/capy

Expand Down
7 changes: 3 additions & 4 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -63,15 +63,14 @@ set(BOOST_BEAST2_DEPENDENCIES
Boost::core
Boost::describe
Boost::endian
Boost::http_proto
Boost::http
Boost::json
Boost::mp11
Boost::static_assert
Boost::system
Boost::throw_exception
Boost::url
Boost::variant2
)
Boost::variant2)

foreach (BOOST_BEAST2_DEPENDENCY ${BOOST_BEAST2_DEPENDENCIES})
if (BOOST_BEAST2_DEPENDENCY MATCHES "^[ ]*Boost::([A-Za-z0-9_]+)[ ]*$")
Expand Down Expand Up @@ -125,7 +124,7 @@ if (BOOST_BEAST2_IS_ROOT)
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${BOOST_SRC_DIR}/tools/cmake/include")
else ()
# From Boost Package
find_package(Boost REQUIRED COMPONENTS buffers capy http_proto json program_options scope system url)
find_package(Boost REQUIRED COMPONENTS buffers capy http json program_options scope system url)
foreach (BOOST_INCLUDE_LIBRARY ${BOOST_INCLUDE_LIBRARIES})
if (NOT TARGET Boost::${BOOST_INCLUDE_LIBRARY})
add_library(Boost::${BOOST_INCLUDE_LIBRARY} ALIAS Boost::headers)
Expand Down
4 changes: 2 additions & 2 deletions build/Jamfile
Original file line number Diff line number Diff line change
Expand Up @@ -47,11 +47,11 @@ explicit beast2_sources ;
lib boost_beast2
: beast2_sources
: requirements
<library>/boost//http_proto
<library>/boost//http
<include>../
<define>BOOST_BEAST2_SOURCE
: usage-requirements
<library>/boost//http_proto
<library>/boost//http
;

boost-install boost_beast2 ;
4 changes: 2 additions & 2 deletions doc/antora.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ ext:
config: doc/mrdocs.yml
cpp-tagfiles:
files:
- file: ./doc/tagfiles/boost-http_proto-doxygen.tag.xml
- file: ./doc/tagfiles/boost-http-doxygen.tag.xml
base_url: 'xref:reference:'
using-namespaces:
- boost::beast2
- boost::http_proto
- boost::http
Loading
Loading