Skip to content

Commit 11a6bad

Browse files
committed
chore: rename to http
1 parent 47a6d98 commit 11a6bad

175 files changed

Lines changed: 1615 additions & 1616 deletions

File tree

Some content is hidden

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

.github/workflows/ci.yml

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
# Distributed under the Boost Software License, Version 1.0. (See accompanying
99
# file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
1010
#
11-
# Official repository: https://github.com/CPPAlliance/http_proto/
11+
# Official repository: https://github.com/CPPAlliance/http/
1212
#
1313

1414
name: CI
@@ -858,10 +858,10 @@ jobs:
858858
tar -xf node-v20.9.0-linux-x64-glibc-217.tar.xz --strip-components 1 -C /node20217
859859
ldd /__e/node20/bin/node
860860
861-
- name: Clone Boost.HTTP.Proto
861+
- name: Clone Boost.HTTP
862862
uses: actions/checkout@v3
863863
with:
864-
path: http-proto-root
864+
path: http-root
865865

866866
- name: Clone Boost.Buffers
867867
uses: actions/checkout@v3
@@ -904,11 +904,11 @@ jobs:
904904
boost-dir: boost-source
905905
modules-exclude-paths: ''
906906
scan-modules-dir: |
907-
http-proto-root
907+
http-root
908908
buffers-root
909909
capy-root
910910
scan-modules-ignore: |
911-
http_proto
911+
http
912912
buffers
913913
capy
914914
@@ -978,7 +978,7 @@ jobs:
978978
echo -E "boost_root=$boost_root" >> $GITHUB_OUTPUT
979979
980980
# Patch boost-root with workspace module
981-
cp -r "$workspace_root"/http-proto-root "libs/$module"
981+
cp -r "$workspace_root"/http-root "libs/$module"
982982
cp -r "$workspace_root"/buffers-root libs/buffers
983983
cp -r "$workspace_root"/capy-root libs/capy
984984
@@ -989,7 +989,7 @@ jobs:
989989
ASAN_OPTIONS: ${{ ((matrix.compiler == 'apple-clang' || matrix.compiler == 'clang') && 'detect_invalid_pointer_pairs=0:strict_string_checks=1:detect_stack_use_after_return=1:check_initialization_order=1:strict_init_order=1') || 'detect_invalid_pointer_pairs=2:strict_string_checks=1:detect_stack_use_after_return=1:check_initialization_order=1:strict_init_order=1' }}
990990
with:
991991
source-dir: boost-root
992-
modules: http_proto
992+
modules: http
993993
toolset: ${{ matrix.b2-toolset }}
994994
build-variant: ${{ matrix.build-type }}
995995
cxx: ${{ steps.setup-cpp.outputs.cxx || matrix.cxx || '' }}
@@ -1029,7 +1029,7 @@ jobs:
10291029
export-compile-commands: ${{ matrix.time-trace }}
10301030
package: false
10311031
package-artifact: false
1032-
ref-source-dir: boost-root/libs/http_proto
1032+
ref-source-dir: boost-root/libs/http
10331033
toolchain: ${{ (startsWith(matrix.runs-on, 'windows') && steps.patch-user-config.outputs.toolchain) || '' }}
10341034

10351035
- name: Set Path
@@ -1061,7 +1061,7 @@ jobs:
10611061
# extra-args: |
10621062
# -D BOOST_CI_INSTALL_TEST=ON
10631063
# -D CMAKE_PREFIX_PATH=${{ steps.patch.outputs.workspace_root }}/.local
1064-
# ref-source-dir: boost-root/libs/http_proto
1064+
# ref-source-dir: boost-root/libs/http
10651065
# trace-commands: true
10661066
# toolchain: ${{ (startsWith(matrix.runs-on, 'windows') && steps.patch-user-config.outputs.toolchain) || '' }}
10671067

@@ -1083,7 +1083,7 @@ jobs:
10831083
# install: false
10841084
# cmake-version: '>=3.20'
10851085
# extra-args: -D BOOST_CI_INSTALL_TEST=OFF
1086-
# ref-source-dir: boost-root/libs/http_proto/test/cmake_test
1086+
# ref-source-dir: boost-root/libs/http/test/cmake_test
10871087
# toolchain: ${{ (startsWith(matrix.runs-on, 'windows') && steps.patch-user-config.outputs.toolchain) || '' }}
10881088

10891089
- name: Root Project CMake Workflow
@@ -1114,7 +1114,7 @@ jobs:
11141114
uses: alandefreitas/cpp-actions/flamegraph@v1.9.0
11151115
if: matrix.time-trace
11161116
with:
1117-
source-dir: boost-root/libs/http_proto
1117+
source-dir: boost-root/libs/http
11181118
build-dir: boost-root/__build_cmake_test__
11191119
github_token: ${{ secrets.GITHUB_TOKEN }}
11201120

@@ -1157,7 +1157,7 @@ jobs:
11571157
timeout-minutes: 120
11581158

11591159
steps:
1160-
- name: Clone Boost.HTTProto
1160+
- name: Clone Boost.HTTP
11611161
uses: actions/checkout@v3
11621162
with:
11631163
# Avoid the common API rate limit exceeded error in boostorg by including 100 latest commits in any case
@@ -1191,10 +1191,10 @@ jobs:
11911191
with:
11921192
apt-get: git cmake
11931193

1194-
- name: Clone Boost.Http.Proto
1194+
- name: Clone Boost.HTTP
11951195
uses: actions/checkout@v3
11961196
with:
1197-
path: http-proto-root
1197+
path: http-root
11981198

11991199
- name: Clone Boost.Buffers
12001200
uses: actions/checkout@v3
@@ -1218,11 +1218,11 @@ jobs:
12181218
boost-dir: boost-source
12191219
modules-exclude-paths: ''
12201220
scan-modules-dir: |
1221-
http-proto-root
1221+
http-root
12221222
buffers-root
12231223
capy-root
12241224
scan-modules-ignore: |
1225-
http_proto
1225+
http
12261226
buffers
12271227
capy
12281228
@@ -1256,7 +1256,7 @@ jobs:
12561256
echo -E "boost_root=$boost_root" >> $GITHUB_OUTPUT
12571257
12581258
# Patch boost-root with workspace module
1259-
cp -r "$workspace_root"/http-proto-root "libs/$module"
1259+
cp -r "$workspace_root"/http-root "libs/$module"
12601260
cp -r "$workspace_root"/buffers-root libs/buffers
12611261
cp -r "$workspace_root"/capy-root libs/capy
12621262
@@ -1276,7 +1276,7 @@ jobs:
12761276
12771277
BOOST_SRC_DIR="$(pwd)/boost-root"
12781278
export BOOST_SRC_DIR
1279-
cd boost-root/libs/http_proto
1279+
cd boost-root/libs/http
12801280
12811281
cd doc
12821282
bash ./build_antora.sh
@@ -1291,4 +1291,4 @@ jobs:
12911291
uses: actions/upload-artifact@v4
12921292
with:
12931293
name: antora-docs-${{ matrix.name }}
1294-
path: boost-root/libs/http_proto/doc/build/site
1294+
path: boost-root/libs/http/doc/build/site

CLAUDE.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ T default_value();
6767
## Structure
6868

6969
* Boost.Beast2 refers to both the library which uses Boost.Asio and the collection of
70-
libraries which includes Boost.Capy, Boost.Buffers, Boost.Http (http-proto), and Boost.Beast2
70+
libraries which includes Boost.Capy, Boost.Buffers, Boost.Http (http), and Boost.Beast2
7171

7272
* Boost.Capy contains general purpose data structures and algorithms
7373

CMakeLists.txt

Lines changed: 44 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
# Distributed under the Boost Software License, Version 1.0. (See accompanying
88
# file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
99
#
10-
# Official repository: https://github.com/cppalliance/http_proto
10+
# Official repository: https://github.com/cppalliance/http
1111
#
1212

1313
#-------------------------------------------------
@@ -16,14 +16,14 @@
1616
#
1717
#-------------------------------------------------
1818
cmake_minimum_required(VERSION 3.8...3.20)
19-
set(BOOST_HTTP_PROTO_VERSION 1)
19+
set(BOOST_HTTP_VERSION 1)
2020
if (BOOST_SUPERPROJECT_VERSION)
21-
set(BOOST_HTTP_PROTO_VERSION ${BOOST_SUPERPROJECT_VERSION})
21+
set(BOOST_HTTP_VERSION ${BOOST_SUPERPROJECT_VERSION})
2222
endif ()
23-
project(boost_http_proto VERSION "${BOOST_HTTP_PROTO_VERSION}" LANGUAGES CXX)
24-
set(BOOST_HTTP_PROTO_IS_ROOT OFF)
23+
project(boost_http VERSION "${BOOST_HTTP_VERSION}" LANGUAGES CXX)
24+
set(BOOST_HTTP_IS_ROOT OFF)
2525
if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR)
26-
set(BOOST_HTTP_PROTO_IS_ROOT ON)
26+
set(BOOST_HTTP_IS_ROOT ON)
2727
endif ()
2828
set(__ignore__ ${CMAKE_C_COMPILER})
2929

@@ -32,12 +32,12 @@ set(__ignore__ ${CMAKE_C_COMPILER})
3232
# Options
3333
#
3434
#-------------------------------------------------
35-
if (BOOST_HTTP_PROTO_IS_ROOT)
35+
if (BOOST_HTTP_IS_ROOT)
3636
include(CTest)
3737
endif ()
38-
option(BOOST_HTTP_PROTO_BUILD_TESTS "Build boost::http_proto tests" ${BUILD_TESTING})
39-
option(BOOST_HTTP_PROTO_BUILD_EXAMPLES "Build boost::http_proto examples" ${BOOST_HTTP_PROTO_IS_ROOT})
40-
option(BOOST_HTTP_PROTO_MRDOCS_BUILD "Build the target for MrDocs: see mrdocs.yml" OFF)
38+
option(BOOST_HTTP_BUILD_TESTS "Build boost::http tests" ${BUILD_TESTING})
39+
option(BOOST_HTTP_BUILD_EXAMPLES "Build boost::http examples" ${BOOST_HTTP_IS_ROOT})
40+
option(BOOST_HTTP_MRDOCS_BUILD "Build the target for MrDocs: see mrdocs.yml" OFF)
4141

4242
# Check if environment variable BOOST_SRC_DIR is set
4343
if (NOT DEFINED BOOST_SRC_DIR AND DEFINED ENV{BOOST_SRC_DIR})
@@ -53,7 +53,7 @@ set(BOOST_SRC_DIR ${DEFAULT_BOOST_SRC_DIR} CACHE STRING "Boost source dir to use
5353
#
5454
#-------------------------------------------------
5555
# The boost super-project requires one explicit dependency per-line.
56-
set(BOOST_HTTP_PROTO_DEPENDENCIES
56+
set(BOOST_HTTP_DEPENDENCIES
5757
Boost::assert
5858
Boost::buffers
5959
Boost::capy
@@ -66,33 +66,32 @@ set(BOOST_HTTP_PROTO_DEPENDENCIES
6666
Boost::throw_exception
6767
Boost::type_traits
6868
Boost::url
69-
Boost::winapi
70-
)
69+
Boost::winapi)
7170

72-
foreach (BOOST_HTTP_PROTO_DEPENDENCY ${BOOST_HTTP_PROTO_DEPENDENCIES})
73-
if (BOOST_HTTP_PROTO_DEPENDENCY MATCHES "^[ ]*Boost::([A-Za-z0-9_]+)[ ]*$")
74-
list(APPEND BOOST_HTTP_PROTO_INCLUDE_LIBRARIES ${CMAKE_MATCH_1})
71+
foreach (BOOST_HTTP_DEPENDENCY ${BOOST_HTTP_DEPENDENCIES})
72+
if (BOOST_HTTP_DEPENDENCY MATCHES "^[ ]*Boost::([A-Za-z0-9_]+)[ ]*$")
73+
list(APPEND BOOST_HTTP_INCLUDE_LIBRARIES ${CMAKE_MATCH_1})
7574
endif ()
7675
endforeach ()
7776
# Conditional dependencies
7877
if (NOT BOOST_URL_MRDOCS_BUILD)
79-
if (BOOST_HTTP_PROTO_BUILD_TESTS)
80-
set(BOOST_HTTP_PROTO_UNIT_TEST_LIBRARIES filesystem)
78+
if (BOOST_HTTP_BUILD_TESTS)
79+
set(BOOST_HTTP_UNIT_TEST_LIBRARIES filesystem)
8180
endif ()
82-
if (BOOST_HTTP_PROTO_BUILD_EXAMPLES)
83-
# set(BOOST_HTTP_PROTO_EXAMPLE_LIBRARIES json)
81+
if (BOOST_HTTP_BUILD_EXAMPLES)
82+
# set(BOOST_HTTP_EXAMPLE_LIBRARIES json)
8483
endif ()
8584
endif ()
8685
# Complete dependency list
87-
set(BOOST_INCLUDE_LIBRARIES ${BOOST_HTTP_PROTO_INCLUDE_LIBRARIES} ${BOOST_HTTP_PROTO_UNIT_TEST_LIBRARIES} ${BOOST_HTTP_PROTO_EXAMPLE_LIBRARIES})
88-
set(BOOST_EXCLUDE_LIBRARIES http_proto)
86+
set(BOOST_INCLUDE_LIBRARIES ${BOOST_HTTP_INCLUDE_LIBRARIES} ${BOOST_HTTP_UNIT_TEST_LIBRARIES} ${BOOST_HTTP_EXAMPLE_LIBRARIES})
87+
set(BOOST_EXCLUDE_LIBRARIES http)
8988

9089
#-------------------------------------------------
9190
#
9291
# Add Boost Subdirectory
9392
#
9493
#-------------------------------------------------
95-
if (BOOST_HTTP_PROTO_IS_ROOT)
94+
if (BOOST_HTTP_IS_ROOT)
9695
set(CMAKE_FOLDER Dependencies)
9796
# Find absolute BOOST_SRC_DIR
9897
if (NOT IS_ABSOLUTE ${BOOST_SRC_DIR})
@@ -140,46 +139,46 @@ endif ()
140139
#-------------------------------------------------
141140
set_property(GLOBAL PROPERTY USE_FOLDERS ON)
142141

143-
file(GLOB_RECURSE BOOST_HTTP_PROTO_HEADERS CONFIGURE_DEPENDS include/boost/*.hpp include/boost/*.natvis)
144-
file(GLOB_RECURSE BOOST_HTTP_PROTO_SOURCES CONFIGURE_DEPENDS src/*.cpp src/*.hpp)
142+
file(GLOB_RECURSE BOOST_HTTP_HEADERS CONFIGURE_DEPENDS include/boost/*.hpp include/boost/*.natvis)
143+
file(GLOB_RECURSE BOOST_HTTP_SOURCES CONFIGURE_DEPENDS src/*.cpp src/*.hpp)
145144

146-
source_group("" FILES "include/boost/http_proto.hpp" "build/Jamfile")
147-
source_group(TREE ${CMAKE_CURRENT_SOURCE_DIR}/include/boost/http_proto PREFIX "include" FILES ${BOOST_HTTP_PROTO_HEADERS})
148-
source_group(TREE ${CMAKE_CURRENT_SOURCE_DIR}/src PREFIX "src" FILES ${BOOST_HTTP_PROTO_SOURCES})
145+
source_group("" FILES "include/boost/http.hpp" "build/Jamfile")
146+
source_group(TREE ${CMAKE_CURRENT_SOURCE_DIR}/include/boost/http PREFIX "include" FILES ${BOOST_HTTP_HEADERS})
147+
source_group(TREE ${CMAKE_CURRENT_SOURCE_DIR}/src PREFIX "src" FILES ${BOOST_HTTP_SOURCES})
149148

150-
function(boost_http_proto_setup_properties target)
149+
function(boost_http_setup_properties target)
151150
target_compile_features(${target} PUBLIC cxx_constexpr)
152151
target_include_directories(${target} PUBLIC "${PROJECT_SOURCE_DIR}/include")
153152
target_include_directories(${target} PRIVATE "${PROJECT_SOURCE_DIR}")
154-
target_link_libraries(${target} PUBLIC ${BOOST_HTTP_PROTO_DEPENDENCIES})
155-
target_compile_definitions(${target} PUBLIC BOOST_HTTP_PROTO_NO_LIB)
156-
target_compile_definitions(${target} PRIVATE BOOST_HTTP_PROTO_SOURCE)
153+
target_link_libraries(${target} PUBLIC ${BOOST_HTTP_DEPENDENCIES})
154+
target_compile_definitions(${target} PUBLIC BOOST_HTTP_NO_LIB)
155+
target_compile_definitions(${target} PRIVATE BOOST_HTTP_SOURCE)
157156
if (BUILD_SHARED_LIBS)
158-
target_compile_definitions(${target} PUBLIC BOOST_HTTP_PROTO_DYN_LINK)
157+
target_compile_definitions(${target} PUBLIC BOOST_HTTP_DYN_LINK)
159158
else ()
160-
target_compile_definitions(${target} PUBLIC BOOST_HTTP_PROTO_STATIC_LINK)
159+
target_compile_definitions(${target} PUBLIC BOOST_HTTP_STATIC_LINK)
161160
endif ()
162161
endfunction()
163162

164-
if (BOOST_HTTP_PROTO_MRDOCS_BUILD)
165-
file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/mrdocs.cpp" "#include <boost/http_proto.hpp>\n")
166-
add_library(boost_http_proto_mrdocs "${CMAKE_CURRENT_BINARY_DIR}/mrdocs.cpp")
167-
boost_http_proto_setup_properties(boost_http_proto_mrdocs)
168-
target_compile_definitions(boost_http_proto_mrdocs PUBLIC BOOST_HTTP_PROTO_MRDOCS)
169-
set_target_properties(boost_http_proto_mrdocs PROPERTIES EXPORT_COMPILE_COMMANDS ON)
163+
if (BOOST_HTTP_MRDOCS_BUILD)
164+
file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/mrdocs.cpp" "#include <boost/http.hpp>\n")
165+
add_library(boost_http_mrdocs "${CMAKE_CURRENT_BINARY_DIR}/mrdocs.cpp")
166+
boost_http_setup_properties(boost_http_mrdocs)
167+
target_compile_definitions(boost_http_mrdocs PUBLIC BOOST_HTTP_MRDOCS)
168+
set_target_properties(boost_http_mrdocs PROPERTIES EXPORT_COMPILE_COMMANDS ON)
170169
return()
171170
endif ()
172171

173-
add_library(boost_http_proto include/boost/http_proto.hpp build/Jamfile ${BOOST_HTTP_PROTO_HEADERS} ${BOOST_HTTP_PROTO_SOURCES})
174-
add_library(Boost::http_proto ALIAS boost_http_proto)
175-
boost_http_proto_setup_properties(boost_http_proto)
172+
add_library(boost_http include/boost/http.hpp build/Jamfile ${BOOST_HTTP_HEADERS} ${BOOST_HTTP_SOURCES})
173+
add_library(Boost::http ALIAS boost_http)
174+
boost_http_setup_properties(boost_http)
176175

177176
#-------------------------------------------------
178177
#
179178
# Tests
180179
#
181180
#-------------------------------------------------
182-
if (BOOST_HTTP_PROTO_BUILD_TESTS)
181+
if (BOOST_HTTP_BUILD_TESTS)
183182
add_subdirectory(test)
184183
endif ()
185184

@@ -188,6 +187,6 @@ endif ()
188187
# Examples
189188
#
190189
#-------------------------------------------------
191-
if (BOOST_HTTP_PROTO_BUILD_EXAMPLES)
190+
if (BOOST_HTTP_BUILD_EXAMPLES)
192191
# add_subdirectory(example)
193192
endif ()

0 commit comments

Comments
 (0)