Chiebot-Mirror
/
grpc
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix the inclusion "third_party/nanopb/..." to simply "..."

Browse Source
pull/15595/head
David Garcia Quintas 7 years ago
parent 3351fe3a3f
commit 00e045dbb2
14 changed files with 48 additions and 18 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      Makefile
  2. 10
      bazel/grpc_deps.bzl
  3. 4
      src/core/ext/filters/client_channel/lb_policy/grpclb/load_balancer_api.cc
  4. 2
      src/core/ext/filters/client_channel/lb_policy/grpclb/proto/grpc/lb/v1/load_balancer.pb.h
  5. 4
      src/core/tsi/alts/handshaker/alts_handshaker_service_api_util.h
  6. 2
      src/core/tsi/alts/handshaker/altscontext.pb.h
  7. 2
      src/core/tsi/alts/handshaker/handshaker.pb.h
  8. 2
      src/core/tsi/alts/handshaker/transport_security_common.pb.h
  9. 4
      src/core/tsi/alts/handshaker/transport_security_common_api.h
  10. 4
      src/cpp/server/health/default_health_check_service.cc
  11. 2
      src/cpp/server/health/health.pb.h
  12. 4
      templates/Makefile.template
  13. 19
      third_party/nanopb.BUILD
  14. 3
      tools/codegen/core/gen_nano_proto.sh

4
Makefile
Unescape View File

@ -338,7 +338,9 @@ CPPFLAGS += -g -Wall -Wextra -Werror -Wno-long-long -Wno-unused-parameter -DOSAT
COREFLAGS += -fno-rtti -fno-exceptions COREFLAGS += -fno-rtti -fno-exceptions
LDFLAGS += -g LDFLAGS += -g
DEFINES += PB_FIELD_16BIT # nanopb tweaks
DEFINES += PB_FIELD_32BIT
CPPFLAGS += -Ithird_party/nanopb
CPPFLAGS += $(CPPFLAGS_$(CONFIG)) CPPFLAGS += $(CPPFLAGS_$(CONFIG))
CFLAGS += $(CFLAGS_$(CONFIG)) CFLAGS += $(CFLAGS_$(CONFIG))

10
bazel/grpc_deps.bzl
Unescape View File

@ -5,7 +5,7 @@ def grpc_deps():
native.bind( native.bind(
name = "nanopb", name = "nanopb",
actual = "@com_github_grpc_grpc//third_party/nanopb:nanopb", actual = "@com_github_nanopb_nanopb//:nanopb",
) )
native.bind( native.bind(
@ -95,6 +95,14 @@ def grpc_deps():
url = "https://github.com/google/protobuf/archive/b5fbb742af122b565925987e65c08957739976a7.tar.gz", url = "https://github.com/google/protobuf/archive/b5fbb742af122b565925987e65c08957739976a7.tar.gz",
) )
if "com_github_nanopb_nanopb" not in native.existing_rules():
native.new_http_archive(
name = "com_github_nanopb_nanopb",
build_file = "@com_github_grpc_grpc//third_party:nanopb.BUILD",
strip_prefix = "nanopb-f8ac463766281625ad710900479130c7fcb4d63b",
url = "https://github.com/nanopb/nanopb/archive/f8ac463766281625ad710900479130c7fcb4d63b.tar.gz",
)
if "com_github_google_googletest" not in native.existing_rules(): if "com_github_google_googletest" not in native.existing_rules():
native.new_http_archive( native.new_http_archive(
name = "com_github_google_googletest", name = "com_github_google_googletest",

4
src/core/ext/filters/client_channel/lb_policy/grpclb/load_balancer_api.cc
Unescape View File

@ -19,8 +19,8 @@
#include <grpc/support/port_platform.h> #include <grpc/support/port_platform.h>
#include "src/core/ext/filters/client_channel/lb_policy/grpclb/load_balancer_api.h" #include "src/core/ext/filters/client_channel/lb_policy/grpclb/load_balancer_api.h"
#include "third_party/nanopb/pb_decode.h" #include "pb_decode.h"
#include "third_party/nanopb/pb_encode.h" #include "pb_encode.h"
#include <grpc/support/alloc.h> #include <grpc/support/alloc.h>

2
src/core/ext/filters/client_channel/lb_policy/grpclb/proto/grpc/lb/v1/load_balancer.pb.h
Unescape View File

@ -3,7 +3,7 @@
#ifndef PB_GRPC_LB_V1_LOAD_BALANCER_PB_H_INCLUDED #ifndef PB_GRPC_LB_V1_LOAD_BALANCER_PB_H_INCLUDED
#define PB_GRPC_LB_V1_LOAD_BALANCER_PB_H_INCLUDED #define PB_GRPC_LB_V1_LOAD_BALANCER_PB_H_INCLUDED
#include "third_party/nanopb/pb.h" #include "pb.h"
/* @@protoc_insertion_point(includes) */ /* @@protoc_insertion_point(includes) */
#if PB_PROTO_HEADER_VERSION != 30 #if PB_PROTO_HEADER_VERSION != 30
#error Regenerate this file with the current version of nanopb generator. #error Regenerate this file with the current version of nanopb generator.

4
src/core/tsi/alts/handshaker/alts_handshaker_service_api_util.h
Unescape View File

@ -21,8 +21,8 @@
#include <grpc/support/port_platform.h> #include <grpc/support/port_platform.h>
#include "third_party/nanopb/pb_decode.h" #include "pb_decode.h"
#include "third_party/nanopb/pb_encode.h" #include "pb_encode.h"
#include <grpc/slice.h> #include <grpc/slice.h>
#include <grpc/slice_buffer.h> #include <grpc/slice_buffer.h>

2
src/core/tsi/alts/handshaker/altscontext.pb.h
Unescape View File

@ -3,7 +3,7 @@
#ifndef PB_GRPC_GCP_ALTSCONTEXT_PB_H_INCLUDED #ifndef PB_GRPC_GCP_ALTSCONTEXT_PB_H_INCLUDED
#define PB_GRPC_GCP_ALTSCONTEXT_PB_H_INCLUDED #define PB_GRPC_GCP_ALTSCONTEXT_PB_H_INCLUDED
#include "third_party/nanopb/pb.h" #include "pb.h"
#include "src/core/tsi/alts/handshaker/transport_security_common.pb.h" #include "src/core/tsi/alts/handshaker/transport_security_common.pb.h"
/* @@protoc_insertion_point(includes) */ /* @@protoc_insertion_point(includes) */

2
src/core/tsi/alts/handshaker/handshaker.pb.h
Unescape View File

@ -3,7 +3,7 @@
#ifndef PB_GRPC_GCP_HANDSHAKER_PB_H_INCLUDED #ifndef PB_GRPC_GCP_HANDSHAKER_PB_H_INCLUDED
#define PB_GRPC_GCP_HANDSHAKER_PB_H_INCLUDED #define PB_GRPC_GCP_HANDSHAKER_PB_H_INCLUDED
#include "third_party/nanopb/pb.h" #include "pb.h"
#include "src/core/tsi/alts/handshaker/transport_security_common.pb.h" #include "src/core/tsi/alts/handshaker/transport_security_common.pb.h"
/* @@protoc_insertion_point(includes) */ /* @@protoc_insertion_point(includes) */

2
src/core/tsi/alts/handshaker/transport_security_common.pb.h
Unescape View File

@ -3,7 +3,7 @@
#ifndef PB_GRPC_GCP_TRANSPORT_SECURITY_COMMON_PB_H_INCLUDED #ifndef PB_GRPC_GCP_TRANSPORT_SECURITY_COMMON_PB_H_INCLUDED
#define PB_GRPC_GCP_TRANSPORT_SECURITY_COMMON_PB_H_INCLUDED #define PB_GRPC_GCP_TRANSPORT_SECURITY_COMMON_PB_H_INCLUDED
#include "third_party/nanopb/pb.h" #include "pb.h"
/* @@protoc_insertion_point(includes) */ /* @@protoc_insertion_point(includes) */
#if PB_PROTO_HEADER_VERSION != 30 #if PB_PROTO_HEADER_VERSION != 30
#error Regenerate this file with the current version of nanopb generator. #error Regenerate this file with the current version of nanopb generator.

4
src/core/tsi/alts/handshaker/transport_security_common_api.h
Unescape View File

@ -21,8 +21,8 @@
#include <grpc/support/port_platform.h> #include <grpc/support/port_platform.h>
#include "third_party/nanopb/pb_decode.h" #include "pb_decode.h"
#include "third_party/nanopb/pb_encode.h" #include "pb_encode.h"
#include <grpc/slice.h> #include <grpc/slice.h>
#include <grpc/slice_buffer.h> #include <grpc/slice_buffer.h>

4
src/cpp/server/health/default_health_check_service.cc
Unescape View File

@ -26,8 +26,8 @@
#include "src/cpp/server/health/default_health_check_service.h" #include "src/cpp/server/health/default_health_check_service.h"
#include "src/cpp/server/health/health.pb.h" #include "src/cpp/server/health/health.pb.h"
#include "third_party/nanopb/pb_decode.h" #include "pb_decode.h"
#include "third_party/nanopb/pb_encode.h" #include "pb_encode.h"
namespace grpc { namespace grpc {
namespace { namespace {

2
src/cpp/server/health/health.pb.h
Unescape View File

@ -3,7 +3,7 @@
#ifndef PB_GRPC_HEALTH_V1_HEALTH_PB_H_INCLUDED #ifndef PB_GRPC_HEALTH_V1_HEALTH_PB_H_INCLUDED
#define PB_GRPC_HEALTH_V1_HEALTH_PB_H_INCLUDED #define PB_GRPC_HEALTH_V1_HEALTH_PB_H_INCLUDED
#include "third_party/nanopb/pb.h" #include "pb.h"
/* @@protoc_insertion_point(includes) */ /* @@protoc_insertion_point(includes) */
#if PB_PROTO_HEADER_VERSION != 30 #if PB_PROTO_HEADER_VERSION != 30
#error Regenerate this file with the current version of nanopb generator. #error Regenerate this file with the current version of nanopb generator.

4
templates/Makefile.template
Unescape View File

@ -221,7 +221,9 @@
% endif % endif
% endfor % endfor
DEFINES += PB_FIELD_16BIT # nanopb tweaks
DEFINES += PB_FIELD_32BIT
CPPFLAGS += -Ithird_party/nanopb
CPPFLAGS += $(CPPFLAGS_$(CONFIG)) CPPFLAGS += $(CPPFLAGS_$(CONFIG))
CFLAGS += $(CFLAGS_$(CONFIG)) CFLAGS += $(CFLAGS_$(CONFIG))

19
third_party/nanopb.BUILD vendored
Unescape View File

@ -0,0 +1,19 @@
cc_library(
name = "nanopb",
srcs = [
"pb_common.c",
"pb_decode.c",
"pb_encode.c",
],
hdrs = [
"pb.h",
"pb_common.h",
"pb_decode.h",
"pb_encode.h",
],
defines = [
"PB_FIELD_32BIT=1",
],
visibility = ["//visibility:public"],
)

3
tools/codegen/core/gen_nano_proto.sh
Unescape View File

@ -74,8 +74,7 @@ pushd "$(dirname $INPUT_PROTO)" > /dev/null
protoc \ protoc \
--plugin=protoc-gen-nanopb="$GRPC_ROOT/third_party/nanopb/generator/protoc-gen-nanopb" \ --plugin=protoc-gen-nanopb="$GRPC_ROOT/third_party/nanopb/generator/protoc-gen-nanopb" \
--nanopb_out='-T -L#include\ \"third_party/nanopb/pb.h\"'":$OUTPUT_DIR" \ --nanopb_out='-T -L#include\ \"pb.h\"'":$OUTPUT_DIR" "$(basename $INPUT_PROTO)"
"$(basename $INPUT_PROTO)"
readonly PROTO_BASENAME=$(basename $INPUT_PROTO .proto) readonly PROTO_BASENAME=$(basename $INPUT_PROTO .proto)
sed -i "s:$PROTO_BASENAME.pb.h:${GRPC_OUTPUT_DIR}/$PROTO_BASENAME.pb.h:g" \ sed -i "s:$PROTO_BASENAME.pb.h:${GRPC_OUTPUT_DIR}/$PROTO_BASENAME.pb.h:g" \

Write Preview
Loading…
Cancel
Save