Skip to content

Commit 7748d6b

Browse files
committed
chore: rename http_proto to http
1 parent eebe8ca commit 7748d6b

Some content is hidden

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

46 files changed

+1007
-848
lines changed

.drone/drone.bat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ pushd !BOOST_ROOT!\libs
4747
git clone https://github.com/cppalliance/capy -b !BOOST_BRANCH! --depth 1
4848
popd
4949
pushd !BOOST_ROOT!\libs
50-
git clone https://github.com/cppalliance/http_proto -b !BOOST_BRANCH! --depth 1
50+
git clone https://github.com/cppalliance/http -b !BOOST_BRANCH! --depth 1
5151
popd
5252

5353
echo '==================================> COMPILE'

.drone/drone.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,9 @@ common_install () {
4747
popd
4848
fi
4949

50-
if [ ! -d "$BOOST_ROOT/libs/http_proto" ]; then
50+
if [ ! -d "$BOOST_ROOT/libs/http" ]; then
5151
pushd $BOOST_ROOT/libs
52-
git clone https://github.com/cppalliance/http_proto -b $BOOST_BRANCH --depth 1
52+
git clone https://github.com/cppalliance/http -b $BOOST_BRANCH --depth 1
5353
popd
5454
fi
5555
}
@@ -139,9 +139,9 @@ if [ ! -d "$BOOST_ROOT/libs/capy" ]; then
139139
popd
140140
fi
141141

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

.github/workflows/ci.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -694,7 +694,7 @@ jobs:
694694
- name: Clone Boost.Http.Proto
695695
uses: actions/checkout@v3
696696
with:
697-
repository: cppalliance/http_proto
697+
repository: cppalliance/http
698698
path: http-proto-root
699699
ref: develop
700700

@@ -745,7 +745,7 @@ jobs:
745745
capy-root
746746
scan-modules-ignore: |
747747
beast2
748-
http_proto
748+
http
749749
buffers
750750
capy
751751
@@ -822,7 +822,7 @@ jobs:
822822
823823
# Patch boost-root with workspace module
824824
cp -r "$workspace_root"/http-io-root "libs/$module"
825-
cp -r "$workspace_root"/http-proto-root libs/http_proto
825+
cp -r "$workspace_root"/http-proto-root libs/http
826826
cp -r "$workspace_root"/buffers-root libs/buffers
827827
cp -r "$workspace_root"/capy-root libs/capy
828828
@@ -846,7 +846,7 @@ jobs:
846846
cxxflags: ${{ (matrix.asan && '-fsanitize=pointer-subtract') || '' }}
847847
user-config: ${{ ((startsWith(matrix.runs-on, 'windows') || startsWith(matrix.runs-on, 'macOS')) && format('{0}/user-config.jam', steps.patch.outputs.workspace_root)) || '' }}
848848
stop-on-error: true
849-
extra-args: "libs/beast2/example" # https://github.com/ashtum/cpp-actions/issues/23
849+
extra-args: "libs/beast2/example"
850850

851851
- name: Boost CMake Workflow
852852
uses: alandefreitas/cpp-actions/cmake-workflow@v1.9.0
@@ -1041,7 +1041,7 @@ jobs:
10411041
- name: Clone Boost.Http.Proto
10421042
uses: actions/checkout@v3
10431043
with:
1044-
repository: cppalliance/http_proto
1044+
repository: cppalliance/http
10451045
path: http-proto-root
10461046
ref: develop
10471047

@@ -1073,7 +1073,7 @@ jobs:
10731073
capy-root
10741074
scan-modules-ignore: |
10751075
beast2
1076-
http_proto
1076+
http
10771077
buffers
10781078
capy
10791079
@@ -1108,7 +1108,7 @@ jobs:
11081108
11091109
# Patch boost-root with workspace module
11101110
cp -r "$workspace_root"/http-io-root "libs/$module"
1111-
cp -r "$workspace_root"/http-proto-root libs/http_proto
1111+
cp -r "$workspace_root"/http-proto-root libs/http
11121112
cp -r "$workspace_root"/buffers-root libs/buffers
11131113
cp -r "$workspace_root"/capy-root libs/capy
11141114

CMakeLists.txt

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -63,15 +63,14 @@ set(BOOST_BEAST2_DEPENDENCIES
6363
Boost::core
6464
Boost::describe
6565
Boost::endian
66-
Boost::http_proto
66+
Boost::http
6767
Boost::json
6868
Boost::mp11
6969
Boost::static_assert
7070
Boost::system
7171
Boost::throw_exception
7272
Boost::url
73-
Boost::variant2
74-
)
73+
Boost::variant2)
7574

7675
foreach (BOOST_BEAST2_DEPENDENCY ${BOOST_BEAST2_DEPENDENCIES})
7776
if (BOOST_BEAST2_DEPENDENCY MATCHES "^[ ]*Boost::([A-Za-z0-9_]+)[ ]*$")
@@ -125,7 +124,7 @@ if (BOOST_BEAST2_IS_ROOT)
125124
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${BOOST_SRC_DIR}/tools/cmake/include")
126125
else ()
127126
# From Boost Package
128-
find_package(Boost REQUIRED COMPONENTS buffers capy http_proto json program_options scope system url)
127+
find_package(Boost REQUIRED COMPONENTS buffers capy http json program_options scope system url)
129128
foreach (BOOST_INCLUDE_LIBRARY ${BOOST_INCLUDE_LIBRARIES})
130129
if (NOT TARGET Boost::${BOOST_INCLUDE_LIBRARY})
131130
add_library(Boost::${BOOST_INCLUDE_LIBRARY} ALIAS Boost::headers)

build/Jamfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,11 +47,11 @@ explicit beast2_sources ;
4747
lib boost_beast2
4848
: beast2_sources
4949
: requirements
50-
<library>/boost//http_proto
50+
<library>/boost//http
5151
<include>../
5252
<define>BOOST_BEAST2_SOURCE
5353
: usage-requirements
54-
<library>/boost//http_proto
54+
<library>/boost//http
5555
;
5656

5757
boost-install boost_beast2 ;

doc/antora.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ ext:
1313
config: doc/mrdocs.yml
1414
cpp-tagfiles:
1515
files:
16-
- file: ./doc/tagfiles/boost-http_proto-doxygen.tag.xml
16+
- file: ./doc/tagfiles/boost-http-doxygen.tag.xml
1717
base_url: 'xref:reference:'
1818
using-namespaces:
1919
- boost::beast2
20-
- boost::http_proto
20+
- boost::http

0 commit comments

Comments
 (0)