Skip to content

Commit fedf444

Browse files
ashtumashtum
committed
Use boost.rts
1 parent abc12a2 commit fedf444

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+193
-1809
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -828,6 +828,13 @@ jobs:
828828
repository: cppalliance/buffers
829829
ref: develop
830830

831+
- name: Clone Boost.RunTimeServices
832+
uses: actions/checkout@v3
833+
with:
834+
path: rts-root
835+
repository: cppalliance/rts
836+
ref: develop
837+
831838
- name: Setup C++
832839
uses: alandefreitas/cpp-actions/setup-cpp@v1.8.10
833840
id: setup-cpp
@@ -857,9 +864,11 @@ jobs:
857864
scan-modules-dir: |
858865
http-proto-root
859866
buffers-root
867+
rts-root
860868
scan-modules-ignore: |
861869
http_proto
862870
buffers
871+
rts
863872
864873
- name: Install zlib (Windows)
865874
uses: alandefreitas/cpp-actions/package-install@v1.8.10
@@ -925,6 +934,7 @@ jobs:
925934
# Patch boost-root with workspace module
926935
cp -r "$workspace_root"/http-proto-root "libs/$module"
927936
cp -r "$workspace_root"/buffers-root libs/buffers
937+
cp -r "$workspace_root"/rts-root libs/rts
928938
929939
- name: Boost B2 Workflow
930940
uses: alandefreitas/cpp-actions/b2-workflow@v1.8.10
@@ -1147,6 +1157,13 @@ jobs:
11471157
repository: cppalliance/buffers
11481158
ref: develop
11491159

1160+
- name: Clone Boost.RunTimeServices
1161+
uses: actions/checkout@v3
1162+
with:
1163+
path: rts-root
1164+
repository: cppalliance/rts
1165+
ref: develop
1166+
11501167
- name: Clone Boost
11511168
uses: alandefreitas/cpp-actions/boost-clone@v1.8.10
11521169
id: boost-clone
@@ -1158,9 +1175,11 @@ jobs:
11581175
scan-modules-dir: |
11591176
http-proto-root
11601177
buffers-root
1178+
rts-root
11611179
scan-modules-ignore: |
11621180
http_proto
11631181
buffers
1182+
rts
11641183
11651184
- name: Patch Boost
11661185
id: patch
@@ -1194,6 +1213,7 @@ jobs:
11941213
# Patch boost-root with workspace module
11951214
cp -r "$workspace_root"/http-proto-root "libs/$module"
11961215
cp -r "$workspace_root"/buffers-root libs/buffers
1216+
cp -r "$workspace_root"/rts-root libs/rts
11971217
11981218
- uses: actions/setup-node@v4
11991219
with:

‎CMakeLists.txt‎

Lines changed: 7 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -54,16 +54,18 @@ set(BOOST_SRC_DIR ${DEFAULT_BOOST_SRC_DIR} CACHE STRING "Boost source dir to use
5454
#-------------------------------------------------
5555
# The boost super-project requires one explicit dependency per-line.
5656
set(BOOST_HTTP_PROTO_DEPENDENCIES
57-
Boost::align
5857
Boost::assert
5958
Boost::buffers
6059
Boost::config
61-
Boost::container_hash
60+
Boost::core
61+
Boost::rts
62+
Boost::static_assert
6263
Boost::system
6364
Boost::throw_exception
65+
Boost::type_traits
6466
Boost::url
65-
Boost::utility
66-
Boost::winapi)
67+
Boost::winapi
68+
)
6769

6870
foreach (BOOST_HTTP_PROTO_DEPENDENCY ${BOOST_HTTP_PROTO_DEPENDENCIES})
6971
if (BOOST_HTTP_PROTO_DEPENDENCY MATCHES "^[ ]*Boost::([A-Za-z0-9_]+)[ ]*$")
@@ -136,16 +138,10 @@ set_property(GLOBAL PROPERTY USE_FOLDERS ON)
136138

137139
file(GLOB_RECURSE BOOST_HTTP_PROTO_HEADERS CONFIGURE_DEPENDS include/boost/*.hpp include/boost/*.natvis)
138140
file(GLOB_RECURSE BOOST_HTTP_PROTO_SOURCES CONFIGURE_DEPENDS src/*.cpp src/*.hpp)
139-
file(GLOB_RECURSE BOOST_HTTP_PROTO_ZLIB_SOURCES CONFIGURE_DEPENDS src_zlib/*.cpp src_zlib/*.hpp)
140-
set(BOOST_HTTP_PROTO_ZLIB_HEADERS
141-
"include/boost/http_proto/service/zlib_service.hpp"
142-
"include/boost/http_proto/service/deflate_service.hpp"
143-
"include/boost/http_proto/service/inflate_service.hpp"
144-
)
141+
145142
source_group("" FILES "include/boost/http_proto.hpp" "build/Jamfile")
146143
source_group(TREE ${CMAKE_CURRENT_SOURCE_DIR}/include/boost/http_proto PREFIX "include" FILES ${BOOST_HTTP_PROTO_HEADERS})
147144
source_group(TREE ${CMAKE_CURRENT_SOURCE_DIR}/src PREFIX "src" FILES ${BOOST_HTTP_PROTO_SOURCES})
148-
source_group(TREE ${CMAKE_CURRENT_SOURCE_DIR}/src_zlib PREFIX "src" FILES ${BOOST_HTTP_PROTO_ZLIB_SOURCES})
149145

150146
add_library(boost_http_proto include/boost/http_proto.hpp build/Jamfile ${BOOST_HTTP_PROTO_HEADERS} ${BOOST_HTTP_PROTO_SOURCES})
151147
add_library(Boost::http_proto ALIAS boost_http_proto)
@@ -161,17 +157,6 @@ else ()
161157
target_compile_definitions(boost_http_proto PUBLIC BOOST_HTTP_PROTO_STATIC_LINK)
162158
endif ()
163159

164-
find_package(ZLIB)
165-
if (ZLIB_FOUND)
166-
add_library(boost_http_proto_zlib build/Jamfile ${BOOST_HTTP_PROTO_ZLIB_HEADERS} ${BOOST_HTTP_PROTO_ZLIB_SOURCES})
167-
add_library(Boost::http_proto_zlib ALIAS boost_http_proto_zlib)
168-
target_include_directories(boost_http_proto_zlib PRIVATE "${PROJECT_SOURCE_DIR}")
169-
target_link_libraries(boost_http_proto_zlib PUBLIC boost_http_proto)
170-
target_link_libraries(boost_http_proto_zlib PRIVATE ZLIB::ZLIB)
171-
target_compile_definitions(boost_http_proto_zlib PUBLIC BOOST_HTTP_PROTO_HAS_ZLIB)
172-
target_compile_definitions(boost_http_proto_zlib PRIVATE BOOST_HTTP_PROTO_ZLIB_SOURCE)
173-
endif ()
174-
175160
#-------------------------------------------------
176161
#
177162
# Tests

‎build/Jamfile‎

Lines changed: 3 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,8 @@
77
# Official repository: https://github.com/vinniefalco/http_proto
88
#
99

10-
import ac ;
1110
import ../../config/checks/config : requires ;
1211

13-
using zlib ;
14-
1512
constant c11-requires :
1613
[ requires
1714
cxx11_constexpr
@@ -43,28 +40,14 @@ lib boost_http_proto
4340
: http_proto_sources
4441
: requirements
4542
<library>/boost//buffers
43+
<library>/boost//rts
4644
<library>/boost//url
4745
<include>../
4846
<define>BOOST_HTTP_PROTO_SOURCE
4947
: usage-requirements
5048
<library>/boost//buffers
49+
<library>/boost//rts
5150
<library>/boost//url
5251
;
5352

54-
alias http_proto_zlib_sources : [ glob-tree-ex ./src_zlib : *.cpp ] ;
55-
56-
explicit http_proto_zlib_sources ;
57-
58-
lib boost_http_proto_zlib
59-
: http_proto_zlib_sources
60-
: requirements
61-
<library>/boost/http_proto//boost_http_proto
62-
[ ac.check-library /zlib//zlib : <library>/zlib//zlib : <build>no ]
63-
<include>../
64-
<define>BOOST_HTTP_PROTO_ZLIB_SOURCE
65-
: usage-requirements
66-
<library>/zlib//zlib
67-
<define>BOOST_HTTP_PROTO_HAS_ZLIB
68-
;
69-
70-
boost-install boost_http_proto boost_http_proto_zlib ;
53+
boost-install boost_http_proto ;

‎include/boost/http_proto.hpp‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
#ifndef BOOST_HTTP_PROTO_HPP
1111
#define BOOST_HTTP_PROTO_HPP
1212

13-
#include <boost/http_proto/context.hpp>
1413
#include <boost/http_proto/deflate.hpp>
1514
#include <boost/http_proto/error.hpp>
1615
#include <boost/http_proto/field.hpp>
@@ -53,8 +52,4 @@
5352
#include <boost/http_proto/rfc/token_rule.hpp>
5453
#include <boost/http_proto/rfc/upgrade_rule.hpp>
5554

56-
#include <boost/http_proto/service/service.hpp>
57-
#include <boost/http_proto/service/deflate_service.hpp>
58-
#include <boost/http_proto/service/inflate_service.hpp>
59-
6055
#endif

‎include/boost/http_proto/context.hpp‎

Lines changed: 0 additions & 148 deletions
This file was deleted.

0 commit comments

Comments
 (0)