From 1766a7ba542110cd54c992988f8b3528e3907a07 Mon Sep 17 00:00:00 2001 From: Gerorge Liao Date: Fri, 4 Oct 2024 10:43:15 +0200 Subject: [PATCH] [3rd-party] added vcpkg and grpc update --- 3rd-party/vcpkg | 2 +- .../vcpkg-ports/grpc/00001-fix-uwp.patch | 73 + .../grpc/00004-link-gdi32-on-windows.patch | 10 +- .../grpc/00005-fix-uwp-error.patch | 12 +- .../grpc/00006-remove-unused-libraries.patch | 1497 ----------------- .../grpc/00009-use-system-upb.patch | 143 ++ .../grpc/00014-pkgconfig-upbdefs.patch | 13 - .../grpc/00015-disable-download-archive.patch | 2 +- .../grpc/00016-fix-plugin-targets.patch | 12 + 3rd-party/vcpkg-ports/grpc/00017-abseil.patch | 36 + .../grpc/gRPCTargets-vcpkg-tools.cmake | 10 + 3rd-party/vcpkg-ports/grpc/portfile.cmake | 54 +- 3rd-party/vcpkg-ports/grpc/snprintf.patch | 12 - .../grpc/vcpkg-cmake-wrapper.cmake | 2 + 3rd-party/vcpkg-ports/grpc/vcpkg.json | 13 +- vcpkg.json | 2 +- 16 files changed, 332 insertions(+), 1561 deletions(-) create mode 100644 3rd-party/vcpkg-ports/grpc/00001-fix-uwp.patch delete mode 100644 3rd-party/vcpkg-ports/grpc/00006-remove-unused-libraries.patch create mode 100644 3rd-party/vcpkg-ports/grpc/00009-use-system-upb.patch delete mode 100644 3rd-party/vcpkg-ports/grpc/00014-pkgconfig-upbdefs.patch create mode 100644 3rd-party/vcpkg-ports/grpc/00016-fix-plugin-targets.patch create mode 100644 3rd-party/vcpkg-ports/grpc/00017-abseil.patch create mode 100644 3rd-party/vcpkg-ports/grpc/gRPCTargets-vcpkg-tools.cmake delete mode 100644 3rd-party/vcpkg-ports/grpc/snprintf.patch create mode 100644 3rd-party/vcpkg-ports/grpc/vcpkg-cmake-wrapper.cmake diff --git a/3rd-party/vcpkg b/3rd-party/vcpkg index ca7b1b15f5..c82f746672 160000 --- a/3rd-party/vcpkg +++ b/3rd-party/vcpkg @@ -1 +1 @@ -Subproject commit ca7b1b15f548c25c766360593a2c732d56ed0133 +Subproject commit c82f74667287d3dc386bce81e44964370c91a289 diff --git a/3rd-party/vcpkg-ports/grpc/00001-fix-uwp.patch b/3rd-party/vcpkg-ports/grpc/00001-fix-uwp.patch new file mode 100644 index 0000000000..e33079b34c --- /dev/null +++ b/3rd-party/vcpkg-ports/grpc/00001-fix-uwp.patch @@ -0,0 +1,73 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index ec370e9..4f7d770 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -237,6 +237,9 @@ if(UNIX) + endif() + if(WIN32) + set(_gRPC_PLATFORM_WINDOWS ON) ++ if(CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") ++ set(_gRPC_PLATFORM_UWP ON) ++ endif() + endif() + + if (APPLE AND NOT DEFINED CMAKE_CXX_STANDARD) +@@ -267,6 +270,9 @@ if(MSVC) + set(_gRPC_C_CXX_FLAGS "${_gRPC_C_CXX_FLAGS} /wd4267") + # TODO(jtattermusch): needed to build boringssl with VS2017, revisit later + set(_gRPC_C_CXX_FLAGS "${_gRPC_C_CXX_FLAGS} /wd4987 /wd4774 /wd4819 /wd4996 /wd4619") ++ if(_gRPC_PLATFORM_UWP) ++ add_definitions(-DGRPC_ARES=0) ++ endif() + # Silences thousands of trucation warnings + set(_gRPC_C_CXX_FLAGS "${_gRPC_C_CXX_FLAGS} /wd4503") + # Tell MSVC to build grpc using utf-8 +@@ -439,6 +445,10 @@ file(MAKE_DIRECTORY ${_gRPC_PROTO_GENS_DIR}) + # ``.proto`` files + # + function(protobuf_generate_grpc_cpp) ++ if(_gRPC_PLATFORM_UWP) ++ return() ++ endif() ++ + if(NOT ARGN) + message(SEND_ERROR "Error: PROTOBUF_GENERATE_GRPC_CPP() called without any proto files") + return() +@@ -561,6 +571,7 @@ if (gRPC_BUILD_GRPC_RUBY_PLUGIN) + list(APPEND _gRPC_PLUGIN_LIST grpc_ruby_plugin) + endif () + ++if(NOT _gRPC_PLATFORM_UWP) + add_custom_target(plugins + DEPENDS ${_gRPC_PLUGIN_LIST} + ) +@@ -575,6 +586,7 @@ add_custom_target(tools_cxx + + add_custom_target(tools + DEPENDS tools_c tools_cxx) ++endif() + + protobuf_generate_grpc_cpp_with_import_path_correction( + src/proto/grpc/channelz/channelz.proto src/proto/grpc/channelz/channelz.proto +diff --git a/src/core/lib/security/credentials/alts/check_gcp_environment_windows.cc b/src/core/lib/security/credentials/alts/check_gcp_environment_windows.cc +index b034cca..5dbdfe3 100644 +--- a/src/core/lib/security/credentials/alts/check_gcp_environment_windows.cc ++++ b/src/core/lib/security/credentials/alts/check_gcp_environment_windows.cc +@@ -40,6 +40,7 @@ bool check_bios_data(const char*) { return false; } + bool check_windows_registry_product_name(HKEY root_key, + const char* reg_key_path, + const char* reg_key_name) { ++ #if !defined(WINAPI_FAMILY) || WINAPI_FAMILY == WINAPI_FAMILY_DESKTOP_APP + const size_t kProductNameBufferSize = 256; + char const expected_substr[] = "Google"; + +@@ -72,6 +73,9 @@ bool check_windows_registry_product_name(HKEY root_key, + } + + return strstr(buffer, expected_substr) != nullptr; ++#else ++ return false; ++#endif + } + + } // namespace internal diff --git a/3rd-party/vcpkg-ports/grpc/00004-link-gdi32-on-windows.patch b/3rd-party/vcpkg-ports/grpc/00004-link-gdi32-on-windows.patch index 54b55c60b8..a3af55facc 100644 --- a/3rd-party/vcpkg-ports/grpc/00004-link-gdi32-on-windows.patch +++ b/3rd-party/vcpkg-ports/grpc/00004-link-gdi32-on-windows.patch @@ -1,13 +1,13 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 25990a5d8a..8a632d2289 100644 +index fce68b9..220f251 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -404,7 +404,7 @@ if (NOT EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/third_party/xds) +@@ -432,7 +432,7 @@ if (NOT EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/third_party/xds) endif() if(WIN32) -- set(_gRPC_BASELIB_LIBRARIES ws2_32 crypt32) -+ set(_gRPC_BASELIB_LIBRARIES wsock32 ws2_32 crypt32 gdi32) +- set(_gRPC_ALLTARGETS_LIBRARIES ${_gRPC_ALLTARGETS_LIBRARIES} ws2_32 crypt32) ++ set(_gRPC_ALLTARGETS_LIBRARIES ${_gRPC_ALLTARGETS_LIBRARIES} wsock32 ws2_32 crypt32 gdi32) + set(_gRPC_STATIC_WIN32 STATIC) endif() - # Create directory for proto source files diff --git a/3rd-party/vcpkg-ports/grpc/00005-fix-uwp-error.patch b/3rd-party/vcpkg-ports/grpc/00005-fix-uwp-error.patch index 23f885d48e..69a3e7d646 100644 --- a/3rd-party/vcpkg-ports/grpc/00005-fix-uwp-error.patch +++ b/3rd-party/vcpkg-ports/grpc/00005-fix-uwp-error.patch @@ -1,10 +1,10 @@ diff --git a/src/core/ext/transport/chttp2/transport/hpack_parser.cc b/src/core/ext/transport/chttp2/transport/hpack_parser.cc -index b0d3a6465b..5c48f1aa30 100644 +index 31bf464..d1007e4 100644 --- a/src/core/ext/transport/chttp2/transport/hpack_parser.cc +++ b/src/core/ext/transport/chttp2/transport/hpack_parser.cc -@@ -1037,7 +1037,7 @@ class HPackParser::Parser { +@@ -689,7 +689,7 @@ class HPackParser::Parser { + } - private: void GPR_ATTRIBUTE_NOINLINE LogHeader(const HPackTable::Memento& memento) { - const char* type; + const char* type = nullptr; @@ -12,7 +12,7 @@ index b0d3a6465b..5c48f1aa30 100644 case LogInfo::kHeaders: type = "HDR"; diff --git a/src/core/lib/slice/slice.cc b/src/core/lib/slice/slice.cc -index 898a62823c..6b31cdc082 100644 +index 6180ef1..a8e8110 100644 --- a/src/core/lib/slice/slice.cc +++ b/src/core/lib/slice/slice.cc @@ -188,6 +188,7 @@ grpc_slice grpc_slice_from_moved_buffer(grpc_core::UniquePtr p, @@ -33,10 +33,10 @@ index 898a62823c..6b31cdc082 100644 slice.refcount = nullptr; slice.data.inlined.length = str.size(); diff --git a/src/core/lib/surface/server.cc b/src/core/lib/surface/server.cc -index 141b16e345..89d9d6dafd 100644 +index 3dda49d..202caa5 100644 --- a/src/core/lib/surface/server.cc +++ b/src/core/lib/surface/server.cc -@@ -902,7 +902,7 @@ grpc_call_error Server::QueueRequestedCall(size_t cq_idx, RequestedCall* rc) { +@@ -1057,7 +1057,7 @@ grpc_call_error Server::QueueRequestedCall(size_t cq_idx, RequestedCall* rc) { FailCall(cq_idx, rc, GRPC_ERROR_CREATE("Server Shutdown")); return GRPC_CALL_OK; } diff --git a/3rd-party/vcpkg-ports/grpc/00006-remove-unused-libraries.patch b/3rd-party/vcpkg-ports/grpc/00006-remove-unused-libraries.patch deleted file mode 100644 index 42e84657ea..0000000000 --- a/3rd-party/vcpkg-ports/grpc/00006-remove-unused-libraries.patch +++ /dev/null @@ -1,1497 +0,0 @@ ---- a/CMakeLists.txt 2023-06-28 15:13:15.285490308 -0400 -+++ b/CMakeLists.txt 2024-02-21 16:10:59.343573098 -0500 -@@ -2684,498 +2706,6 @@ - - endif() - --add_library(grpc_unsecure -- src/core/ext/filters/census/grpc_context.cc -- src/core/ext/filters/channel_idle/channel_idle_filter.cc -- src/core/ext/filters/channel_idle/idle_filter_state.cc -- src/core/ext/filters/client_channel/backend_metric.cc -- src/core/ext/filters/client_channel/backup_poller.cc -- src/core/ext/filters/client_channel/channel_connectivity.cc -- src/core/ext/filters/client_channel/client_channel.cc -- src/core/ext/filters/client_channel/client_channel_channelz.cc -- src/core/ext/filters/client_channel/client_channel_factory.cc -- src/core/ext/filters/client_channel/client_channel_plugin.cc -- src/core/ext/filters/client_channel/client_channel_service_config.cc -- src/core/ext/filters/client_channel/config_selector.cc -- src/core/ext/filters/client_channel/dynamic_filters.cc -- src/core/ext/filters/client_channel/global_subchannel_pool.cc -- src/core/ext/filters/client_channel/health/health_check_client.cc -- src/core/ext/filters/client_channel/http_proxy.cc -- src/core/ext/filters/client_channel/lb_policy/address_filtering.cc -- src/core/ext/filters/client_channel/lb_policy/child_policy_handler.cc -- src/core/ext/filters/client_channel/lb_policy/grpclb/client_load_reporting_filter.cc -- src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb.cc -- src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_balancer_addresses.cc -- src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_client_stats.cc -- src/core/ext/filters/client_channel/lb_policy/grpclb/load_balancer_api.cc -- src/core/ext/filters/client_channel/lb_policy/oob_backend_metric.cc -- src/core/ext/filters/client_channel/lb_policy/outlier_detection/outlier_detection.cc -- src/core/ext/filters/client_channel/lb_policy/pick_first/pick_first.cc -- src/core/ext/filters/client_channel/lb_policy/priority/priority.cc -- src/core/ext/filters/client_channel/lb_policy/ring_hash/ring_hash.cc -- src/core/ext/filters/client_channel/lb_policy/rls/rls.cc -- src/core/ext/filters/client_channel/lb_policy/round_robin/round_robin.cc -- src/core/ext/filters/client_channel/lb_policy/weighted_target/weighted_target.cc -- src/core/ext/filters/client_channel/local_subchannel_pool.cc -- src/core/ext/filters/client_channel/resolver/binder/binder_resolver.cc -- src/core/ext/filters/client_channel/resolver/dns/c_ares/dns_resolver_ares.cc -- src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver_posix.cc -- src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver_windows.cc -- src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper.cc -- src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper_posix.cc -- src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper_windows.cc -- src/core/ext/filters/client_channel/resolver/dns/dns_resolver_selection.cc -- src/core/ext/filters/client_channel/resolver/dns/native/dns_resolver.cc -- src/core/ext/filters/client_channel/resolver/fake/fake_resolver.cc -- src/core/ext/filters/client_channel/resolver/polling_resolver.cc -- src/core/ext/filters/client_channel/resolver/sockaddr/sockaddr_resolver.cc -- src/core/ext/filters/client_channel/retry_filter.cc -- src/core/ext/filters/client_channel/retry_service_config.cc -- src/core/ext/filters/client_channel/retry_throttle.cc -- src/core/ext/filters/client_channel/service_config_channel_arg_filter.cc -- src/core/ext/filters/client_channel/subchannel.cc -- src/core/ext/filters/client_channel/subchannel_pool_interface.cc -- src/core/ext/filters/client_channel/subchannel_stream_client.cc -- src/core/ext/filters/deadline/deadline_filter.cc -- src/core/ext/filters/fault_injection/fault_injection_filter.cc -- src/core/ext/filters/fault_injection/fault_injection_service_config_parser.cc -- src/core/ext/filters/http/client/http_client_filter.cc -- src/core/ext/filters/http/client_authority_filter.cc -- src/core/ext/filters/http/http_filters_plugin.cc -- src/core/ext/filters/http/message_compress/compression_filter.cc -- src/core/ext/filters/http/server/http_server_filter.cc -- src/core/ext/filters/message_size/message_size_filter.cc -- src/core/ext/transport/chttp2/client/chttp2_connector.cc -- src/core/ext/transport/chttp2/server/chttp2_server.cc -- src/core/ext/transport/chttp2/transport/bin_decoder.cc -- src/core/ext/transport/chttp2/transport/bin_encoder.cc -- src/core/ext/transport/chttp2/transport/chttp2_transport.cc -- src/core/ext/transport/chttp2/transport/context_list.cc -- src/core/ext/transport/chttp2/transport/decode_huff.cc -- src/core/ext/transport/chttp2/transport/flow_control.cc -- src/core/ext/transport/chttp2/transport/frame_data.cc -- src/core/ext/transport/chttp2/transport/frame_goaway.cc -- src/core/ext/transport/chttp2/transport/frame_ping.cc -- src/core/ext/transport/chttp2/transport/frame_rst_stream.cc -- src/core/ext/transport/chttp2/transport/frame_settings.cc -- src/core/ext/transport/chttp2/transport/frame_window_update.cc -- src/core/ext/transport/chttp2/transport/hpack_encoder.cc -- src/core/ext/transport/chttp2/transport/hpack_encoder_table.cc -- src/core/ext/transport/chttp2/transport/hpack_parser.cc -- src/core/ext/transport/chttp2/transport/hpack_parser_table.cc -- src/core/ext/transport/chttp2/transport/http2_settings.cc -- src/core/ext/transport/chttp2/transport/http_trace.cc -- src/core/ext/transport/chttp2/transport/huffsyms.cc -- src/core/ext/transport/chttp2/transport/parsing.cc -- src/core/ext/transport/chttp2/transport/stream_lists.cc -- src/core/ext/transport/chttp2/transport/stream_map.cc -- src/core/ext/transport/chttp2/transport/varint.cc -- src/core/ext/transport/chttp2/transport/writing.cc -- src/core/ext/transport/inproc/inproc_plugin.cc -- src/core/ext/transport/inproc/inproc_transport.cc -- src/core/ext/upb-generated/google/api/annotations.upb.c -- src/core/ext/upb-generated/google/api/http.upb.c -- src/core/ext/upb-generated/google/protobuf/any.upb.c -- src/core/ext/upb-generated/google/protobuf/descriptor.upb.c -- src/core/ext/upb-generated/google/protobuf/duration.upb.c -- src/core/ext/upb-generated/google/protobuf/empty.upb.c -- src/core/ext/upb-generated/google/protobuf/struct.upb.c -- src/core/ext/upb-generated/google/protobuf/timestamp.upb.c -- src/core/ext/upb-generated/google/protobuf/wrappers.upb.c -- src/core/ext/upb-generated/google/rpc/status.upb.c -- src/core/ext/upb-generated/src/proto/grpc/gcp/altscontext.upb.c -- src/core/ext/upb-generated/src/proto/grpc/gcp/handshaker.upb.c -- src/core/ext/upb-generated/src/proto/grpc/gcp/transport_security_common.upb.c -- src/core/ext/upb-generated/src/proto/grpc/health/v1/health.upb.c -- src/core/ext/upb-generated/src/proto/grpc/lb/v1/load_balancer.upb.c -- src/core/ext/upb-generated/src/proto/grpc/lookup/v1/rls.upb.c -- src/core/ext/upb-generated/validate/validate.upb.c -- src/core/ext/upb-generated/xds/data/orca/v3/orca_load_report.upb.c -- src/core/ext/upb-generated/xds/service/orca/v3/orca.upb.c -- src/core/lib/address_utils/parse_address.cc -- src/core/lib/address_utils/sockaddr_utils.cc -- src/core/lib/backoff/backoff.cc -- src/core/lib/channel/channel_args.cc -- src/core/lib/channel/channel_args_preconditioning.cc -- src/core/lib/channel/channel_stack.cc -- src/core/lib/channel/channel_stack_builder.cc -- src/core/lib/channel/channel_stack_builder_impl.cc -- src/core/lib/channel/channel_trace.cc -- src/core/lib/channel/channelz.cc -- src/core/lib/channel/channelz_registry.cc -- src/core/lib/channel/connected_channel.cc -- src/core/lib/channel/promise_based_filter.cc -- src/core/lib/channel/status_util.cc -- src/core/lib/compression/compression.cc -- src/core/lib/compression/compression_internal.cc -- src/core/lib/compression/message_compress.cc -- src/core/lib/config/core_configuration.cc -- src/core/lib/debug/event_log.cc -- src/core/lib/debug/histogram_view.cc -- src/core/lib/debug/stats.cc -- src/core/lib/debug/stats_data.cc -- src/core/lib/debug/trace.cc -- src/core/lib/event_engine/channel_args_endpoint_config.cc -- src/core/lib/event_engine/default_event_engine.cc -- src/core/lib/event_engine/default_event_engine_factory.cc -- src/core/lib/event_engine/forkable.cc -- src/core/lib/event_engine/memory_allocator.cc -- src/core/lib/event_engine/posix_engine/ev_epoll1_linux.cc -- src/core/lib/event_engine/posix_engine/ev_poll_posix.cc -- src/core/lib/event_engine/posix_engine/event_poller_posix_default.cc -- src/core/lib/event_engine/posix_engine/internal_errqueue.cc -- src/core/lib/event_engine/posix_engine/lockfree_event.cc -- src/core/lib/event_engine/posix_engine/posix_endpoint.cc -- src/core/lib/event_engine/posix_engine/posix_engine.cc -- src/core/lib/event_engine/posix_engine/posix_engine_listener.cc -- src/core/lib/event_engine/posix_engine/posix_engine_listener_utils.cc -- src/core/lib/event_engine/posix_engine/tcp_socket_utils.cc -- src/core/lib/event_engine/posix_engine/timer.cc -- src/core/lib/event_engine/posix_engine/timer_heap.cc -- src/core/lib/event_engine/posix_engine/timer_manager.cc -- src/core/lib/event_engine/posix_engine/traced_buffer_list.cc -- src/core/lib/event_engine/posix_engine/wakeup_fd_eventfd.cc -- src/core/lib/event_engine/posix_engine/wakeup_fd_pipe.cc -- src/core/lib/event_engine/posix_engine/wakeup_fd_posix_default.cc -- src/core/lib/event_engine/resolved_address.cc -- src/core/lib/event_engine/slice.cc -- src/core/lib/event_engine/slice_buffer.cc -- src/core/lib/event_engine/tcp_socket_utils.cc -- src/core/lib/event_engine/thread_pool.cc -- src/core/lib/event_engine/time_util.cc -- src/core/lib/event_engine/trace.cc -- src/core/lib/event_engine/utils.cc -- src/core/lib/event_engine/windows/iocp.cc -- src/core/lib/event_engine/windows/win_socket.cc -- src/core/lib/event_engine/windows/windows_engine.cc -- src/core/lib/experiments/config.cc -- src/core/lib/experiments/experiments.cc -- src/core/lib/gprpp/load_file.cc -- src/core/lib/gprpp/status_helper.cc -- src/core/lib/gprpp/time.cc -- src/core/lib/gprpp/time_averaged_stats.cc -- src/core/lib/gprpp/validation_errors.cc -- src/core/lib/gprpp/work_serializer.cc -- src/core/lib/handshaker/proxy_mapper_registry.cc -- src/core/lib/http/format_request.cc -- src/core/lib/http/httpcli.cc -- src/core/lib/http/parser.cc -- src/core/lib/iomgr/buffer_list.cc -- src/core/lib/iomgr/call_combiner.cc -- src/core/lib/iomgr/cfstream_handle.cc -- src/core/lib/iomgr/combiner.cc -- src/core/lib/iomgr/dualstack_socket_posix.cc -- src/core/lib/iomgr/endpoint.cc -- src/core/lib/iomgr/endpoint_cfstream.cc -- src/core/lib/iomgr/endpoint_pair_posix.cc -- src/core/lib/iomgr/endpoint_pair_windows.cc -- src/core/lib/iomgr/error.cc -- src/core/lib/iomgr/error_cfstream.cc -- src/core/lib/iomgr/ev_apple.cc -- src/core/lib/iomgr/ev_epoll1_linux.cc -- src/core/lib/iomgr/ev_poll_posix.cc -- src/core/lib/iomgr/ev_posix.cc -- src/core/lib/iomgr/ev_windows.cc -- src/core/lib/iomgr/exec_ctx.cc -- src/core/lib/iomgr/executor.cc -- src/core/lib/iomgr/fork_posix.cc -- src/core/lib/iomgr/fork_windows.cc -- src/core/lib/iomgr/gethostname_fallback.cc -- src/core/lib/iomgr/gethostname_host_name_max.cc -- src/core/lib/iomgr/gethostname_sysconf.cc -- src/core/lib/iomgr/grpc_if_nametoindex_posix.cc -- src/core/lib/iomgr/grpc_if_nametoindex_unsupported.cc -- src/core/lib/iomgr/internal_errqueue.cc -- src/core/lib/iomgr/iocp_windows.cc -- src/core/lib/iomgr/iomgr.cc -- src/core/lib/iomgr/iomgr_internal.cc -- src/core/lib/iomgr/iomgr_posix.cc -- src/core/lib/iomgr/iomgr_posix_cfstream.cc -- src/core/lib/iomgr/iomgr_windows.cc -- src/core/lib/iomgr/load_file.cc -- src/core/lib/iomgr/lockfree_event.cc -- src/core/lib/iomgr/polling_entity.cc -- src/core/lib/iomgr/pollset.cc -- src/core/lib/iomgr/pollset_set.cc -- src/core/lib/iomgr/pollset_set_windows.cc -- src/core/lib/iomgr/pollset_windows.cc -- src/core/lib/iomgr/resolve_address.cc -- src/core/lib/iomgr/resolve_address_posix.cc -- src/core/lib/iomgr/resolve_address_windows.cc -- src/core/lib/iomgr/sockaddr_utils_posix.cc -- src/core/lib/iomgr/socket_factory_posix.cc -- src/core/lib/iomgr/socket_mutator.cc -- src/core/lib/iomgr/socket_utils_common_posix.cc -- src/core/lib/iomgr/socket_utils_linux.cc -- src/core/lib/iomgr/socket_utils_posix.cc -- src/core/lib/iomgr/socket_utils_windows.cc -- src/core/lib/iomgr/socket_windows.cc -- src/core/lib/iomgr/systemd_utils.cc -- src/core/lib/iomgr/tcp_client.cc -- src/core/lib/iomgr/tcp_client_cfstream.cc -- src/core/lib/iomgr/tcp_client_posix.cc -- src/core/lib/iomgr/tcp_client_windows.cc -- src/core/lib/iomgr/tcp_posix.cc -- src/core/lib/iomgr/tcp_server.cc -- src/core/lib/iomgr/tcp_server_posix.cc -- src/core/lib/iomgr/tcp_server_utils_posix_common.cc -- src/core/lib/iomgr/tcp_server_utils_posix_ifaddrs.cc -- src/core/lib/iomgr/tcp_server_utils_posix_noifaddrs.cc -- src/core/lib/iomgr/tcp_server_windows.cc -- src/core/lib/iomgr/tcp_windows.cc -- src/core/lib/iomgr/timer.cc -- src/core/lib/iomgr/timer_generic.cc -- src/core/lib/iomgr/timer_heap.cc -- src/core/lib/iomgr/timer_manager.cc -- src/core/lib/iomgr/unix_sockets_posix.cc -- src/core/lib/iomgr/unix_sockets_posix_noop.cc -- src/core/lib/iomgr/wakeup_fd_eventfd.cc -- src/core/lib/iomgr/wakeup_fd_nospecial.cc -- src/core/lib/iomgr/wakeup_fd_pipe.cc -- src/core/lib/iomgr/wakeup_fd_posix.cc -- src/core/lib/json/json_object_loader.cc -- src/core/lib/json/json_reader.cc -- src/core/lib/json/json_writer.cc -- src/core/lib/load_balancing/lb_policy.cc -- src/core/lib/load_balancing/lb_policy_registry.cc -- src/core/lib/promise/activity.cc -- src/core/lib/promise/pipe.cc -- src/core/lib/promise/sleep.cc -- src/core/lib/resolver/resolver.cc -- src/core/lib/resolver/resolver_registry.cc -- src/core/lib/resolver/server_address.cc -- src/core/lib/resource_quota/api.cc -- src/core/lib/resource_quota/arena.cc -- src/core/lib/resource_quota/memory_quota.cc -- src/core/lib/resource_quota/periodic_update.cc -- src/core/lib/resource_quota/resource_quota.cc -- src/core/lib/resource_quota/thread_quota.cc -- src/core/lib/resource_quota/trace.cc -- src/core/lib/security/authorization/authorization_policy_provider_vtable.cc -- src/core/lib/security/authorization/evaluate_args.cc -- src/core/lib/security/authorization/grpc_server_authz_filter.cc -- src/core/lib/security/certificate_provider/certificate_provider_registry.cc -- src/core/lib/security/context/security_context.cc -- src/core/lib/security/credentials/alts/check_gcp_environment.cc -- src/core/lib/security/credentials/alts/check_gcp_environment_linux.cc -- src/core/lib/security/credentials/alts/check_gcp_environment_no_op.cc -- src/core/lib/security/credentials/alts/check_gcp_environment_windows.cc -- src/core/lib/security/credentials/alts/grpc_alts_credentials_client_options.cc -- src/core/lib/security/credentials/alts/grpc_alts_credentials_options.cc -- src/core/lib/security/credentials/alts/grpc_alts_credentials_server_options.cc -- src/core/lib/security/credentials/call_creds_util.cc -- src/core/lib/security/credentials/composite/composite_credentials.cc -- src/core/lib/security/credentials/credentials.cc -- src/core/lib/security/credentials/fake/fake_credentials.cc -- src/core/lib/security/credentials/insecure/insecure_credentials.cc -- src/core/lib/security/credentials/plugin/plugin_credentials.cc -- src/core/lib/security/credentials/tls/tls_utils.cc -- src/core/lib/security/security_connector/fake/fake_security_connector.cc -- src/core/lib/security/security_connector/insecure/insecure_security_connector.cc -- src/core/lib/security/security_connector/load_system_roots_fallback.cc -- src/core/lib/security/security_connector/load_system_roots_supported.cc -- src/core/lib/security/security_connector/security_connector.cc -- src/core/lib/security/transport/client_auth_filter.cc -- src/core/lib/security/transport/secure_endpoint.cc -- src/core/lib/security/transport/security_handshaker.cc -- src/core/lib/security/transport/server_auth_filter.cc -- src/core/lib/security/transport/tsi_error.cc -- src/core/lib/security/util/json_util.cc -- src/core/lib/service_config/service_config_impl.cc -- src/core/lib/service_config/service_config_parser.cc -- src/core/lib/slice/b64.cc -- src/core/lib/slice/percent_encoding.cc -- src/core/lib/slice/slice.cc -- src/core/lib/slice/slice_buffer.cc -- src/core/lib/slice/slice_string_helpers.cc -- src/core/lib/surface/api_trace.cc -- src/core/lib/surface/builtins.cc -- src/core/lib/surface/byte_buffer.cc -- src/core/lib/surface/byte_buffer_reader.cc -- src/core/lib/surface/call.cc -- src/core/lib/surface/call_details.cc -- src/core/lib/surface/call_log_batch.cc -- src/core/lib/surface/call_trace.cc -- src/core/lib/surface/channel.cc -- src/core/lib/surface/channel_init.cc -- src/core/lib/surface/channel_ping.cc -- src/core/lib/surface/channel_stack_type.cc -- src/core/lib/surface/completion_queue.cc -- src/core/lib/surface/completion_queue_factory.cc -- src/core/lib/surface/event_string.cc -- src/core/lib/surface/init.cc -- src/core/lib/surface/init_internally.cc -- src/core/lib/surface/lame_client.cc -- src/core/lib/surface/metadata_array.cc -- src/core/lib/surface/server.cc -- src/core/lib/surface/validate_metadata.cc -- src/core/lib/surface/version.cc -- src/core/lib/transport/bdp_estimator.cc -- src/core/lib/transport/connectivity_state.cc -- src/core/lib/transport/error_utils.cc -- src/core/lib/transport/handshaker.cc -- src/core/lib/transport/handshaker_registry.cc -- src/core/lib/transport/http_connect_handshaker.cc -- src/core/lib/transport/metadata_batch.cc -- src/core/lib/transport/parsed_metadata.cc -- src/core/lib/transport/pid_controller.cc -- src/core/lib/transport/status_conversion.cc -- src/core/lib/transport/tcp_connect_handshaker.cc -- src/core/lib/transport/timeout_encoding.cc -- src/core/lib/transport/transport.cc -- src/core/lib/transport/transport_op_string.cc -- src/core/lib/uri/uri_parser.cc -- src/core/plugin_registry/grpc_plugin_registry.cc -- src/core/plugin_registry/grpc_plugin_registry_noextra.cc -- src/core/tsi/alts/handshaker/transport_security_common_api.cc -- src/core/tsi/fake_transport_security.cc -- src/core/tsi/local_transport_security.cc -- src/core/tsi/transport_security.cc -- src/core/tsi/transport_security_grpc.cc --) -- --set_target_properties(grpc_unsecure PROPERTIES -- VERSION ${gRPC_CORE_VERSION} -- SOVERSION ${gRPC_CORE_SOVERSION} --) -- --if(WIN32 AND MSVC) -- set_target_properties(grpc_unsecure PROPERTIES COMPILE_PDB_NAME "grpc_unsecure" -- COMPILE_PDB_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}" -- ) -- if(gRPC_INSTALL) -- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/grpc_unsecure.pdb -- DESTINATION ${gRPC_INSTALL_LIBDIR} OPTIONAL -- ) -- endif() --endif() -- --target_include_directories(grpc_unsecure -- PUBLIC $ $ -- PRIVATE -- ${CMAKE_CURRENT_SOURCE_DIR} -- ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} -- ${_gRPC_RE2_INCLUDE_DIR} -- ${_gRPC_SSL_INCLUDE_DIR} -- ${_gRPC_UPB_GENERATED_DIR} -- ${_gRPC_UPB_GRPC_GENERATED_DIR} -- ${_gRPC_UPB_INCLUDE_DIR} -- ${_gRPC_XXHASH_INCLUDE_DIR} -- ${_gRPC_ZLIB_INCLUDE_DIR} --) --target_link_libraries(grpc_unsecure -- ${_gRPC_BASELIB_LIBRARIES} -- ${_gRPC_ZLIB_LIBRARIES} -- ${_gRPC_CARES_LIBRARIES} -- ${_gRPC_ADDRESS_SORTING_LIBRARIES} -- ${_gRPC_RE2_LIBRARIES} -- ${_gRPC_UPB_LIBRARIES} -- ${_gRPC_ALLTARGETS_LIBRARIES} -- absl::cleanup -- absl::flat_hash_map -- absl::flat_hash_set -- absl::inlined_vector -- absl::any_invocable -- absl::bind_front -- absl::function_ref -- absl::hash -- absl::type_traits -- absl::statusor -- absl::span -- absl::utility -- gpr -- address_sorting -- upb --) --if(_gRPC_PLATFORM_IOS OR _gRPC_PLATFORM_MAC) -- target_link_libraries(grpc_unsecure "-framework CoreFoundation") --endif() -- --foreach(_hdr -- include/grpc/byte_buffer.h -- include/grpc/byte_buffer_reader.h -- include/grpc/census.h -- include/grpc/compression.h -- include/grpc/event_engine/endpoint_config.h -- include/grpc/event_engine/event_engine.h -- include/grpc/event_engine/internal/memory_allocator_impl.h -- include/grpc/event_engine/internal/slice_cast.h -- include/grpc/event_engine/memory_allocator.h -- include/grpc/event_engine/memory_request.h -- include/grpc/event_engine/port.h -- include/grpc/event_engine/slice.h -- include/grpc/event_engine/slice_buffer.h -- include/grpc/fork.h -- include/grpc/grpc.h -- include/grpc/grpc_posix.h -- include/grpc/grpc_security.h -- include/grpc/grpc_security_constants.h -- include/grpc/impl/codegen/atm.h -- include/grpc/impl/codegen/atm_gcc_atomic.h -- include/grpc/impl/codegen/atm_gcc_sync.h -- include/grpc/impl/codegen/atm_windows.h -- include/grpc/impl/codegen/byte_buffer.h -- include/grpc/impl/codegen/byte_buffer_reader.h -- include/grpc/impl/codegen/compression_types.h -- include/grpc/impl/codegen/connectivity_state.h -- include/grpc/impl/codegen/fork.h -- include/grpc/impl/codegen/gpr_types.h -- include/grpc/impl/codegen/grpc_types.h -- include/grpc/impl/codegen/log.h -- include/grpc/impl/codegen/port_platform.h -- include/grpc/impl/codegen/propagation_bits.h -- include/grpc/impl/codegen/slice.h -- include/grpc/impl/codegen/status.h -- include/grpc/impl/codegen/sync.h -- include/grpc/impl/codegen/sync_abseil.h -- include/grpc/impl/codegen/sync_custom.h -- include/grpc/impl/codegen/sync_generic.h -- include/grpc/impl/codegen/sync_posix.h -- include/grpc/impl/codegen/sync_windows.h -- include/grpc/impl/compression_types.h -- include/grpc/impl/connectivity_state.h -- include/grpc/impl/grpc_types.h -- include/grpc/impl/propagation_bits.h -- include/grpc/impl/slice_type.h -- include/grpc/load_reporting.h -- include/grpc/slice.h -- include/grpc/slice_buffer.h -- include/grpc/status.h -- include/grpc/support/alloc.h -- include/grpc/support/atm_gcc_atomic.h -- include/grpc/support/atm_gcc_sync.h -- include/grpc/support/atm_windows.h -- include/grpc/support/cpu.h -- include/grpc/support/log.h -- include/grpc/support/log_windows.h -- include/grpc/support/port_platform.h -- include/grpc/support/string_util.h -- include/grpc/support/sync.h -- include/grpc/support/sync_abseil.h -- include/grpc/support/sync_custom.h -- include/grpc/support/sync_generic.h -- include/grpc/support/sync_posix.h -- include/grpc/support/sync_windows.h -- include/grpc/support/thd_id.h -- include/grpc/support/time.h -- include/grpc/support/workaround_list.h --) -- string(REPLACE "include/" "" _path ${_hdr}) -- get_filename_component(_path ${_path} PATH) -- install(FILES ${_hdr} -- DESTINATION "${gRPC_INSTALL_INCLUDEDIR}/${_path}" -- ) --endforeach() -- -- --if(gRPC_INSTALL) -- install(TARGETS grpc_unsecure EXPORT gRPCTargets -- RUNTIME DESTINATION ${gRPC_INSTALL_BINDIR} -- BUNDLE DESTINATION ${gRPC_INSTALL_BINDIR} -- LIBRARY DESTINATION ${gRPC_INSTALL_LIBDIR} -- ARCHIVE DESTINATION ${gRPC_INSTALL_LIBDIR} -- ) --endif() - - if(gRPC_BUILD_TESTS) - -@@ -3589,207 +3119,6 @@ - endif() - - --add_library(grpc++_alts -- src/cpp/common/alts_context.cc -- src/cpp/common/alts_util.cc --) -- --set_target_properties(grpc++_alts PROPERTIES -- VERSION ${gRPC_CPP_VERSION} -- SOVERSION ${gRPC_CPP_SOVERSION} --) -- --if(WIN32 AND MSVC) -- set_target_properties(grpc++_alts PROPERTIES COMPILE_PDB_NAME "grpc++_alts" -- COMPILE_PDB_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}" -- ) -- if(gRPC_INSTALL) -- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/grpc++_alts.pdb -- DESTINATION ${gRPC_INSTALL_LIBDIR} OPTIONAL -- ) -- endif() --endif() -- --target_include_directories(grpc++_alts -- PUBLIC $ $ -- PRIVATE -- ${CMAKE_CURRENT_SOURCE_DIR} -- ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} -- ${_gRPC_RE2_INCLUDE_DIR} -- ${_gRPC_SSL_INCLUDE_DIR} -- ${_gRPC_UPB_GENERATED_DIR} -- ${_gRPC_UPB_GRPC_GENERATED_DIR} -- ${_gRPC_UPB_INCLUDE_DIR} -- ${_gRPC_XXHASH_INCLUDE_DIR} -- ${_gRPC_ZLIB_INCLUDE_DIR} -- ${_gRPC_PROTO_GENS_DIR} --) --target_link_libraries(grpc++_alts -- ${_gRPC_BASELIB_LIBRARIES} -- ${_gRPC_PROTOBUF_LIBRARIES} -- ${_gRPC_ZLIB_LIBRARIES} -- ${_gRPC_ALLTARGETS_LIBRARIES} -- grpc++ --) -- --foreach(_hdr -- include/grpcpp/security/alts_context.h -- include/grpcpp/security/alts_util.h --) -- string(REPLACE "include/" "" _path ${_hdr}) -- get_filename_component(_path ${_path} PATH) -- install(FILES ${_hdr} -- DESTINATION "${gRPC_INSTALL_INCLUDEDIR}/${_path}" -- ) --endforeach() -- -- --if(gRPC_INSTALL) -- install(TARGETS grpc++_alts EXPORT gRPCTargets -- RUNTIME DESTINATION ${gRPC_INSTALL_BINDIR} -- BUNDLE DESTINATION ${gRPC_INSTALL_BINDIR} -- LIBRARY DESTINATION ${gRPC_INSTALL_LIBDIR} -- ARCHIVE DESTINATION ${gRPC_INSTALL_LIBDIR} -- ) --endif() -- -- --add_library(grpc++_error_details -- src/cpp/util/error_details.cc --) -- --set_target_properties(grpc++_error_details PROPERTIES -- VERSION ${gRPC_CPP_VERSION} -- SOVERSION ${gRPC_CPP_SOVERSION} --) -- --if(WIN32 AND MSVC) -- set_target_properties(grpc++_error_details PROPERTIES COMPILE_PDB_NAME "grpc++_error_details" -- COMPILE_PDB_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}" -- ) -- if(gRPC_INSTALL) -- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/grpc++_error_details.pdb -- DESTINATION ${gRPC_INSTALL_LIBDIR} OPTIONAL -- ) -- endif() --endif() -- --target_include_directories(grpc++_error_details -- PUBLIC $ $ -- PRIVATE -- ${CMAKE_CURRENT_SOURCE_DIR} -- ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} -- ${_gRPC_RE2_INCLUDE_DIR} -- ${_gRPC_SSL_INCLUDE_DIR} -- ${_gRPC_UPB_GENERATED_DIR} -- ${_gRPC_UPB_GRPC_GENERATED_DIR} -- ${_gRPC_UPB_INCLUDE_DIR} -- ${_gRPC_XXHASH_INCLUDE_DIR} -- ${_gRPC_ZLIB_INCLUDE_DIR} -- ${_gRPC_PROTO_GENS_DIR} --) --target_link_libraries(grpc++_error_details -- ${_gRPC_BASELIB_LIBRARIES} -- ${_gRPC_PROTOBUF_LIBRARIES} -- ${_gRPC_ZLIB_LIBRARIES} -- ${_gRPC_ALLTARGETS_LIBRARIES} -- grpc++ --) -- --foreach(_hdr -- include/grpc++/support/error_details.h -- include/grpcpp/support/error_details.h --) -- string(REPLACE "include/" "" _path ${_hdr}) -- get_filename_component(_path ${_path} PATH) -- install(FILES ${_hdr} -- DESTINATION "${gRPC_INSTALL_INCLUDEDIR}/${_path}" -- ) --endforeach() -- -- --if(gRPC_INSTALL) -- install(TARGETS grpc++_error_details EXPORT gRPCTargets -- RUNTIME DESTINATION ${gRPC_INSTALL_BINDIR} -- BUNDLE DESTINATION ${gRPC_INSTALL_BINDIR} -- LIBRARY DESTINATION ${gRPC_INSTALL_LIBDIR} -- ARCHIVE DESTINATION ${gRPC_INSTALL_LIBDIR} -- ) --endif() -- -- --if(gRPC_BUILD_CODEGEN) --add_library(grpc++_reflection -- ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/reflection/v1alpha/reflection.pb.cc -- ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/reflection/v1alpha/reflection.grpc.pb.cc -- ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/reflection/v1alpha/reflection.pb.h -- ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/reflection/v1alpha/reflection.grpc.pb.h -- src/cpp/ext/proto_server_reflection.cc -- src/cpp/ext/proto_server_reflection_plugin.cc --) -- --set_target_properties(grpc++_reflection PROPERTIES -- VERSION ${gRPC_CPP_VERSION} -- SOVERSION ${gRPC_CPP_SOVERSION} --) -- --if(WIN32 AND MSVC) -- set_target_properties(grpc++_reflection PROPERTIES COMPILE_PDB_NAME "grpc++_reflection" -- COMPILE_PDB_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}" -- ) -- if(gRPC_INSTALL) -- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/grpc++_reflection.pdb -- DESTINATION ${gRPC_INSTALL_LIBDIR} OPTIONAL -- ) -- endif() --endif() -- --target_include_directories(grpc++_reflection -- PUBLIC $ $ -- PRIVATE -- ${CMAKE_CURRENT_SOURCE_DIR} -- ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} -- ${_gRPC_RE2_INCLUDE_DIR} -- ${_gRPC_SSL_INCLUDE_DIR} -- ${_gRPC_UPB_GENERATED_DIR} -- ${_gRPC_UPB_GRPC_GENERATED_DIR} -- ${_gRPC_UPB_INCLUDE_DIR} -- ${_gRPC_XXHASH_INCLUDE_DIR} -- ${_gRPC_ZLIB_INCLUDE_DIR} -- ${_gRPC_PROTO_GENS_DIR} --) --target_link_libraries(grpc++_reflection -- ${_gRPC_BASELIB_LIBRARIES} -- ${_gRPC_PROTOBUF_LIBRARIES} -- ${_gRPC_ZLIB_LIBRARIES} -- ${_gRPC_ALLTARGETS_LIBRARIES} -- grpc++ --) -- --foreach(_hdr -- include/grpc++/ext/proto_server_reflection_plugin.h -- include/grpcpp/ext/proto_server_reflection_plugin.h --) -- string(REPLACE "include/" "" _path ${_hdr}) -- get_filename_component(_path ${_path} PATH) -- install(FILES ${_hdr} -- DESTINATION "${gRPC_INSTALL_INCLUDEDIR}/${_path}" -- ) --endforeach() --endif() -- --if(gRPC_BUILD_CODEGEN) -- --if(gRPC_INSTALL) -- install(TARGETS grpc++_reflection EXPORT gRPCTargets -- RUNTIME DESTINATION ${gRPC_INSTALL_BINDIR} -- BUNDLE DESTINATION ${gRPC_INSTALL_BINDIR} -- LIBRARY DESTINATION ${gRPC_INSTALL_LIBDIR} -- ARCHIVE DESTINATION ${gRPC_INSTALL_LIBDIR} -- ) --endif() -- --endif() - if(gRPC_BUILD_TESTS) - - add_library(grpc++_test -@@ -3979,671 +3308,6 @@ - - endif() - --add_library(grpc++_unsecure -- src/cpp/client/channel_cc.cc -- src/cpp/client/client_callback.cc -- src/cpp/client/client_context.cc -- src/cpp/client/client_interceptor.cc -- src/cpp/client/create_channel.cc -- src/cpp/client/create_channel_internal.cc -- src/cpp/client/create_channel_posix.cc -- src/cpp/client/insecure_credentials.cc -- src/cpp/common/alarm.cc -- src/cpp/common/channel_arguments.cc -- src/cpp/common/channel_filter.cc -- src/cpp/common/completion_queue_cc.cc -- src/cpp/common/insecure_create_auth_context.cc -- src/cpp/common/resource_quota_cc.cc -- src/cpp/common/rpc_method.cc -- src/cpp/common/validate_service_config.cc -- src/cpp/common/version_cc.cc -- src/cpp/server/async_generic_service.cc -- src/cpp/server/channel_argument_option.cc -- src/cpp/server/create_default_thread_pool.cc -- src/cpp/server/external_connection_acceptor_impl.cc -- src/cpp/server/health/default_health_check_service.cc -- src/cpp/server/health/health_check_service.cc -- src/cpp/server/health/health_check_service_server_builder_option.cc -- src/cpp/server/insecure_server_credentials.cc -- src/cpp/server/orca/call_metric_recorder.cc -- src/cpp/server/server_builder.cc -- src/cpp/server/server_callback.cc -- src/cpp/server/server_cc.cc -- src/cpp/server/server_context.cc -- src/cpp/server/server_posix.cc -- src/cpp/thread_manager/thread_manager.cc -- src/cpp/util/byte_buffer_cc.cc -- src/cpp/util/status.cc -- src/cpp/util/string_ref.cc -- src/cpp/util/time_cc.cc --) -- --set_target_properties(grpc++_unsecure PROPERTIES -- VERSION ${gRPC_CPP_VERSION} -- SOVERSION ${gRPC_CPP_SOVERSION} --) -- --if(WIN32 AND MSVC) -- set_target_properties(grpc++_unsecure PROPERTIES COMPILE_PDB_NAME "grpc++_unsecure" -- COMPILE_PDB_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}" -- ) -- if(gRPC_INSTALL) -- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/grpc++_unsecure.pdb -- DESTINATION ${gRPC_INSTALL_LIBDIR} OPTIONAL -- ) -- endif() --endif() -- --target_include_directories(grpc++_unsecure -- PUBLIC $ $ -- PRIVATE -- ${CMAKE_CURRENT_SOURCE_DIR} -- ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} -- ${_gRPC_RE2_INCLUDE_DIR} -- ${_gRPC_SSL_INCLUDE_DIR} -- ${_gRPC_UPB_GENERATED_DIR} -- ${_gRPC_UPB_GRPC_GENERATED_DIR} -- ${_gRPC_UPB_INCLUDE_DIR} -- ${_gRPC_XXHASH_INCLUDE_DIR} -- ${_gRPC_ZLIB_INCLUDE_DIR} -- ${_gRPC_PROTO_GENS_DIR} --) --target_link_libraries(grpc++_unsecure -- ${_gRPC_BASELIB_LIBRARIES} -- ${_gRPC_PROTOBUF_LIBRARIES} -- ${_gRPC_ZLIB_LIBRARIES} -- ${_gRPC_ALLTARGETS_LIBRARIES} -- grpc_unsecure --) -- --foreach(_hdr -- include/grpc++/alarm.h -- include/grpc++/channel.h -- include/grpc++/client_context.h -- include/grpc++/completion_queue.h -- include/grpc++/create_channel.h -- include/grpc++/create_channel_posix.h -- include/grpc++/ext/health_check_service_server_builder_option.h -- include/grpc++/generic/async_generic_service.h -- include/grpc++/generic/generic_stub.h -- include/grpc++/grpc++.h -- include/grpc++/health_check_service_interface.h -- include/grpc++/impl/call.h -- include/grpc++/impl/channel_argument_option.h -- include/grpc++/impl/client_unary_call.h -- include/grpc++/impl/codegen/async_stream.h -- include/grpc++/impl/codegen/async_unary_call.h -- include/grpc++/impl/codegen/byte_buffer.h -- include/grpc++/impl/codegen/call.h -- include/grpc++/impl/codegen/call_hook.h -- include/grpc++/impl/codegen/channel_interface.h -- include/grpc++/impl/codegen/client_context.h -- include/grpc++/impl/codegen/client_unary_call.h -- include/grpc++/impl/codegen/completion_queue.h -- include/grpc++/impl/codegen/completion_queue_tag.h -- include/grpc++/impl/codegen/config.h -- include/grpc++/impl/codegen/config_protobuf.h -- include/grpc++/impl/codegen/create_auth_context.h -- include/grpc++/impl/codegen/metadata_map.h -- include/grpc++/impl/codegen/method_handler_impl.h -- include/grpc++/impl/codegen/proto_utils.h -- include/grpc++/impl/codegen/rpc_method.h -- include/grpc++/impl/codegen/rpc_service_method.h -- include/grpc++/impl/codegen/security/auth_context.h -- include/grpc++/impl/codegen/serialization_traits.h -- include/grpc++/impl/codegen/server_context.h -- include/grpc++/impl/codegen/server_interface.h -- include/grpc++/impl/codegen/service_type.h -- include/grpc++/impl/codegen/slice.h -- include/grpc++/impl/codegen/status.h -- include/grpc++/impl/codegen/status_code_enum.h -- include/grpc++/impl/codegen/string_ref.h -- include/grpc++/impl/codegen/stub_options.h -- include/grpc++/impl/codegen/sync_stream.h -- include/grpc++/impl/codegen/time.h -- include/grpc++/impl/grpc_library.h -- include/grpc++/impl/method_handler_impl.h -- include/grpc++/impl/rpc_method.h -- include/grpc++/impl/rpc_service_method.h -- include/grpc++/impl/serialization_traits.h -- include/grpc++/impl/server_builder_option.h -- include/grpc++/impl/server_builder_plugin.h -- include/grpc++/impl/server_initializer.h -- include/grpc++/impl/service_type.h -- include/grpc++/resource_quota.h -- include/grpc++/security/auth_context.h -- include/grpc++/security/auth_metadata_processor.h -- include/grpc++/security/credentials.h -- include/grpc++/security/server_credentials.h -- include/grpc++/server.h -- include/grpc++/server_builder.h -- include/grpc++/server_context.h -- include/grpc++/server_posix.h -- include/grpc++/support/async_stream.h -- include/grpc++/support/async_unary_call.h -- include/grpc++/support/byte_buffer.h -- include/grpc++/support/channel_arguments.h -- include/grpc++/support/config.h -- include/grpc++/support/slice.h -- include/grpc++/support/status.h -- include/grpc++/support/status_code_enum.h -- include/grpc++/support/string_ref.h -- include/grpc++/support/stub_options.h -- include/grpc++/support/sync_stream.h -- include/grpc++/support/time.h -- include/grpcpp/alarm.h -- include/grpcpp/channel.h -- include/grpcpp/client_context.h -- include/grpcpp/completion_queue.h -- include/grpcpp/create_channel.h -- include/grpcpp/create_channel_posix.h -- include/grpcpp/ext/call_metric_recorder.h -- include/grpcpp/ext/health_check_service_server_builder_option.h -- include/grpcpp/generic/async_generic_service.h -- include/grpcpp/generic/generic_stub.h -- include/grpcpp/grpcpp.h -- include/grpcpp/health_check_service_interface.h -- include/grpcpp/impl/call.h -- include/grpcpp/impl/call_hook.h -- include/grpcpp/impl/call_op_set.h -- include/grpcpp/impl/call_op_set_interface.h -- include/grpcpp/impl/channel_argument_option.h -- include/grpcpp/impl/channel_interface.h -- include/grpcpp/impl/client_unary_call.h -- include/grpcpp/impl/codegen/async_generic_service.h -- include/grpcpp/impl/codegen/async_stream.h -- include/grpcpp/impl/codegen/async_unary_call.h -- include/grpcpp/impl/codegen/byte_buffer.h -- include/grpcpp/impl/codegen/call.h -- include/grpcpp/impl/codegen/call_hook.h -- include/grpcpp/impl/codegen/call_op_set.h -- include/grpcpp/impl/codegen/call_op_set_interface.h -- include/grpcpp/impl/codegen/callback_common.h -- include/grpcpp/impl/codegen/channel_interface.h -- include/grpcpp/impl/codegen/client_callback.h -- include/grpcpp/impl/codegen/client_context.h -- include/grpcpp/impl/codegen/client_interceptor.h -- include/grpcpp/impl/codegen/client_unary_call.h -- include/grpcpp/impl/codegen/completion_queue.h -- include/grpcpp/impl/codegen/completion_queue_tag.h -- include/grpcpp/impl/codegen/config.h -- include/grpcpp/impl/codegen/config_protobuf.h -- include/grpcpp/impl/codegen/create_auth_context.h -- include/grpcpp/impl/codegen/delegating_channel.h -- include/grpcpp/impl/codegen/intercepted_channel.h -- include/grpcpp/impl/codegen/interceptor.h -- include/grpcpp/impl/codegen/interceptor_common.h -- include/grpcpp/impl/codegen/message_allocator.h -- include/grpcpp/impl/codegen/metadata_map.h -- include/grpcpp/impl/codegen/method_handler.h -- include/grpcpp/impl/codegen/method_handler_impl.h -- include/grpcpp/impl/codegen/proto_buffer_reader.h -- include/grpcpp/impl/codegen/proto_buffer_writer.h -- include/grpcpp/impl/codegen/proto_utils.h -- include/grpcpp/impl/codegen/rpc_method.h -- include/grpcpp/impl/codegen/rpc_service_method.h -- include/grpcpp/impl/codegen/security/auth_context.h -- include/grpcpp/impl/codegen/serialization_traits.h -- include/grpcpp/impl/codegen/server_callback.h -- include/grpcpp/impl/codegen/server_callback_handlers.h -- include/grpcpp/impl/codegen/server_context.h -- include/grpcpp/impl/codegen/server_interceptor.h -- include/grpcpp/impl/codegen/server_interface.h -- include/grpcpp/impl/codegen/service_type.h -- include/grpcpp/impl/codegen/slice.h -- include/grpcpp/impl/codegen/status.h -- include/grpcpp/impl/codegen/status_code_enum.h -- include/grpcpp/impl/codegen/string_ref.h -- include/grpcpp/impl/codegen/stub_options.h -- include/grpcpp/impl/codegen/sync.h -- include/grpcpp/impl/codegen/sync_stream.h -- include/grpcpp/impl/codegen/time.h -- include/grpcpp/impl/completion_queue_tag.h -- include/grpcpp/impl/create_auth_context.h -- include/grpcpp/impl/delegating_channel.h -- include/grpcpp/impl/grpc_library.h -- include/grpcpp/impl/intercepted_channel.h -- include/grpcpp/impl/interceptor_common.h -- include/grpcpp/impl/metadata_map.h -- include/grpcpp/impl/method_handler_impl.h -- include/grpcpp/impl/proto_utils.h -- include/grpcpp/impl/rpc_method.h -- include/grpcpp/impl/rpc_service_method.h -- include/grpcpp/impl/serialization_traits.h -- include/grpcpp/impl/server_builder_option.h -- include/grpcpp/impl/server_builder_plugin.h -- include/grpcpp/impl/server_callback_handlers.h -- include/grpcpp/impl/server_initializer.h -- include/grpcpp/impl/service_type.h -- include/grpcpp/impl/status.h -- include/grpcpp/impl/sync.h -- include/grpcpp/resource_quota.h -- include/grpcpp/security/auth_context.h -- include/grpcpp/security/auth_metadata_processor.h -- include/grpcpp/security/authorization_policy_provider.h -- include/grpcpp/security/credentials.h -- include/grpcpp/security/server_credentials.h -- include/grpcpp/security/tls_certificate_provider.h -- include/grpcpp/security/tls_certificate_verifier.h -- include/grpcpp/security/tls_credentials_options.h -- include/grpcpp/server.h -- include/grpcpp/server_builder.h -- include/grpcpp/server_context.h -- include/grpcpp/server_interface.h -- include/grpcpp/server_posix.h -- include/grpcpp/support/async_stream.h -- include/grpcpp/support/async_unary_call.h -- include/grpcpp/support/byte_buffer.h -- include/grpcpp/support/callback_common.h -- include/grpcpp/support/channel_arguments.h -- include/grpcpp/support/client_callback.h -- include/grpcpp/support/client_interceptor.h -- include/grpcpp/support/config.h -- include/grpcpp/support/interceptor.h -- include/grpcpp/support/message_allocator.h -- include/grpcpp/support/method_handler.h -- include/grpcpp/support/proto_buffer_reader.h -- include/grpcpp/support/proto_buffer_writer.h -- include/grpcpp/support/server_callback.h -- include/grpcpp/support/server_interceptor.h -- include/grpcpp/support/slice.h -- include/grpcpp/support/status.h -- include/grpcpp/support/status_code_enum.h -- include/grpcpp/support/string_ref.h -- include/grpcpp/support/stub_options.h -- include/grpcpp/support/sync_stream.h -- include/grpcpp/support/time.h -- include/grpcpp/support/validate_service_config.h -- include/grpcpp/version_info.h --) -- string(REPLACE "include/" "" _path ${_hdr}) -- get_filename_component(_path ${_path} PATH) -- install(FILES ${_hdr} -- DESTINATION "${gRPC_INSTALL_INCLUDEDIR}/${_path}" -- ) --endforeach() -- -- --if(gRPC_INSTALL) -- install(TARGETS grpc++_unsecure EXPORT gRPCTargets -- RUNTIME DESTINATION ${gRPC_INSTALL_BINDIR} -- BUNDLE DESTINATION ${gRPC_INSTALL_BINDIR} -- LIBRARY DESTINATION ${gRPC_INSTALL_LIBDIR} -- ARCHIVE DESTINATION ${gRPC_INSTALL_LIBDIR} -- ) --endif() -- -- --add_library(grpc_authorization_provider -- src/core/ext/upb-generated/google/protobuf/any.upb.c -- src/core/ext/upb-generated/google/rpc/status.upb.c -- src/core/ext/upb-generated/src/proto/grpc/gcp/altscontext.upb.c -- src/core/ext/upb-generated/src/proto/grpc/gcp/handshaker.upb.c -- src/core/ext/upb-generated/src/proto/grpc/gcp/transport_security_common.upb.c -- src/core/lib/address_utils/parse_address.cc -- src/core/lib/address_utils/sockaddr_utils.cc -- src/core/lib/channel/channel_args.cc -- src/core/lib/channel/channel_args_preconditioning.cc -- src/core/lib/channel/channel_stack.cc -- src/core/lib/channel/channel_stack_builder.cc -- src/core/lib/channel/channel_stack_builder_impl.cc -- src/core/lib/channel/channel_trace.cc -- src/core/lib/channel/channelz.cc -- src/core/lib/channel/channelz_registry.cc -- src/core/lib/channel/connected_channel.cc -- src/core/lib/channel/promise_based_filter.cc -- src/core/lib/channel/status_util.cc -- src/core/lib/compression/compression.cc -- src/core/lib/compression/compression_internal.cc -- src/core/lib/compression/message_compress.cc -- src/core/lib/config/core_configuration.cc -- src/core/lib/debug/event_log.cc -- src/core/lib/debug/histogram_view.cc -- src/core/lib/debug/stats.cc -- src/core/lib/debug/stats_data.cc -- src/core/lib/debug/trace.cc -- src/core/lib/event_engine/channel_args_endpoint_config.cc -- src/core/lib/event_engine/default_event_engine.cc -- src/core/lib/event_engine/default_event_engine_factory.cc -- src/core/lib/event_engine/forkable.cc -- src/core/lib/event_engine/memory_allocator.cc -- src/core/lib/event_engine/posix_engine/ev_epoll1_linux.cc -- src/core/lib/event_engine/posix_engine/ev_poll_posix.cc -- src/core/lib/event_engine/posix_engine/event_poller_posix_default.cc -- src/core/lib/event_engine/posix_engine/internal_errqueue.cc -- src/core/lib/event_engine/posix_engine/lockfree_event.cc -- src/core/lib/event_engine/posix_engine/posix_endpoint.cc -- src/core/lib/event_engine/posix_engine/posix_engine.cc -- src/core/lib/event_engine/posix_engine/posix_engine_listener.cc -- src/core/lib/event_engine/posix_engine/posix_engine_listener_utils.cc -- src/core/lib/event_engine/posix_engine/tcp_socket_utils.cc -- src/core/lib/event_engine/posix_engine/timer.cc -- src/core/lib/event_engine/posix_engine/timer_heap.cc -- src/core/lib/event_engine/posix_engine/timer_manager.cc -- src/core/lib/event_engine/posix_engine/traced_buffer_list.cc -- src/core/lib/event_engine/posix_engine/wakeup_fd_eventfd.cc -- src/core/lib/event_engine/posix_engine/wakeup_fd_pipe.cc -- src/core/lib/event_engine/posix_engine/wakeup_fd_posix_default.cc -- src/core/lib/event_engine/resolved_address.cc -- src/core/lib/event_engine/slice.cc -- src/core/lib/event_engine/slice_buffer.cc -- src/core/lib/event_engine/tcp_socket_utils.cc -- src/core/lib/event_engine/thread_pool.cc -- src/core/lib/event_engine/time_util.cc -- src/core/lib/event_engine/trace.cc -- src/core/lib/event_engine/utils.cc -- src/core/lib/event_engine/windows/iocp.cc -- src/core/lib/event_engine/windows/win_socket.cc -- src/core/lib/event_engine/windows/windows_engine.cc -- src/core/lib/experiments/config.cc -- src/core/lib/experiments/experiments.cc -- src/core/lib/gprpp/load_file.cc -- src/core/lib/gprpp/status_helper.cc -- src/core/lib/gprpp/time.cc -- src/core/lib/gprpp/time_averaged_stats.cc -- src/core/lib/gprpp/validation_errors.cc -- src/core/lib/gprpp/work_serializer.cc -- src/core/lib/handshaker/proxy_mapper_registry.cc -- src/core/lib/iomgr/buffer_list.cc -- src/core/lib/iomgr/call_combiner.cc -- src/core/lib/iomgr/cfstream_handle.cc -- src/core/lib/iomgr/combiner.cc -- src/core/lib/iomgr/dualstack_socket_posix.cc -- src/core/lib/iomgr/endpoint.cc -- src/core/lib/iomgr/endpoint_cfstream.cc -- src/core/lib/iomgr/endpoint_pair_posix.cc -- src/core/lib/iomgr/endpoint_pair_windows.cc -- src/core/lib/iomgr/error.cc -- src/core/lib/iomgr/error_cfstream.cc -- src/core/lib/iomgr/ev_apple.cc -- src/core/lib/iomgr/ev_epoll1_linux.cc -- src/core/lib/iomgr/ev_poll_posix.cc -- src/core/lib/iomgr/ev_posix.cc -- src/core/lib/iomgr/ev_windows.cc -- src/core/lib/iomgr/exec_ctx.cc -- src/core/lib/iomgr/executor.cc -- src/core/lib/iomgr/fork_posix.cc -- src/core/lib/iomgr/fork_windows.cc -- src/core/lib/iomgr/gethostname_fallback.cc -- src/core/lib/iomgr/gethostname_host_name_max.cc -- src/core/lib/iomgr/gethostname_sysconf.cc -- src/core/lib/iomgr/grpc_if_nametoindex_posix.cc -- src/core/lib/iomgr/grpc_if_nametoindex_unsupported.cc -- src/core/lib/iomgr/internal_errqueue.cc -- src/core/lib/iomgr/iocp_windows.cc -- src/core/lib/iomgr/iomgr.cc -- src/core/lib/iomgr/iomgr_internal.cc -- src/core/lib/iomgr/iomgr_posix.cc -- src/core/lib/iomgr/iomgr_posix_cfstream.cc -- src/core/lib/iomgr/iomgr_windows.cc -- src/core/lib/iomgr/load_file.cc -- src/core/lib/iomgr/lockfree_event.cc -- src/core/lib/iomgr/polling_entity.cc -- src/core/lib/iomgr/pollset.cc -- src/core/lib/iomgr/pollset_set.cc -- src/core/lib/iomgr/pollset_set_windows.cc -- src/core/lib/iomgr/pollset_windows.cc -- src/core/lib/iomgr/resolve_address.cc -- src/core/lib/iomgr/resolve_address_posix.cc -- src/core/lib/iomgr/resolve_address_windows.cc -- src/core/lib/iomgr/sockaddr_utils_posix.cc -- src/core/lib/iomgr/socket_factory_posix.cc -- src/core/lib/iomgr/socket_mutator.cc -- src/core/lib/iomgr/socket_utils_common_posix.cc -- src/core/lib/iomgr/socket_utils_linux.cc -- src/core/lib/iomgr/socket_utils_posix.cc -- src/core/lib/iomgr/socket_utils_windows.cc -- src/core/lib/iomgr/socket_windows.cc -- src/core/lib/iomgr/systemd_utils.cc -- src/core/lib/iomgr/tcp_client.cc -- src/core/lib/iomgr/tcp_client_cfstream.cc -- src/core/lib/iomgr/tcp_client_posix.cc -- src/core/lib/iomgr/tcp_client_windows.cc -- src/core/lib/iomgr/tcp_posix.cc -- src/core/lib/iomgr/tcp_server.cc -- src/core/lib/iomgr/tcp_server_posix.cc -- src/core/lib/iomgr/tcp_server_utils_posix_common.cc -- src/core/lib/iomgr/tcp_server_utils_posix_ifaddrs.cc -- src/core/lib/iomgr/tcp_server_utils_posix_noifaddrs.cc -- src/core/lib/iomgr/tcp_server_windows.cc -- src/core/lib/iomgr/tcp_windows.cc -- src/core/lib/iomgr/timer.cc -- src/core/lib/iomgr/timer_generic.cc -- src/core/lib/iomgr/timer_heap.cc -- src/core/lib/iomgr/timer_manager.cc -- src/core/lib/iomgr/unix_sockets_posix.cc -- src/core/lib/iomgr/unix_sockets_posix_noop.cc -- src/core/lib/iomgr/wakeup_fd_eventfd.cc -- src/core/lib/iomgr/wakeup_fd_nospecial.cc -- src/core/lib/iomgr/wakeup_fd_pipe.cc -- src/core/lib/iomgr/wakeup_fd_posix.cc -- src/core/lib/json/json_reader.cc -- src/core/lib/json/json_writer.cc -- src/core/lib/load_balancing/lb_policy.cc -- src/core/lib/load_balancing/lb_policy_registry.cc -- src/core/lib/matchers/matchers.cc -- src/core/lib/promise/activity.cc -- src/core/lib/promise/pipe.cc -- src/core/lib/resolver/resolver.cc -- src/core/lib/resolver/resolver_registry.cc -- src/core/lib/resolver/server_address.cc -- src/core/lib/resource_quota/api.cc -- src/core/lib/resource_quota/arena.cc -- src/core/lib/resource_quota/memory_quota.cc -- src/core/lib/resource_quota/periodic_update.cc -- src/core/lib/resource_quota/resource_quota.cc -- src/core/lib/resource_quota/thread_quota.cc -- src/core/lib/resource_quota/trace.cc -- src/core/lib/security/authorization/authorization_policy_provider_vtable.cc -- src/core/lib/security/authorization/evaluate_args.cc -- src/core/lib/security/authorization/grpc_authorization_engine.cc -- src/core/lib/security/authorization/grpc_authorization_policy_provider.cc -- src/core/lib/security/authorization/grpc_server_authz_filter.cc -- src/core/lib/security/authorization/matchers.cc -- src/core/lib/security/authorization/rbac_policy.cc -- src/core/lib/security/authorization/rbac_translator.cc -- src/core/lib/security/certificate_provider/certificate_provider_registry.cc -- src/core/lib/security/context/security_context.cc -- src/core/lib/security/credentials/alts/check_gcp_environment.cc -- src/core/lib/security/credentials/alts/check_gcp_environment_linux.cc -- src/core/lib/security/credentials/alts/check_gcp_environment_no_op.cc -- src/core/lib/security/credentials/alts/check_gcp_environment_windows.cc -- src/core/lib/security/credentials/alts/grpc_alts_credentials_client_options.cc -- src/core/lib/security/credentials/alts/grpc_alts_credentials_options.cc -- src/core/lib/security/credentials/alts/grpc_alts_credentials_server_options.cc -- src/core/lib/security/credentials/call_creds_util.cc -- src/core/lib/security/credentials/composite/composite_credentials.cc -- src/core/lib/security/credentials/credentials.cc -- src/core/lib/security/credentials/plugin/plugin_credentials.cc -- src/core/lib/security/credentials/tls/tls_utils.cc -- src/core/lib/security/security_connector/load_system_roots_fallback.cc -- src/core/lib/security/security_connector/load_system_roots_supported.cc -- src/core/lib/security/security_connector/security_connector.cc -- src/core/lib/security/transport/client_auth_filter.cc -- src/core/lib/security/transport/secure_endpoint.cc -- src/core/lib/security/transport/security_handshaker.cc -- src/core/lib/security/transport/server_auth_filter.cc -- src/core/lib/security/transport/tsi_error.cc -- src/core/lib/security/util/json_util.cc -- src/core/lib/service_config/service_config_parser.cc -- src/core/lib/slice/b64.cc -- src/core/lib/slice/percent_encoding.cc -- src/core/lib/slice/slice.cc -- src/core/lib/slice/slice_buffer.cc -- src/core/lib/slice/slice_string_helpers.cc -- src/core/lib/surface/api_trace.cc -- src/core/lib/surface/builtins.cc -- src/core/lib/surface/byte_buffer.cc -- src/core/lib/surface/byte_buffer_reader.cc -- src/core/lib/surface/call.cc -- src/core/lib/surface/call_details.cc -- src/core/lib/surface/call_log_batch.cc -- src/core/lib/surface/call_trace.cc -- src/core/lib/surface/channel.cc -- src/core/lib/surface/channel_init.cc -- src/core/lib/surface/channel_ping.cc -- src/core/lib/surface/channel_stack_type.cc -- src/core/lib/surface/completion_queue.cc -- src/core/lib/surface/completion_queue_factory.cc -- src/core/lib/surface/event_string.cc -- src/core/lib/surface/init_internally.cc -- src/core/lib/surface/lame_client.cc -- src/core/lib/surface/metadata_array.cc -- src/core/lib/surface/server.cc -- src/core/lib/surface/validate_metadata.cc -- src/core/lib/surface/version.cc -- src/core/lib/transport/connectivity_state.cc -- src/core/lib/transport/error_utils.cc -- src/core/lib/transport/handshaker.cc -- src/core/lib/transport/handshaker_registry.cc -- src/core/lib/transport/metadata_batch.cc -- src/core/lib/transport/parsed_metadata.cc -- src/core/lib/transport/status_conversion.cc -- src/core/lib/transport/timeout_encoding.cc -- src/core/lib/transport/transport.cc -- src/core/lib/transport/transport_op_string.cc -- src/core/lib/uri/uri_parser.cc -- src/core/tsi/alts/handshaker/transport_security_common_api.cc -- src/core/tsi/transport_security.cc -- src/core/tsi/transport_security_grpc.cc --) -- --set_target_properties(grpc_authorization_provider PROPERTIES -- VERSION ${gRPC_CPP_VERSION} -- SOVERSION ${gRPC_CPP_SOVERSION} --) -- --if(WIN32 AND MSVC) -- set_target_properties(grpc_authorization_provider PROPERTIES COMPILE_PDB_NAME "grpc_authorization_provider" -- COMPILE_PDB_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}" -- ) -- if(gRPC_INSTALL) -- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/grpc_authorization_provider.pdb -- DESTINATION ${gRPC_INSTALL_LIBDIR} OPTIONAL -- ) -- endif() --endif() -- --target_include_directories(grpc_authorization_provider -- PUBLIC $ $ -- PRIVATE -- ${CMAKE_CURRENT_SOURCE_DIR} -- ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} -- ${_gRPC_RE2_INCLUDE_DIR} -- ${_gRPC_SSL_INCLUDE_DIR} -- ${_gRPC_UPB_GENERATED_DIR} -- ${_gRPC_UPB_GRPC_GENERATED_DIR} -- ${_gRPC_UPB_INCLUDE_DIR} -- ${_gRPC_XXHASH_INCLUDE_DIR} -- ${_gRPC_ZLIB_INCLUDE_DIR} -- ${_gRPC_PROTO_GENS_DIR} --) --target_link_libraries(grpc_authorization_provider -- ${_gRPC_BASELIB_LIBRARIES} -- ${_gRPC_PROTOBUF_LIBRARIES} -- ${_gRPC_ZLIB_LIBRARIES} -- ${_gRPC_RE2_LIBRARIES} -- ${_gRPC_ALLTARGETS_LIBRARIES} -- absl::cleanup -- absl::flat_hash_map -- absl::flat_hash_set -- absl::inlined_vector -- absl::any_invocable -- absl::function_ref -- absl::hash -- absl::type_traits -- absl::statusor -- absl::span -- absl::utility -- gpr -- upb --) -- --foreach(_hdr -- include/grpc/byte_buffer.h -- include/grpc/byte_buffer_reader.h -- include/grpc/compression.h -- include/grpc/event_engine/endpoint_config.h -- include/grpc/event_engine/event_engine.h -- include/grpc/event_engine/internal/memory_allocator_impl.h -- include/grpc/event_engine/internal/slice_cast.h -- include/grpc/event_engine/memory_allocator.h -- include/grpc/event_engine/memory_request.h -- include/grpc/event_engine/port.h -- include/grpc/event_engine/slice.h -- include/grpc/event_engine/slice_buffer.h -- include/grpc/fork.h -- include/grpc/grpc.h -- include/grpc/grpc_posix.h -- include/grpc/grpc_security.h -- include/grpc/grpc_security_constants.h -- include/grpc/impl/codegen/atm.h -- include/grpc/impl/codegen/atm_gcc_atomic.h -- include/grpc/impl/codegen/atm_gcc_sync.h -- include/grpc/impl/codegen/atm_windows.h -- include/grpc/impl/codegen/byte_buffer.h -- include/grpc/impl/codegen/byte_buffer_reader.h -- include/grpc/impl/codegen/compression_types.h -- include/grpc/impl/codegen/connectivity_state.h -- include/grpc/impl/codegen/fork.h -- include/grpc/impl/codegen/gpr_types.h -- include/grpc/impl/codegen/grpc_types.h -- include/grpc/impl/codegen/log.h -- include/grpc/impl/codegen/port_platform.h -- include/grpc/impl/codegen/propagation_bits.h -- include/grpc/impl/codegen/slice.h -- include/grpc/impl/codegen/status.h -- include/grpc/impl/codegen/sync.h -- include/grpc/impl/codegen/sync_abseil.h -- include/grpc/impl/codegen/sync_custom.h -- include/grpc/impl/codegen/sync_generic.h -- include/grpc/impl/codegen/sync_posix.h -- include/grpc/impl/codegen/sync_windows.h -- include/grpc/impl/compression_types.h -- include/grpc/impl/connectivity_state.h -- include/grpc/impl/grpc_types.h -- include/grpc/impl/propagation_bits.h -- include/grpc/impl/slice_type.h -- include/grpc/load_reporting.h -- include/grpc/slice.h -- include/grpc/slice_buffer.h -- include/grpc/status.h -- include/grpc/support/alloc.h -- include/grpc/support/atm_gcc_atomic.h -- include/grpc/support/atm_gcc_sync.h -- include/grpc/support/atm_windows.h -- include/grpc/support/cpu.h -- include/grpc/support/log.h -- include/grpc/support/log_windows.h -- include/grpc/support/port_platform.h -- include/grpc/support/string_util.h -- include/grpc/support/sync.h -- include/grpc/support/sync_abseil.h -- include/grpc/support/sync_custom.h -- include/grpc/support/sync_generic.h -- include/grpc/support/sync_posix.h -- include/grpc/support/sync_windows.h -- include/grpc/support/thd_id.h -- include/grpc/support/time.h -- include/grpc/support/workaround_list.h --) -- string(REPLACE "include/" "" _path ${_hdr}) -- get_filename_component(_path ${_path} PATH) -- install(FILES ${_hdr} -- DESTINATION "${gRPC_INSTALL_INCLUDEDIR}/${_path}" -- ) --endforeach() -- -- --if(gRPC_INSTALL) -- install(TARGETS grpc_authorization_provider EXPORT gRPCTargets -- RUNTIME DESTINATION ${gRPC_INSTALL_BINDIR} -- BUNDLE DESTINATION ${gRPC_INSTALL_BINDIR} -- LIBRARY DESTINATION ${gRPC_INSTALL_LIBDIR} -- ARCHIVE DESTINATION ${gRPC_INSTALL_LIBDIR} -- ) --endif() -- - - add_library(grpc_plugin_support - src/compiler/cpp_generator.cc -@@ -4715,82 +3379,6 @@ - endif() - - --# grpcpp_channelz doesn't build with protobuf-lite --# See https://github.com/grpc/grpc/issues/19473 --if(gRPC_BUILD_CODEGEN AND NOT gRPC_USE_PROTO_LITE) --add_library(grpcpp_channelz -- ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/channelz/channelz.pb.cc -- ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/channelz/channelz.grpc.pb.cc -- ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/channelz/channelz.pb.h -- ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/channelz/channelz.grpc.pb.h -- src/cpp/server/channelz/channelz_service.cc -- src/cpp/server/channelz/channelz_service_plugin.cc --) -- --set_target_properties(grpcpp_channelz PROPERTIES -- VERSION ${gRPC_CPP_VERSION} -- SOVERSION ${gRPC_CPP_SOVERSION} --) -- --if(WIN32 AND MSVC) -- set_target_properties(grpcpp_channelz PROPERTIES COMPILE_PDB_NAME "grpcpp_channelz" -- COMPILE_PDB_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}" -- ) -- if(gRPC_INSTALL) -- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/grpcpp_channelz.pdb -- DESTINATION ${gRPC_INSTALL_LIBDIR} OPTIONAL -- ) -- endif() --endif() -- --target_include_directories(grpcpp_channelz -- PUBLIC $ $ -- PRIVATE -- ${CMAKE_CURRENT_SOURCE_DIR} -- ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} -- ${_gRPC_RE2_INCLUDE_DIR} -- ${_gRPC_SSL_INCLUDE_DIR} -- ${_gRPC_UPB_GENERATED_DIR} -- ${_gRPC_UPB_GRPC_GENERATED_DIR} -- ${_gRPC_UPB_INCLUDE_DIR} -- ${_gRPC_XXHASH_INCLUDE_DIR} -- ${_gRPC_ZLIB_INCLUDE_DIR} -- ${_gRPC_PROTO_GENS_DIR} --) --target_link_libraries(grpcpp_channelz -- ${_gRPC_BASELIB_LIBRARIES} -- ${_gRPC_PROTOBUF_LIBRARIES} -- ${_gRPC_ZLIB_LIBRARIES} -- ${_gRPC_ALLTARGETS_LIBRARIES} -- grpc++ --) -- --foreach(_hdr -- include/grpcpp/ext/channelz_service_plugin.h --) -- string(REPLACE "include/" "" _path ${_hdr}) -- get_filename_component(_path ${_path} PATH) -- install(FILES ${_hdr} -- DESTINATION "${gRPC_INSTALL_INCLUDEDIR}/${_path}" -- ) --endforeach() --endif() -- --if(gRPC_BUILD_CODEGEN) -- --# grpcpp_channelz doesn't build with protobuf-lite, so no install required --# See https://github.com/grpc/grpc/issues/22826 --if(gRPC_INSTALL AND NOT gRPC_USE_PROTO_LITE) -- install(TARGETS grpcpp_channelz EXPORT gRPCTargets -- RUNTIME DESTINATION ${gRPC_INSTALL_BINDIR} -- BUNDLE DESTINATION ${gRPC_INSTALL_BINDIR} -- LIBRARY DESTINATION ${gRPC_INSTALL_LIBDIR} -- ARCHIVE DESTINATION ${gRPC_INSTALL_LIBDIR} -- ) --endif() -- --endif() -- - add_library(upb - third_party/upb/third_party/utf8_range/naive.c - third_party/upb/third_party/utf8_range/range2-neon.c -@@ -25285,17 +23873,6 @@ - "-laddress_sorting -lupb" - "grpc.pc") - --# grpc_unsecure .pc file --generate_pkgconfig( -- "gRPC unsecure" -- "high performance general RPC framework without SSL" -- "${gRPC_CORE_VERSION}" -- "gpr absl_any_invocable absl_base absl_bind_front absl_cleanup absl_cord absl_core_headers absl_flat_hash_map absl_flat_hash_set absl_function_ref absl_hash absl_inlined_vector absl_memory absl_optional absl_random_random absl_span absl_status absl_statusor absl_str_format absl_strings absl_synchronization absl_time absl_type_traits absl_utility absl_variant" -- "re2 libcares zlib" -- "-lgrpc_unsecure" -- "-laddress_sorting -lupb" -- "grpc_unsecure.pc") -- - # grpc++ .pc file - generate_pkgconfig( - "gRPC++" -@@ -25306,14 +23883,3 @@ - "-lgrpc++" - "" - "grpc++.pc") -- --# grpc++_unsecure .pc file --generate_pkgconfig( -- "gRPC++ unsecure" -- "C++ wrapper for gRPC without SSL" -- "${gRPC_CPP_VERSION}" -- "grpc_unsecure absl_any_invocable absl_base absl_bind_front absl_cleanup absl_cord absl_core_headers absl_flat_hash_map absl_flat_hash_set absl_function_ref absl_hash absl_inlined_vector absl_memory absl_optional absl_random_random absl_span absl_status absl_statusor absl_str_format absl_strings absl_synchronization absl_time absl_type_traits absl_utility absl_variant" -- "" -- "-lgrpc++_unsecure" -- "" -- "grpc++_unsecure.pc") diff --git a/3rd-party/vcpkg-ports/grpc/00009-use-system-upb.patch b/3rd-party/vcpkg-ports/grpc/00009-use-system-upb.patch new file mode 100644 index 0000000000..8419504571 --- /dev/null +++ b/3rd-party/vcpkg-ports/grpc/00009-use-system-upb.patch @@ -0,0 +1,143 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index a3b39a1..8d7c1f6 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -3213,17 +3213,6 @@ add_library(grpc_unsecure + src/core/tsi/local_transport_security.cc + src/core/tsi/transport_security.cc + src/core/tsi/transport_security_grpc.cc +- third_party/upb/upb/message/accessors.c +- third_party/upb/upb/mini_descriptor/build_enum.c +- third_party/upb/upb/mini_descriptor/decode.c +- third_party/upb/upb/mini_descriptor/internal/base92.c +- third_party/upb/upb/mini_descriptor/internal/encode.c +- third_party/upb/upb/mini_descriptor/link.c +- third_party/upb/upb/wire/decode.c +- third_party/upb/upb/wire/decode_fast.c +- third_party/upb/upb/wire/encode.c +- third_party/upb/upb/wire/eps_copy_input_stream.c +- third_party/upb/upb/wire/reader.c + ${gRPC_ADDITIONAL_DLL_SRC} + ) + +@@ -3456,6 +3445,7 @@ target_link_libraries(gtest + endif() + + ++if(0) # vcpkg upb + add_library(upb ${_gRPC_STATIC_WIN32} + third_party/upb/upb/base/status.c + third_party/upb/upb/mem/alloc.c +@@ -3818,6 +3808,7 @@ if(gRPC_INSTALL) + ARCHIVE DESTINATION ${gRPC_INSTALL_LIBDIR} + ) + endif() ++endif() # vcpkg upb + + if(gRPC_BUILD_TESTS) + +@@ -5190,25 +5181,6 @@ add_library(grpc_authorization_provider + src/core/tsi/alts/handshaker/transport_security_common_api.cc + src/core/tsi/transport_security.cc + src/core/tsi/transport_security_grpc.cc +- third_party/upb/upb/hash/common.c +- third_party/upb/upb/message/accessors.c +- third_party/upb/upb/message/array.c +- third_party/upb/upb/message/map.c +- third_party/upb/upb/message/map_sorter.c +- third_party/upb/upb/message/message.c +- third_party/upb/upb/mini_descriptor/build_enum.c +- third_party/upb/upb/mini_descriptor/decode.c +- third_party/upb/upb/mini_descriptor/internal/base92.c +- third_party/upb/upb/mini_descriptor/internal/encode.c +- third_party/upb/upb/mini_descriptor/link.c +- third_party/upb/upb/mini_table/extension_registry.c +- third_party/upb/upb/mini_table/internal/message.c +- third_party/upb/upb/mini_table/message.c +- third_party/upb/upb/wire/decode.c +- third_party/upb/upb/wire/decode_fast.c +- third_party/upb/upb/wire/encode.c +- third_party/upb/upb/wire/eps_copy_input_stream.c +- third_party/upb/upb/wire/reader.c + ) + + target_compile_features(grpc_authorization_provider PUBLIC cxx_std_14) +@@ -30412,9 +30384,9 @@ generate_pkgconfig( + "high performance general RPC framework" + "${gRPC_CORE_VERSION}" + "absl_algorithm_container absl_any_invocable absl_base absl_bind_front absl_cleanup absl_cord absl_core_headers absl_flags absl_flags_marshalling absl_flat_hash_map absl_flat_hash_set absl_function_ref absl_hash absl_inlined_vector absl_memory absl_optional absl_random_bit_gen_ref absl_random_distributions absl_random_random absl_span absl_status absl_statusor absl_str_format absl_strings absl_synchronization absl_time absl_type_traits absl_utility absl_variant gpr" +- "libcares openssl re2 zlib" ++ "libcares openssl re2 zlib utf8_range" + "-lgrpc" +- "-laddress_sorting -lupb -lupb_textformat_lib -lupb_json_lib -lutf8_range_lib -lupb_collections_lib" ++ "-laddress_sorting -lupb" + "grpc.pc") + + # grpc_unsecure .pc file +@@ -30423,9 +30395,9 @@ generate_pkgconfig( + "high performance general RPC framework without SSL" + "${gRPC_CORE_VERSION}" + "absl_algorithm_container absl_any_invocable absl_base absl_bind_front absl_cleanup absl_cord absl_core_headers absl_flags absl_flags_marshalling absl_flat_hash_map absl_flat_hash_set absl_function_ref absl_hash absl_inlined_vector absl_memory absl_optional absl_random_bit_gen_ref absl_random_distributions absl_random_random absl_span absl_status absl_statusor absl_str_format absl_strings absl_synchronization absl_time absl_type_traits absl_utility absl_variant gpr" +- "libcares zlib" ++ "libcares zlib utf8_range" + "-lgrpc_unsecure" +- "-laddress_sorting -lutf8_range_lib -lupb -lupb_collections_lib" ++ "-laddress_sorting -lupb" + "grpc_unsecure.pc") + + # grpc++ .pc file +@@ -30434,9 +30406,9 @@ generate_pkgconfig( + "C++ wrapper for gRPC" + "${gRPC_CPP_VERSION}" + "absl_algorithm_container absl_any_invocable absl_base absl_bind_front absl_cleanup absl_cord absl_core_headers absl_flags absl_flags_marshalling absl_flat_hash_map absl_flat_hash_set absl_function_ref absl_hash absl_inlined_vector absl_memory absl_optional absl_random_bit_gen_ref absl_random_distributions absl_random_random absl_span absl_status absl_statusor absl_str_format absl_strings absl_synchronization absl_time absl_type_traits absl_utility absl_variant gpr grpc" +- "libcares openssl re2 zlib" ++ "libcares openssl re2 zlib utf8_range" + "-lgrpc++" +- "-laddress_sorting -lupb -lupb_textformat_lib -lupb_json_lib -lutf8_range_lib -lupb_collections_lib" ++ "-laddress_sorting -lupb" + "grpc++.pc") + + # grpc++_unsecure .pc file +@@ -30445,7 +30417,7 @@ generate_pkgconfig( + "C++ wrapper for gRPC without SSL" + "${gRPC_CPP_VERSION}" + "absl_algorithm_container absl_any_invocable absl_base absl_bind_front absl_cleanup absl_cord absl_core_headers absl_flags absl_flags_marshalling absl_flat_hash_map absl_flat_hash_set absl_function_ref absl_hash absl_inlined_vector absl_memory absl_optional absl_random_bit_gen_ref absl_random_distributions absl_random_random absl_span absl_status absl_statusor absl_str_format absl_strings absl_synchronization absl_time absl_type_traits absl_utility absl_variant gpr grpc_unsecure" +- "libcares zlib" ++ "libcares zlib utf8_range" + "-lgrpc++_unsecure" +- "-laddress_sorting -lutf8_range_lib -lupb -lupb_collections_lib" ++ "-laddress_sorting -lupb" + "grpc++_unsecure.pc") +diff --git a/cmake/gRPCConfig.cmake.in b/cmake/gRPCConfig.cmake.in +index 98d8c6d..7cad2ab 100644 +--- a/cmake/gRPCConfig.cmake.in ++++ b/cmake/gRPCConfig.cmake.in +@@ -8,6 +8,7 @@ list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}/modules) + @_gRPC_FIND_CARES@ + @_gRPC_FIND_ABSL@ + @_gRPC_FIND_RE2@ ++@_gRPC_FIND_UPB@ + + # Targets + include(${CMAKE_CURRENT_LIST_DIR}/gRPCTargets.cmake) +diff --git a/cmake/upb.cmake b/cmake/upb.cmake +index 9156e5f..31324fa 100644 +--- a/cmake/upb.cmake ++++ b/cmake/upb.cmake +@@ -14,7 +14,15 @@ + + set(UPB_ROOT_DIR ${CMAKE_CURRENT_SOURCE_DIR}/third_party/upb) + +-set(_gRPC_UPB_INCLUDE_DIR "${UPB_ROOT_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}/third_party/utf8_range") ++set(_gRPC_UPB_INCLUDE_DIR "") + set(_gRPC_UPB_GRPC_GENERATED_DIR "${CMAKE_CURRENT_SOURCE_DIR}/src/core/ext/upb-gen" "${CMAKE_CURRENT_SOURCE_DIR}/src/core/ext/upbdefs-gen") + + set(_gRPC_UPB_LIBRARIES upb) ++ ++find_package(upb CONFIG REQUIRED) ++set(_gRPC_FIND_UPB "find_dependency(upb CONFIG)") ++add_library(upb_collections_lib ALIAS upb::upb) ++add_library(upb_json_lib ALIAS upb::upb) ++add_library(upb_textformat_lib ALIAS upb::upb) ++add_library(upb ALIAS upb::upb) ++add_library(utf8_range_lib ALIAS utf8_range::utf8_range) diff --git a/3rd-party/vcpkg-ports/grpc/00014-pkgconfig-upbdefs.patch b/3rd-party/vcpkg-ports/grpc/00014-pkgconfig-upbdefs.patch deleted file mode 100644 index 1c2bda5b1b..0000000000 --- a/3rd-party/vcpkg-ports/grpc/00014-pkgconfig-upbdefs.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 48019cce95..1eda700ae8 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -23186,7 +23186,7 @@ generate_pkgconfig( - "high performance general RPC framework" - "${gRPC_CORE_VERSION}" - "gpr openssl absl_any_invocable absl_base absl_bind_front absl_cleanup absl_cord absl_core_headers absl_flat_hash_map absl_flat_hash_set absl_function_ref absl_hash absl_inlined_vector absl_memory absl_optional absl_random_random absl_span absl_status absl_statusor absl_str_format absl_strings absl_synchronization absl_time absl_type_traits absl_utility absl_variant" -- "-lgrpc -laddress_sorting -lre2 -lupb -lcares -lz" -+ "-lgrpc -laddress_sorting -lre2 -lupb_textformat -lupb_mini_table -lupb -lupb_collections -lupb_reflection -lupb_extension_registry -lupb_json -lupb_fastdecode -lupb_utf8_range -ldescriptor_upb_proto -lcares -lz" - "" - "grpc.pc") - diff --git a/3rd-party/vcpkg-ports/grpc/00015-disable-download-archive.patch b/3rd-party/vcpkg-ports/grpc/00015-disable-download-archive.patch index b28bc72a7c..675c2519dc 100644 --- a/3rd-party/vcpkg-ports/grpc/00015-disable-download-archive.patch +++ b/3rd-party/vcpkg-ports/grpc/00015-disable-download-archive.patch @@ -1,5 +1,5 @@ diff --git a/cmake/download_archive.cmake b/cmake/download_archive.cmake -index 820aafafb7..a59b785c7e 100644 +index 820aafa..a59b785 100644 --- a/cmake/download_archive.cmake +++ b/cmake/download_archive.cmake @@ -19,6 +19,7 @@ file(MAKE_DIRECTORY ${_download_archive_TEMPORARY_DIR}) diff --git a/3rd-party/vcpkg-ports/grpc/00016-fix-plugin-targets.patch b/3rd-party/vcpkg-ports/grpc/00016-fix-plugin-targets.patch new file mode 100644 index 0000000000..ce7924ceb1 --- /dev/null +++ b/3rd-party/vcpkg-ports/grpc/00016-fix-plugin-targets.patch @@ -0,0 +1,12 @@ +diff --git a/cmake/gRPCConfig.cmake.in b/cmake/gRPCConfig.cmake.in +index 7cad2abca1..c287f3b413 100644 +--- a/cmake/gRPCConfig.cmake.in ++++ b/cmake/gRPCConfig.cmake.in +@@ -12,6 +12,6 @@ list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}/modules) + + # Targets + include(${CMAKE_CURRENT_LIST_DIR}/gRPCTargets.cmake) +-if(NOT CMAKE_CROSSCOMPILING) ++if(@gRPC_BUILD_CODEGEN@) + include(${CMAKE_CURRENT_LIST_DIR}/gRPCPluginTargets.cmake) + endif() diff --git a/3rd-party/vcpkg-ports/grpc/00017-abseil.patch b/3rd-party/vcpkg-ports/grpc/00017-abseil.patch new file mode 100644 index 0000000000..4fd424cd91 --- /dev/null +++ b/3rd-party/vcpkg-ports/grpc/00017-abseil.patch @@ -0,0 +1,36 @@ +diff --git a/src/core/ext/filters/client_channel/resolver/dns/c_ares/dns_resolver_ares.cc b/src/core/ext/filters/client_channel/resolver/dns/c_ares/dns_resolver_ares.cc +index dde7570ede..43e06d7a69 100644 +--- a/src/core/ext/filters/client_channel/resolver/dns/c_ares/dns_resolver_ares.cc ++++ b/src/core/ext/filters/client_channel/resolver/dns/c_ares/dns_resolver_ares.cc +@@ -32,6 +32,7 @@ + #include "absl/strings/string_view.h" + #include "absl/strings/strip.h" + #include "absl/types/optional.h" ++#include "absl/strings/str_cat.h" + + #include + #include +diff --git a/src/core/lib/event_engine/cf_engine/cfstream_endpoint.cc b/src/core/lib/event_engine/cf_engine/cfstream_endpoint.cc +index 74f7392af9..656cdc427b 100644 +--- a/src/core/lib/event_engine/cf_engine/cfstream_endpoint.cc ++++ b/src/core/lib/event_engine/cf_engine/cfstream_endpoint.cc +@@ -21,6 +21,7 @@ + #include "src/core/lib/event_engine/cf_engine/cfstream_endpoint.h" + #include "src/core/lib/event_engine/trace.h" + #include "src/core/lib/gprpp/strerror.h" ++#include "absl/strings/str_cat.h" + + namespace grpc_event_engine { + namespace experimental { +diff --git a/src/core/lib/gprpp/windows/directory_reader.cc b/src/core/lib/gprpp/windows/directory_reader.cc +index 790e213e78..103d68a5a3 100644 +--- a/src/core/lib/gprpp/windows/directory_reader.cc ++++ b/src/core/lib/gprpp/windows/directory_reader.cc +@@ -28,6 +28,7 @@ + + #include "absl/status/statusor.h" + #include "absl/strings/string_view.h" ++#include "absl/strings/str_cat.h" + + #include + diff --git a/3rd-party/vcpkg-ports/grpc/gRPCTargets-vcpkg-tools.cmake b/3rd-party/vcpkg-ports/grpc/gRPCTargets-vcpkg-tools.cmake new file mode 100644 index 0000000000..1ed3509c94 --- /dev/null +++ b/3rd-party/vcpkg-ports/grpc/gRPCTargets-vcpkg-tools.cmake @@ -0,0 +1,10 @@ +file(GLOB GRPC_PLUGINS "${_IMPORT_PREFIX}/../@HOST_TRIPLET@/tools/grpc/grpc_*_plugin*") + +foreach(PLUGIN ${GRPC_PLUGINS}) + get_filename_component(PLUGIN_NAME "${PLUGIN}" NAME_WE) + add_executable(gRPC::${PLUGIN_NAME} IMPORTED) + set_property(TARGET gRPC::${PLUGIN_NAME} APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE) + set_target_properties(gRPC::${PLUGIN_NAME} PROPERTIES + IMPORTED_LOCATION_RELEASE "${PLUGIN}" + ) +endforeach() diff --git a/3rd-party/vcpkg-ports/grpc/portfile.cmake b/3rd-party/vcpkg-ports/grpc/portfile.cmake index ef1f48b984..b8b3363ec9 100644 --- a/3rd-party/vcpkg-ports/grpc/portfile.cmake +++ b/3rd-party/vcpkg-ports/grpc/portfile.cmake @@ -5,20 +5,33 @@ endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO canonical/grpc - REF e3acf245a91630fe4d464091ba5446f6a638d82f - SHA512 18574197f4a5070de07c39c096ead2175c150a2b790adbb3d9639b0637641015fb91f5cffa916b50863d6ee62203ad2a6964ce87566b6ae7b41716594c445c06 + REF bfcc6af27db9de9dc0a5edb3bc8ab46731956ba1 + SHA512 e84e0ec81981ec33adc191fd06ece6e8ebac02c1a0dc612e689809015a171aab276330be952f7b052ad8b213820c0a29f03b5d2f25c2d236b311d0e420efeff8 HEAD_REF master PATCHES + 00001-fix-uwp.patch 00002-static-linking-in-linux.patch 00003-undef-base64-macro.patch 00004-link-gdi32-on-windows.patch 00005-fix-uwp-error.patch - 00006-remove-unused-libraries.patch - snprintf.patch + 00009-use-system-upb.patch 00015-disable-download-archive.patch + 00016-fix-plugin-targets.patch + 00017-abseil.patch ) -if(NOT TARGET_TRIPLET STREQUAL HOST_TRIPLET) +# Ensure de-vendoring +file(REMOVE_RECURSE + "${SOURCE_PATH}/third_party/abseil-cpp" + "${SOURCE_PATH}/third_party/cares" + "${SOURCE_PATH}/third_party/protobuf" + "${SOURCE_PATH}/third_party/re2" + "${SOURCE_PATH}/third_party/upb" + "${SOURCE_PATH}/third_party/utf8_range" + "${SOURCE_PATH}/third_party/zlib" +) + +if(VCPKG_CROSSCOMPILING) vcpkg_add_to_path(PREPEND "${CURRENT_HOST_INSTALLED_DIR}/tools/grpc") endif() @@ -49,19 +62,12 @@ vcpkg_cmake_configure( -DgRPC_PROTOBUF_PROVIDER=package -DgRPC_ABSL_PROVIDER=package -DgRPC_RE2_PROVIDER=package - -DgRPC_PROTOBUF_PACKAGE_TYPE=CONFIG -DgRPC_CARES_PROVIDER=${cares_CARES_PROVIDER} -DgRPC_BENCHMARK_PROVIDER=none -DgRPC_INSTALL_BINDIR:STRING=bin -DgRPC_INSTALL_LIBDIR:STRING=lib -DgRPC_INSTALL_INCLUDEDIR:STRING=include -DgRPC_INSTALL_CMAKEDIR:STRING=share/grpc - -DgRPC_BUILD_GRPC_CSHARP_PLUGIN=OFF - -DgRPC_BUILD_GRPC_NODE_PLUGIN=OFF - -DgRPC_BUILD_GRPC_OBJECTIVE_C_PLUGIN=OFF - -DgRPC_BUILD_GRPC_PHP_PLUGIN=OFF - -DgRPC_BUILD_GRPC_PYTHON_PLUGIN=OFF - -DgRPC_BUILD_GRPC_RUBY_PLUGIN=OFF "-D_gRPC_PROTOBUF_PROTOC_EXECUTABLE=${CURRENT_HOST_INSTALLED_DIR}/tools/protobuf/protoc${VCPKG_HOST_EXECUTABLE_SUFFIX}" "-DProtobuf_PROTOC_EXECUTABLE=${CURRENT_HOST_INSTALLED_DIR}/tools/protobuf/protoc${VCPKG_HOST_EXECUTABLE_SUFFIX}" MAYBE_UNUSED_VARIABLES @@ -72,11 +78,21 @@ vcpkg_cmake_install(ADD_BIN_TO_PATH) vcpkg_cmake_config_fixup() -vcpkg_copy_tools( - AUTO_CLEAN - TOOL_NAMES - grpc_cpp_plugin -) +if (gRPC_BUILD_CODEGEN) + vcpkg_copy_tools( + AUTO_CLEAN + TOOL_NAMES + grpc_php_plugin + grpc_python_plugin + grpc_node_plugin + grpc_objective_c_plugin + grpc_csharp_plugin + grpc_cpp_plugin + grpc_ruby_plugin + ) +else() + configure_file("${CMAKE_CURRENT_LIST_DIR}/gRPCTargets-vcpkg-tools.cmake" "${CURRENT_PACKAGES_DIR}/share/grpc/gRPCTargets-vcpkg-tools.cmake" @ONLY) +endif() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share" "${CURRENT_PACKAGES_DIR}/debug/include") @@ -84,7 +100,7 @@ vcpkg_copy_pdbs() if (VCPKG_TARGET_IS_WINDOWS) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib/pkgconfig" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig") else() - vcpkg_fixup_pkgconfig(SKIP_CHECK) + vcpkg_fixup_pkgconfig() endif() -file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/3rd-party/vcpkg-ports/grpc/snprintf.patch b/3rd-party/vcpkg-ports/grpc/snprintf.patch deleted file mode 100644 index b5012ad2db..0000000000 --- a/3rd-party/vcpkg-ports/grpc/snprintf.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/src/core/tsi/alts/crypt/aes_gcm.cc b/src/core/tsi/alts/crypt/aes_gcm.cc -index b761224..88a3d6b 100644 ---- a/src/core/tsi/alts/crypt/aes_gcm.cc -+++ b/src/core/tsi/alts/crypt/aes_gcm.cc -@@ -19,6 +19,7 @@ - #include - - #include -+#include - - #include - #include diff --git a/3rd-party/vcpkg-ports/grpc/vcpkg-cmake-wrapper.cmake b/3rd-party/vcpkg-ports/grpc/vcpkg-cmake-wrapper.cmake new file mode 100644 index 0000000000..9adf028808 --- /dev/null +++ b/3rd-party/vcpkg-ports/grpc/vcpkg-cmake-wrapper.cmake @@ -0,0 +1,2 @@ +list(REMOVE_AT ARGS 0) +_find_package(gRPC ${ARGS}) # Shouldn't this be fixed downstream instead of using a Wrapper? \ No newline at end of file diff --git a/3rd-party/vcpkg-ports/grpc/vcpkg.json b/3rd-party/vcpkg-ports/grpc/vcpkg.json index 437868cfc2..16184bded5 100644 --- a/3rd-party/vcpkg-ports/grpc/vcpkg.json +++ b/3rd-party/vcpkg-ports/grpc/vcpkg.json @@ -1,7 +1,8 @@ { "name": "grpc", - "version-semver": "1.52.1", - "description": "An RPC library and framework", + "version-semver": "1.60.0", + "port-version": 1, + "description": "gRPC is a modern, open source, high-performance remote procedure call (RPC) framework that can run anywhere. gRPC enables client and server applications to communicate transparently, and simplifies the building of connected systems.", "homepage": "https://github.com/grpc/grpc", "license": "Apache-2.0", "dependencies": [ @@ -17,12 +18,14 @@ "codegen" ] }, + "openssl", "protobuf", { "name": "protobuf", "host": true }, "re2", + "upb", { "name": "vcpkg-cmake", "host": true @@ -34,11 +37,9 @@ "zlib" ], "features": { - "absl-sync": { - "description": "Deprecated." - }, "codegen": { - "description": "Build code generator machinery" + "description": "Build code generator machinery", + "supports": "!uwp" } } } diff --git a/vcpkg.json b/vcpkg.json index 4953cbcb95..3858504eb6 100644 --- a/vcpkg.json +++ b/vcpkg.json @@ -1,5 +1,5 @@ { - "builtin-baseline": "ca7b1b15f548c25c766360593a2c732d56ed0133", + "builtin-baseline": "c82f74667287d3dc386bce81e44964370c91a289", "dependencies": [ "poco", "grpc"