use boost.rts

.github/workflows/ci.yml

@@ -828,6 +828,13 @@ jobs:
           repository: cppalliance/buffers
           ref: develop
 
+      - name: Clone Boost.RunTimeServices
+        uses: actions/checkout@v3
+        with:
+          path: rts-root
+          repository: cppalliance/rts
+          ref: develop
+
       - name: Setup C++
         uses: alandefreitas/cpp-actions/setup-cpp@v1.8.10
         id: setup-cpp
@@ -857,9 +864,11 @@ jobs:
           scan-modules-dir: |
             http-proto-root
             buffers-root
+            rts-root
           scan-modules-ignore: |
             http_proto
             buffers
+            rts
 
       - name: Install zlib (Windows)
         uses: alandefreitas/cpp-actions/package-install@v1.8.10
@@ -925,6 +934,7 @@ jobs:
           # Patch boost-root with workspace module
           cp -r "$workspace_root"/http-proto-root "libs/$module"
           cp -r "$workspace_root"/buffers-root libs/buffers
+          cp -r "$workspace_root"/rts-root libs/rts
 
       - name: Boost B2 Workflow
         uses: alandefreitas/cpp-actions/b2-workflow@v1.8.10
@@ -1147,6 +1157,13 @@ jobs:
           repository: cppalliance/buffers
           ref: develop
 
+      - name: Clone Boost.RunTimeServices
+        uses: actions/checkout@v3
+        with:
+          path: rts-root
+          repository: cppalliance/rts
+          ref: develop
+
       - name: Clone Boost
         uses: alandefreitas/cpp-actions/boost-clone@v1.8.10
         id: boost-clone
@@ -1158,9 +1175,11 @@ jobs:
           scan-modules-dir: |
             http-proto-root
             buffers-root
+            rts-root
           scan-modules-ignore: |
             http_proto
             buffers
+            rts
 
       - name: Patch Boost
         id: patch
@@ -1194,6 +1213,7 @@ jobs:
           # Patch boost-root with workspace module
           cp -r "$workspace_root"/http-proto-root "libs/$module"
           cp -r "$workspace_root"/buffers-root libs/buffers
+          cp -r "$workspace_root"/rts-root libs/rts
 
       - uses: actions/setup-node@v4
         with:

CMakeLists.txt

@@ -54,16 +54,18 @@ set(BOOST_SRC_DIR ${DEFAULT_BOOST_SRC_DIR} CACHE STRING "Boost source dir to use
 #-------------------------------------------------
 # The boost super-project requires one explicit dependency per-line.
 set(BOOST_HTTP_PROTO_DEPENDENCIES
-    Boost::align
     Boost::assert
     Boost::buffers
     Boost::config
-    Boost::container_hash
+    Boost::core
+    Boost::rts
+    Boost::static_assert
     Boost::system
     Boost::throw_exception
+    Boost::type_traits
     Boost::url
-    Boost::utility
-    Boost::winapi)
+    Boost::winapi
+    )
 
 foreach (BOOST_HTTP_PROTO_DEPENDENCY ${BOOST_HTTP_PROTO_DEPENDENCIES})
     if (BOOST_HTTP_PROTO_DEPENDENCY MATCHES "^[ ]*Boost::([A-Za-z0-9_]+)[ ]*$")
@@ -136,16 +138,10 @@ set_property(GLOBAL PROPERTY USE_FOLDERS ON)
 
 file(GLOB_RECURSE BOOST_HTTP_PROTO_HEADERS CONFIGURE_DEPENDS include/boost/*.hpp include/boost/*.natvis)
 file(GLOB_RECURSE BOOST_HTTP_PROTO_SOURCES CONFIGURE_DEPENDS src/*.cpp src/*.hpp)
-file(GLOB_RECURSE BOOST_HTTP_PROTO_ZLIB_SOURCES CONFIGURE_DEPENDS src_zlib/*.cpp src_zlib/*.hpp)
-set(BOOST_HTTP_PROTO_ZLIB_HEADERS
-    "include/boost/http_proto/service/zlib_service.hpp"
-    "include/boost/http_proto/service/deflate_service.hpp"
-    "include/boost/http_proto/service/inflate_service.hpp"
-)
+
 source_group("" FILES "include/boost/http_proto.hpp" "build/Jamfile")
 source_group(TREE ${CMAKE_CURRENT_SOURCE_DIR}/include/boost/http_proto PREFIX "include" FILES ${BOOST_HTTP_PROTO_HEADERS})
 source_group(TREE ${CMAKE_CURRENT_SOURCE_DIR}/src PREFIX "src" FILES ${BOOST_HTTP_PROTO_SOURCES})
-source_group(TREE ${CMAKE_CURRENT_SOURCE_DIR}/src_zlib PREFIX "src" FILES ${BOOST_HTTP_PROTO_ZLIB_SOURCES})
 
 add_library(boost_http_proto include/boost/http_proto.hpp build/Jamfile ${BOOST_HTTP_PROTO_HEADERS} ${BOOST_HTTP_PROTO_SOURCES})
 add_library(Boost::http_proto ALIAS boost_http_proto)
@@ -161,17 +157,6 @@ else ()
     target_compile_definitions(boost_http_proto PUBLIC BOOST_HTTP_PROTO_STATIC_LINK)
 endif ()
 
-find_package(ZLIB)
-if (ZLIB_FOUND)
-    add_library(boost_http_proto_zlib build/Jamfile ${BOOST_HTTP_PROTO_ZLIB_HEADERS} ${BOOST_HTTP_PROTO_ZLIB_SOURCES})
-    add_library(Boost::http_proto_zlib ALIAS boost_http_proto_zlib)
-    target_include_directories(boost_http_proto_zlib PRIVATE "${PROJECT_SOURCE_DIR}")
-    target_link_libraries(boost_http_proto_zlib PUBLIC boost_http_proto)
-    target_link_libraries(boost_http_proto_zlib PRIVATE ZLIB::ZLIB)
-    target_compile_definitions(boost_http_proto_zlib PUBLIC BOOST_HTTP_PROTO_HAS_ZLIB)
-    target_compile_definitions(boost_http_proto_zlib PRIVATE BOOST_HTTP_PROTO_ZLIB_SOURCE)
-endif ()
-
 #-------------------------------------------------
 #
 # Tests

build/Jamfile

@@ -7,11 +7,8 @@
 # Official repository: https://github.com/vinniefalco/http_proto
 #
 
-import ac ;
 import ../../config/checks/config : requires ;
 
-using zlib ;
-
 constant c11-requires :
     [ requires
     cxx11_constexpr
@@ -43,28 +40,14 @@ lib boost_http_proto
    : http_proto_sources
    : requirements
      <library>/boost//buffers
+     <library>/boost//rts
      <library>/boost//url
      <include>../
      <define>BOOST_HTTP_PROTO_SOURCE
    : usage-requirements
      <library>/boost//buffers
+     <library>/boost//rts
      <library>/boost//url
    ;
 
-alias http_proto_zlib_sources : [ glob-tree-ex ./src_zlib : *.cpp ] ;
-
-explicit http_proto_zlib_sources ;
-
-lib boost_http_proto_zlib
-   : http_proto_zlib_sources
-   : requirements
-     <library>/boost/http_proto//boost_http_proto
-     [ ac.check-library /zlib//zlib : <library>/zlib//zlib : <build>no ]
-     <include>../
-     <define>BOOST_HTTP_PROTO_ZLIB_SOURCE
-   : usage-requirements
-     <library>/zlib//zlib
-     <define>BOOST_HTTP_PROTO_HAS_ZLIB
-   ;
-
-boost-install boost_http_proto boost_http_proto_zlib ;
+boost-install boost_http_proto ;

include/boost/http_proto.hpp

@@ -10,7 +10,6 @@
 #ifndef BOOST_HTTP_PROTO_HPP
 #define BOOST_HTTP_PROTO_HPP
 
-#include <boost/http_proto/context.hpp>
 #include <boost/http_proto/deflate.hpp>
 #include <boost/http_proto/error.hpp>
 #include <boost/http_proto/field.hpp>
@@ -53,8 +52,4 @@
 #include <boost/http_proto/rfc/token_rule.hpp>
 #include <boost/http_proto/rfc/upgrade_rule.hpp>
 
-#include <boost/http_proto/service/service.hpp>
-#include <boost/http_proto/service/deflate_service.hpp>
-#include <boost/http_proto/service/inflate_service.hpp>
-
 #endif