diff options
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/codegen/core/gen_load_balancing_proto.sh | 28 | ||||
| -rw-r--r-- | tools/doxygen/Doxyfile.core.internal | 18 | ||||
| -rw-r--r-- | tools/run_tests/sources_and_headers.json | 68 |
3 files changed, 71 insertions, 43 deletions
diff --git a/tools/codegen/core/gen_load_balancing_proto.sh b/tools/codegen/core/gen_load_balancing_proto.sh new file mode 100755 index 0000000000..7dd1470b19 --- /dev/null +++ b/tools/codegen/core/gen_load_balancing_proto.sh @@ -0,0 +1,28 @@ +#!/bin/bash + +if [ $# -eq 0 ]; then + echo "Usage: $0 <load_balancer.proto>" + exit 1 +fi + +readonly EXPECTED_OPTIONS_FILE_PATH="${1%.*}.options" + +if [[ ! -f "$1" ]]; then + echo "Input proto file '$1' doesn't exist." + exit 2 +fi +if [[ ! -f "${EXPECTED_OPTIONS_FILE_PATH}" ]]; then + echo "Expected nanopb options file '${EXPECTED_OPTIONS_FILE_PATH}' missing" + exit 3 +fi + +readonly GRPC_ROOT=$PWD + +pushd "$(dirname $1)" > /dev/null + +protoc \ +--plugin=protoc-gen-nanopb="$GRPC_ROOT/third_party/nanopb/generator/protoc-gen-nanopb" \ +--nanopb_out='-L#include\ \"third_party/nanopb/pb.h\"'":$GRPC_ROOT/src/core/proto" \ +"$(basename $1)" + +popd > /dev/null diff --git a/tools/doxygen/Doxyfile.core.internal b/tools/doxygen/Doxyfile.core.internal index 95421e88b6..3c0ed7f757 100644 --- a/tools/doxygen/Doxyfile.core.internal +++ b/tools/doxygen/Doxyfile.core.internal @@ -793,12 +793,7 @@ src/core/channel/http_server_filter.h \ src/core/channel/noop_filter.h \ src/core/client_config/client_config.h \ src/core/client_config/connector.h \ -src/core/client_config/lb_policies/load_balancer.pb.h \ src/core/client_config/lb_policies/load_balancer_api.h \ -src/core/client_config/lb_policies/nanopb/pb.h \ -src/core/client_config/lb_policies/nanopb/pb_common.h \ -src/core/client_config/lb_policies/nanopb/pb_decode.h \ -src/core/client_config/lb_policies/nanopb/pb_encode.h \ src/core/client_config/lb_policies/pick_first.h \ src/core/client_config/lb_policies/round_robin.h \ src/core/client_config/lb_policy.h \ @@ -860,6 +855,7 @@ src/core/json/json.h \ src/core/json/json_common.h \ src/core/json/json_reader.h \ src/core/json/json_writer.h \ +src/core/proto/load_balancer.pb.h \ src/core/statistics/census_interface.h \ src/core/statistics/census_rpc_stats.h \ src/core/surface/api_trace.h \ @@ -898,6 +894,10 @@ src/core/transport/metadata.h \ src/core/transport/stream_op.h \ src/core/transport/transport.h \ src/core/transport/transport_impl.h \ +third_party/nanopb/pb.h \ +third_party/nanopb/pb_common.h \ +third_party/nanopb/pb_decode.h \ +third_party/nanopb/pb_encode.h \ src/core/census/aggregation.h \ src/core/census/context.h \ src/core/census/rpc_metric_id.h \ @@ -935,11 +935,7 @@ src/core/channel/http_server_filter.c \ src/core/channel/noop_filter.c \ src/core/client_config/client_config.c \ src/core/client_config/connector.c \ -src/core/client_config/lb_policies/load_balancer.pb.c \ src/core/client_config/lb_policies/load_balancer_api.c \ -src/core/client_config/lb_policies/nanopb/pb_common.c \ -src/core/client_config/lb_policies/nanopb/pb_decode.c \ -src/core/client_config/lb_policies/nanopb/pb_encode.c \ src/core/client_config/lb_policies/pick_first.c \ src/core/client_config/lb_policies/round_robin.c \ src/core/client_config/lb_policy.c \ @@ -1005,6 +1001,7 @@ src/core/json/json.c \ src/core/json/json_reader.c \ src/core/json/json_string.c \ src/core/json/json_writer.c \ +src/core/proto/load_balancer.pb.c \ src/core/surface/api_trace.c \ src/core/surface/byte_buffer.c \ src/core/surface/byte_buffer_queue.c \ @@ -1050,6 +1047,9 @@ src/core/transport/metadata.c \ src/core/transport/stream_op.c \ src/core/transport/transport.c \ src/core/transport/transport_op_string.c \ +third_party/nanopb/pb_common.c \ +third_party/nanopb/pb_decode.c \ +third_party/nanopb/pb_encode.c \ src/core/census/context.c \ src/core/census/initialize.c \ src/core/census/operation.c \ diff --git a/tools/run_tests/sources_and_headers.json b/tools/run_tests/sources_and_headers.json index 09b9e05bcc..bc5f72749e 100644 --- a/tools/run_tests/sources_and_headers.json +++ b/tools/run_tests/sources_and_headers.json @@ -1371,8 +1371,8 @@ "grpc++" ], "headers": [ - "src/core/client_config/lb_policies/protos/load_balancer.grpc.pb.h", - "src/core/client_config/lb_policies/protos/load_balancer.pb.h" + "src/core/client_config/lb_policies/proto/load_balancer.grpc.pb.h", + "src/core/client_config/lb_policies/proto/load_balancer.pb.h" ], "language": "c++", "name": "grpclb_api_test", @@ -13299,12 +13299,7 @@ "src/core/channel/noop_filter.h", "src/core/client_config/client_config.h", "src/core/client_config/connector.h", - "src/core/client_config/lb_policies/load_balancer.pb.h", "src/core/client_config/lb_policies/load_balancer_api.h", - "src/core/client_config/lb_policies/nanopb/pb.h", - "src/core/client_config/lb_policies/nanopb/pb_common.h", - "src/core/client_config/lb_policies/nanopb/pb_decode.h", - "src/core/client_config/lb_policies/nanopb/pb_encode.h", "src/core/client_config/lb_policies/pick_first.h", "src/core/client_config/lb_policies/round_robin.h", "src/core/client_config/lb_policy.h", @@ -13366,6 +13361,7 @@ "src/core/json/json_common.h", "src/core/json/json_reader.h", "src/core/json/json_writer.h", + "src/core/proto/load_balancer.pb.h", "src/core/security/auth_filters.h", "src/core/security/base64.h", "src/core/security/credentials.h", @@ -13416,7 +13412,11 @@ "src/core/tsi/fake_transport_security.h", "src/core/tsi/ssl_transport_security.h", "src/core/tsi/transport_security.h", - "src/core/tsi/transport_security_interface.h" + "src/core/tsi/transport_security_interface.h", + "third_party/nanopb/pb.h", + "third_party/nanopb/pb_common.h", + "third_party/nanopb/pb_decode.h", + "third_party/nanopb/pb_encode.h" ], "language": "c", "name": "grpc", @@ -13461,17 +13461,8 @@ "src/core/client_config/client_config.h", "src/core/client_config/connector.c", "src/core/client_config/connector.h", - "src/core/client_config/lb_policies/load_balancer.pb.c", - "src/core/client_config/lb_policies/load_balancer.pb.h", "src/core/client_config/lb_policies/load_balancer_api.c", "src/core/client_config/lb_policies/load_balancer_api.h", - "src/core/client_config/lb_policies/nanopb/pb.h", - "src/core/client_config/lb_policies/nanopb/pb_common.c", - "src/core/client_config/lb_policies/nanopb/pb_common.h", - "src/core/client_config/lb_policies/nanopb/pb_decode.c", - "src/core/client_config/lb_policies/nanopb/pb_decode.h", - "src/core/client_config/lb_policies/nanopb/pb_encode.c", - "src/core/client_config/lb_policies/nanopb/pb_encode.h", "src/core/client_config/lb_policies/pick_first.c", "src/core/client_config/lb_policies/pick_first.h", "src/core/client_config/lb_policies/round_robin.c", @@ -13599,6 +13590,8 @@ "src/core/json/json_string.c", "src/core/json/json_writer.c", "src/core/json/json_writer.h", + "src/core/proto/load_balancer.pb.c", + "src/core/proto/load_balancer.pb.h", "src/core/security/auth_filters.h", "src/core/security/base64.c", "src/core/security/base64.h", @@ -13714,7 +13707,14 @@ "src/core/tsi/ssl_transport_security.h", "src/core/tsi/transport_security.c", "src/core/tsi/transport_security.h", - "src/core/tsi/transport_security_interface.h" + "src/core/tsi/transport_security_interface.h", + "third_party/nanopb/pb.h", + "third_party/nanopb/pb_common.c", + "third_party/nanopb/pb_common.h", + "third_party/nanopb/pb_decode.c", + "third_party/nanopb/pb_decode.h", + "third_party/nanopb/pb_encode.c", + "third_party/nanopb/pb_encode.h" ] }, { @@ -13825,12 +13825,7 @@ "src/core/channel/noop_filter.h", "src/core/client_config/client_config.h", "src/core/client_config/connector.h", - "src/core/client_config/lb_policies/load_balancer.pb.h", "src/core/client_config/lb_policies/load_balancer_api.h", - "src/core/client_config/lb_policies/nanopb/pb.h", - "src/core/client_config/lb_policies/nanopb/pb_common.h", - "src/core/client_config/lb_policies/nanopb/pb_decode.h", - "src/core/client_config/lb_policies/nanopb/pb_encode.h", "src/core/client_config/lb_policies/pick_first.h", "src/core/client_config/lb_policies/round_robin.h", "src/core/client_config/lb_policy.h", @@ -13892,6 +13887,7 @@ "src/core/json/json_common.h", "src/core/json/json_reader.h", "src/core/json/json_writer.h", + "src/core/proto/load_balancer.pb.h", "src/core/statistics/census_interface.h", "src/core/statistics/census_rpc_stats.h", "src/core/surface/api_trace.h", @@ -13929,7 +13925,11 @@ "src/core/transport/metadata.h", "src/core/transport/stream_op.h", "src/core/transport/transport.h", - "src/core/transport/transport_impl.h" + "src/core/transport/transport_impl.h", + "third_party/nanopb/pb.h", + "third_party/nanopb/pb_common.h", + "third_party/nanopb/pb_decode.h", + "third_party/nanopb/pb_encode.h" ], "language": "c", "name": "grpc_unsecure", @@ -13973,17 +13973,8 @@ "src/core/client_config/client_config.h", "src/core/client_config/connector.c", "src/core/client_config/connector.h", - "src/core/client_config/lb_policies/load_balancer.pb.c", - "src/core/client_config/lb_policies/load_balancer.pb.h", "src/core/client_config/lb_policies/load_balancer_api.c", "src/core/client_config/lb_policies/load_balancer_api.h", - "src/core/client_config/lb_policies/nanopb/pb.h", - "src/core/client_config/lb_policies/nanopb/pb_common.c", - "src/core/client_config/lb_policies/nanopb/pb_common.h", - "src/core/client_config/lb_policies/nanopb/pb_decode.c", - "src/core/client_config/lb_policies/nanopb/pb_decode.h", - "src/core/client_config/lb_policies/nanopb/pb_encode.c", - "src/core/client_config/lb_policies/nanopb/pb_encode.h", "src/core/client_config/lb_policies/pick_first.c", "src/core/client_config/lb_policies/pick_first.h", "src/core/client_config/lb_policies/round_robin.c", @@ -14110,6 +14101,8 @@ "src/core/json/json_string.c", "src/core/json/json_writer.c", "src/core/json/json_writer.h", + "src/core/proto/load_balancer.pb.c", + "src/core/proto/load_balancer.pb.h", "src/core/statistics/census_interface.h", "src/core/statistics/census_rpc_stats.h", "src/core/surface/api_trace.c", @@ -14193,7 +14186,14 @@ "src/core/transport/transport.c", "src/core/transport/transport.h", "src/core/transport/transport_impl.h", - "src/core/transport/transport_op_string.c" + "src/core/transport/transport_op_string.c", + "third_party/nanopb/pb.h", + "third_party/nanopb/pb_common.c", + "third_party/nanopb/pb_common.h", + "third_party/nanopb/pb_decode.c", + "third_party/nanopb/pb_decode.h", + "third_party/nanopb/pb_encode.c", + "third_party/nanopb/pb_encode.h" ] }, { |