From 976211a426d4997370acd7077f3dbc85126442b6 Mon Sep 17 00:00:00 2001 From: Vertexwahn Date: Sat, 14 Dec 2024 21:56:33 +0100 Subject: [PATCH 01/10] boost.beast@1.83.0 --- modules/boost.beast/1.83.0/MODULE.bazel | 29 ++++++++++++++ .../boost.beast/1.83.0/overlay/BUILD.bazel | 38 +++++++++++++++++++ .../boost.beast/1.83.0/overlay/MODULE.bazel | 1 + modules/boost.beast/1.83.0/presubmit.yml | 19 ++++++++++ modules/boost.beast/1.83.0/source.json | 10 +++++ modules/boost.beast/metadata.json | 22 +++++++++++ 6 files changed, 119 insertions(+) create mode 100644 modules/boost.beast/1.83.0/MODULE.bazel create mode 100644 modules/boost.beast/1.83.0/overlay/BUILD.bazel create mode 120000 modules/boost.beast/1.83.0/overlay/MODULE.bazel create mode 100644 modules/boost.beast/1.83.0/presubmit.yml create mode 100644 modules/boost.beast/1.83.0/source.json create mode 100644 modules/boost.beast/metadata.json diff --git a/modules/boost.beast/1.83.0/MODULE.bazel b/modules/boost.beast/1.83.0/MODULE.bazel new file mode 100644 index 00000000000..49f66b7e433 --- /dev/null +++ b/modules/boost.beast/1.83.0/MODULE.bazel @@ -0,0 +1,29 @@ +module( + name = "boost.beast", + version = "1.83.0", + bazel_compatibility = [">=7.2.1"], + compatibility_level = 108300, +) + +bazel_dep(name = "boost.asio", version = "1.83.0.bcr.1") +bazel_dep(name = "boost.assert", version = "1.83.0.bcr.1") +bazel_dep(name = "boost.bind", version = "1.83.0.bcr.1") +bazel_dep(name = "boost.config", version = "1.83.0.bcr.1") +bazel_dep(name = "boost.container_hash", version = "1.83.0.bcr.1") +bazel_dep(name = "boost.container", version = "1.83.0.bcr.1") +bazel_dep(name = "boost.core", version = "1.83.0.bcr.1") +bazel_dep(name = "boost.endian", version = "1.83.0.bcr.1") +bazel_dep(name = "boost.intrusive", version = "1.83.0.bcr.1") +bazel_dep(name = "boost.logic", version = "1.83.0.bcr.1") +bazel_dep(name = "boost.mp11", version = "1.83.0.bcr.1") +bazel_dep(name = "boost.optional", version = "1.83.0.bcr.1") +bazel_dep(name = "boost.preprocessor", version = "1.83.0.bcr.1") +bazel_dep(name = "boost.smart_ptr", version = "1.83.0.bcr.1") +bazel_dep(name = "boost.static_assert", version = "1.83.0.bcr.1") +bazel_dep(name = "boost.static_string", version = "1.83.0.bcr.1") +bazel_dep(name = "boost.system", version = "1.83.0.bcr.1") +bazel_dep(name = "boost.throw_exception", version = "1.83.0.bcr.1") +bazel_dep(name = "boost.type_index", version = "1.83.0.bcr.1") +bazel_dep(name = "boost.type_traits", version = "1.83.0.bcr.1") +bazel_dep(name = "boost.winapi", version = "1.83.0.bcr.1") +bazel_dep(name = "rules_cc", version = "0.1.0") diff --git a/modules/boost.beast/1.83.0/overlay/BUILD.bazel b/modules/boost.beast/1.83.0/overlay/BUILD.bazel new file mode 100644 index 00000000000..a3f8ea98439 --- /dev/null +++ b/modules/boost.beast/1.83.0/overlay/BUILD.bazel @@ -0,0 +1,38 @@ +load("@rules_cc//cc:defs.bzl", "cc_library") + +package(default_visibility = ["//visibility:public"]) + +cc_library( + name = "boost.beast", + hdrs = glob([ + "include/**/*.hpp", + "include/**/*.ipp", + ]), + features = [ + "parse_headers", + ], + includes = ["include"], + deps = [ + "@boost.asio", + "@boost.assert", + "@boost.bind", + "@boost.config", + "@boost.container", + "@boost.container_hash", + "@boost.core", + "@boost.endian", + "@boost.intrusive", + "@boost.logic", + "@boost.mp11", + "@boost.optional", + "@boost.preprocessor", + "@boost.smart_ptr", + "@boost.static_assert", + "@boost.static_string", + "@boost.system", + "@boost.throw_exception", + "@boost.type_index", + "@boost.type_traits", + "@boost.winapi", + ], +) diff --git a/modules/boost.beast/1.83.0/overlay/MODULE.bazel b/modules/boost.beast/1.83.0/overlay/MODULE.bazel new file mode 120000 index 00000000000..9b599e3ad9c --- /dev/null +++ b/modules/boost.beast/1.83.0/overlay/MODULE.bazel @@ -0,0 +1 @@ +../MODULE.bazel \ No newline at end of file diff --git a/modules/boost.beast/1.83.0/presubmit.yml b/modules/boost.beast/1.83.0/presubmit.yml new file mode 100644 index 00000000000..53e884d74a4 --- /dev/null +++ b/modules/boost.beast/1.83.0/presubmit.yml @@ -0,0 +1,19 @@ +matrix: + platform: + - debian10 + - debian11 + - macos + - macos_arm64 + - ubuntu2004 + - ubuntu2204 + - windows + bazel: [7.x, 8.x, rolling] +tasks: + verify_targets: + name: Verify build targets + platform: ${{ platform }} + bazel: ${{ bazel }} + build_flags: + - '--process_headers_in_dependencies' + build_targets: + - '@boost.beast//:boost.beast' diff --git a/modules/boost.beast/1.83.0/source.json b/modules/boost.beast/1.83.0/source.json new file mode 100644 index 00000000000..f4b102ec751 --- /dev/null +++ b/modules/boost.beast/1.83.0/source.json @@ -0,0 +1,10 @@ +{ + "integrity": "sha256-uMwzi0N9NQqe18kPCF6LYFpq32dKn2z3qWz3JdeK03U=", + "strip_prefix": "beast-boost-1.83.0", + "url": "https://github.com/boostorg/beast/archive/refs/tags/boost-1.83.0.tar.gz", + "patch_strip": 0, + "overlay": { + "MODULE.bazel": "sha256-Vn+g6QPmBT7bgicWkOFt0RBfb8sRKA87uk8BiRfrlNg=", + "BUILD.bazel": "sha256-1kHZJvnyC1XNR3KnbFteYiJwGYHJMsIcT4PuIlsmmB4=" + } +} diff --git a/modules/boost.beast/metadata.json b/modules/boost.beast/metadata.json new file mode 100644 index 00000000000..ba1b2a900ab --- /dev/null +++ b/modules/boost.beast/metadata.json @@ -0,0 +1,22 @@ +{ + "homepage": "http://boost.org/libs/beast", + "maintainers": [ + { + "email": "daisuke.nishimatsu1021@gmail.com", + "github": "wep21", + "name": "Daisuke Nishimatsu" + }, + { + "email": "julian.amann@tum.de", + "github": "Vertexwahn", + "name": "Julian Amann" + } + ], + "repository": [ + "github:boostorg/beast" + ], + "versions": [ + "1.83.0" + ], + "yanked_versions": {} +} From 2da31394e06fa9519535311e736009febc7b1ffa Mon Sep 17 00:00:00 2001 From: Vertexwahn Date: Sat, 14 Dec 2024 21:57:37 +0100 Subject: [PATCH 02/10] Fix hashes --- modules/boost.beast/1.83.0/source.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/boost.beast/1.83.0/source.json b/modules/boost.beast/1.83.0/source.json index f4b102ec751..9c7135579d3 100644 --- a/modules/boost.beast/1.83.0/source.json +++ b/modules/boost.beast/1.83.0/source.json @@ -1,10 +1,10 @@ { - "integrity": "sha256-uMwzi0N9NQqe18kPCF6LYFpq32dKn2z3qWz3JdeK03U=", + "integrity": "sha256-mwWy8hmRe+ToiX74I7k3qZNKGPKCUWcfWVlubZNQ+Gw=", "strip_prefix": "beast-boost-1.83.0", "url": "https://github.com/boostorg/beast/archive/refs/tags/boost-1.83.0.tar.gz", "patch_strip": 0, "overlay": { - "MODULE.bazel": "sha256-Vn+g6QPmBT7bgicWkOFt0RBfb8sRKA87uk8BiRfrlNg=", - "BUILD.bazel": "sha256-1kHZJvnyC1XNR3KnbFteYiJwGYHJMsIcT4PuIlsmmB4=" + "BUILD.bazel": "sha256-sG1Xgq+8SS0HLUJZjWv935VZYp3m5Ai5F4XaSv6RLyY=", + "MODULE.bazel": "sha256-CU5+BZaRXMk/nI01HL15PRjIR/Teoe2xKplWAv/8fzE=" } } From 9a5b87672633eb35d6e6dd6633c135205d235148 Mon Sep 17 00:00:00 2001 From: Vertexwahn Date: Sat, 14 Dec 2024 22:16:50 +0100 Subject: [PATCH 03/10] Replace MODULE.bazel by symlink --- modules/boost.beast/1.83.0/overlay/MODULE.bazel | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/boost.beast/1.83.0/overlay/MODULE.bazel b/modules/boost.beast/1.83.0/overlay/MODULE.bazel index 9b599e3ad9c..b9e57978289 120000 --- a/modules/boost.beast/1.83.0/overlay/MODULE.bazel +++ b/modules/boost.beast/1.83.0/overlay/MODULE.bazel @@ -1 +1 @@ -../MODULE.bazel \ No newline at end of file +MODULE.bazel \ No newline at end of file From 5eba23fb2c311e8b6dbbd0771f5dd3287a26990e Mon Sep 17 00:00:00 2001 From: Vertexwahn Date: Sat, 14 Dec 2024 22:18:10 +0100 Subject: [PATCH 04/10] Replace MODULE.bazel by symlink --- modules/boost.beast/1.83.0/overlay/MODULE.bazel | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/boost.beast/1.83.0/overlay/MODULE.bazel b/modules/boost.beast/1.83.0/overlay/MODULE.bazel index b9e57978289..9b599e3ad9c 120000 --- a/modules/boost.beast/1.83.0/overlay/MODULE.bazel +++ b/modules/boost.beast/1.83.0/overlay/MODULE.bazel @@ -1 +1 @@ -MODULE.bazel \ No newline at end of file +../MODULE.bazel \ No newline at end of file From 996e23ce1127265827b1d0e190075577b3c54708 Mon Sep 17 00:00:00 2001 From: Vertexwahn Date: Thu, 19 Dec 2024 18:00:04 +0100 Subject: [PATCH 05/10] Switch to rules_cc 0.0.17 --- modules/boost.beast/1.83.0/MODULE.bazel | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/boost.beast/1.83.0/MODULE.bazel b/modules/boost.beast/1.83.0/MODULE.bazel index 49f66b7e433..68a2c216212 100644 --- a/modules/boost.beast/1.83.0/MODULE.bazel +++ b/modules/boost.beast/1.83.0/MODULE.bazel @@ -26,4 +26,4 @@ bazel_dep(name = "boost.throw_exception", version = "1.83.0.bcr.1") bazel_dep(name = "boost.type_index", version = "1.83.0.bcr.1") bazel_dep(name = "boost.type_traits", version = "1.83.0.bcr.1") bazel_dep(name = "boost.winapi", version = "1.83.0.bcr.1") -bazel_dep(name = "rules_cc", version = "0.1.0") +bazel_dep(name = "rules_cc", version = "0.0.17") From 60018a147b0b4205af8621eb4e559fb9ab9d4cb2 Mon Sep 17 00:00:00 2001 From: Vertexwahn Date: Sun, 22 Dec 2024 01:32:33 +0100 Subject: [PATCH 06/10] Fix hashes --- modules/boost.beast/1.83.0/source.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/boost.beast/1.83.0/source.json b/modules/boost.beast/1.83.0/source.json index 9c7135579d3..26a3232baba 100644 --- a/modules/boost.beast/1.83.0/source.json +++ b/modules/boost.beast/1.83.0/source.json @@ -5,6 +5,6 @@ "patch_strip": 0, "overlay": { "BUILD.bazel": "sha256-sG1Xgq+8SS0HLUJZjWv935VZYp3m5Ai5F4XaSv6RLyY=", - "MODULE.bazel": "sha256-CU5+BZaRXMk/nI01HL15PRjIR/Teoe2xKplWAv/8fzE=" + "MODULE.bazel": "sha256-mudteegVwf64F1oBP5rgxIoDBmuomhcik/ZuONbTDUw=" } } From 0cfb7cb4dedd5315b6a112825bd209bf5ea540e5 Mon Sep 17 00:00:00 2001 From: Vertexwahn Date: Sun, 22 Dec 2024 17:05:13 +0100 Subject: [PATCH 07/10] Add Ubunutu 24.04 to CI --- modules/boost.beast/1.83.0/presubmit.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/boost.beast/1.83.0/presubmit.yml b/modules/boost.beast/1.83.0/presubmit.yml index 53e884d74a4..9e0d29e5f6f 100644 --- a/modules/boost.beast/1.83.0/presubmit.yml +++ b/modules/boost.beast/1.83.0/presubmit.yml @@ -6,6 +6,7 @@ matrix: - macos_arm64 - ubuntu2004 - ubuntu2204 + - ubuntu2404 - windows bazel: [7.x, 8.x, rolling] tasks: From 1376348555a3aba16c8001dcd15bc1834efeefa5 Mon Sep 17 00:00:00 2001 From: Vertexwahn Date: Sun, 22 Dec 2024 17:11:10 +0100 Subject: [PATCH 08/10] Focus on Ubuntu 24.04 --- modules/boost.beast/1.83.0/presubmit.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/modules/boost.beast/1.83.0/presubmit.yml b/modules/boost.beast/1.83.0/presubmit.yml index 9e0d29e5f6f..dad9c5c88b0 100644 --- a/modules/boost.beast/1.83.0/presubmit.yml +++ b/modules/boost.beast/1.83.0/presubmit.yml @@ -1,11 +1,11 @@ matrix: platform: - - debian10 - - debian11 - - macos - - macos_arm64 - - ubuntu2004 - - ubuntu2204 + #- debian10 + #- debian11 + #- macos + #- macos_arm64 + #- ubuntu2004 + #- ubuntu2204 - ubuntu2404 - windows bazel: [7.x, 8.x, rolling] From 4123045cfdf179d9e49829ee71901d0fd5965bde Mon Sep 17 00:00:00 2001 From: Vertexwahn Date: Mon, 23 Dec 2024 09:37:50 +0100 Subject: [PATCH 09/10] Try to get --process_headers_in_dependencies workding --- .../boost.beast/1.83.0/overlay/BUILD.bazel | 96 ++++++++++++++++++- 1 file changed, 92 insertions(+), 4 deletions(-) diff --git a/modules/boost.beast/1.83.0/overlay/BUILD.bazel b/modules/boost.beast/1.83.0/overlay/BUILD.bazel index a3f8ea98439..8ed827b9f4b 100644 --- a/modules/boost.beast/1.83.0/overlay/BUILD.bazel +++ b/modules/boost.beast/1.83.0/overlay/BUILD.bazel @@ -4,14 +4,102 @@ package(default_visibility = ["//visibility:public"]) cc_library( name = "boost.beast", - hdrs = glob([ - "include/**/*.hpp", - "include/**/*.ipp", - ]), + srcs = [ + "build_beast.cpp", + ], + hdrs = glob( + [ + "include/**/*.hpp", + "include/**/*.ipp", + ], + exclude = [ + "include/boost/beast/_experimental/http/impl/icy_stream.hpp", + "include/boost/beast/_experimental/test/detail/stream_state.ipp", + "include/boost/beast/_experimental/test/impl/error.hpp", + "include/boost/beast/_experimental/test/impl/stream.hpp", + "include/boost/beast/core/detail/bind_default_executor.hpp", + "include/boost/beast/core/detail/buffer_traits.hpp", + "include/boost/beast/core/detail/buffers_pair.hpp", + "include/boost/beast/core/detail/impl/read.hpp", + "include/boost/beast/core/detail/remap_post_to_defer.hpp", + "include/boost/beast/core/detail/service_base.hpp", + "include/boost/beast/core/detail/static_ostream.hpp", + "include/boost/beast/core/detail/stream_base.hpp", + "include/boost/beast/core/detail/work_guard.hpp", + "include/boost/beast/core/impl/async_base.hpp", + "include/boost/beast/core/impl/basic_stream.hpp", + "include/boost/beast/core/impl/buffered_read_stream.hpp", + "include/boost/beast/core/impl/buffers_cat.hpp", + "include/boost/beast/core/impl/buffers_prefix.hpp", + "include/boost/beast/core/impl/buffers_suffix.hpp", + "include/boost/beast/core/impl/error.hpp", + "include/boost/beast/core/impl/flat_buffer.hpp", + "include/boost/beast/core/impl/flat_static_buffer.hpp", + "include/boost/beast/core/impl/flat_stream.hpp", + "include/boost/beast/core/impl/multi_buffer.hpp", + "include/boost/beast/core/impl/read_size.hpp", + "include/boost/beast/core/impl/saved_handler.hpp", + "include/boost/beast/core/impl/static_buffer.hpp", + "include/boost/beast/core/impl/string_param.hpp", + "include/boost/beast/http/detail/rfc7230.hpp", + "include/boost/beast/http/detail/rfc7230.ipp", + "include/boost/beast/http/impl/error.hpp", + "include/boost/beast/websocket/impl/error.hpp", + "include/boost/beast/zlib/impl/error.hpp", + "include/boost/beast/http/detail/type_traits.hpp", + "include/boost/beast/http/impl/basic_parser.hpp", + "include/boost/beast/http/impl/field.ipp", + "include/boost/beast/http/impl/parser.hpp", + "include/boost/beast/http/impl/chunk_encode.hpp","include/boost/beast/http/detail/rfc7230.hpp", + ], + ), + defines = [ + "BOOST_BEAST_SEPARATE_COMPILATION", + #"BOOST_BEAST_USE_STD_STRING_VIEW", + #"BOOST_NO_CXX17_HDR_STRING_VIEW", + ], features = [ "parse_headers", ], includes = ["include"], + textual_hdrs = [ + "include/boost/beast/http/impl/field.ipp", + "include/boost/beast/_experimental/http/impl/icy_stream.hpp", + "include/boost/beast/http/detail/type_traits.hpp", + "include/boost/beast/_experimental/test/detail/stream_state.ipp", + "include/boost/beast/http/impl/basic_parser.hpp", + "include/boost/beast/_experimental/test/impl/error.hpp", + "include/boost/beast/http/impl/parser.hpp", + "include/boost/beast/http/impl/chunk_encode.hpp", + "include/boost/beast/_experimental/test/impl/stream.hpp", + "include/boost/beast/core/detail/bind_default_executor.hpp", + "include/boost/beast/core/detail/buffer_traits.hpp", + "include/boost/beast/core/detail/buffers_pair.hpp", + "include/boost/beast/core/detail/impl/read.hpp", + "include/boost/beast/core/detail/remap_post_to_defer.hpp", + "include/boost/beast/core/detail/service_base.hpp", + "include/boost/beast/core/detail/stream_base.hpp", + "include/boost/beast/core/detail/work_guard.hpp", + "include/boost/beast/core/impl/async_base.hpp", + "include/boost/beast/core/impl/basic_stream.hpp", + "include/boost/beast/core/impl/buffered_read_stream.hpp", + "include/boost/beast/core/impl/buffers_cat.hpp", + "include/boost/beast/core/impl/buffers_prefix.hpp", + "include/boost/beast/core/impl/buffers_suffix.hpp", + "include/boost/beast/core/impl/error.hpp", + "include/boost/beast/core/impl/flat_buffer.hpp", + "include/boost/beast/core/impl/flat_static_buffer.hpp", + "include/boost/beast/core/impl/flat_stream.hpp", + "include/boost/beast/core/impl/multi_buffer.hpp", + "include/boost/beast/core/impl/read_size.hpp", + "include/boost/beast/core/impl/saved_handler.hpp", + "include/boost/beast/core/impl/static_buffer.hpp", + "include/boost/beast/http/detail/rfc7230.hpp", + "include/boost/beast/http/detail/rfc7230.ipp", + "include/boost/beast/http/impl/error.hpp", + "include/boost/beast/websocket/impl/error.hpp", + "include/boost/beast/zlib/impl/error.hpp", + ], deps = [ "@boost.asio", "@boost.assert", From dcc39521e726f25b5e0e04f3b60caea63e90f43f Mon Sep 17 00:00:00 2001 From: Vertexwahn Date: Sat, 4 Jan 2025 00:32:08 +0100 Subject: [PATCH 10/10] Fix hashes --- modules/boost.beast/1.83.0/source.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/boost.beast/1.83.0/source.json b/modules/boost.beast/1.83.0/source.json index 26a3232baba..95087baa58f 100644 --- a/modules/boost.beast/1.83.0/source.json +++ b/modules/boost.beast/1.83.0/source.json @@ -4,7 +4,7 @@ "url": "https://github.com/boostorg/beast/archive/refs/tags/boost-1.83.0.tar.gz", "patch_strip": 0, "overlay": { - "BUILD.bazel": "sha256-sG1Xgq+8SS0HLUJZjWv935VZYp3m5Ai5F4XaSv6RLyY=", + "BUILD.bazel": "sha256-gRH1QsOf7yTpVNKbhQYcszIczzEltDW+GSR0qtzHM1g=", "MODULE.bazel": "sha256-mudteegVwf64F1oBP5rgxIoDBmuomhcik/ZuONbTDUw=" } }