Skip to content

Commit

Permalink
Moved nanopb to 3rd party
Browse files Browse the repository at this point in the history
  • Loading branch information
@dgquintas
dgquintas committed Nov 12, 2015
1 parent 4943374 commit ff03847
Show file tree
Hide file tree
Showing 32 changed files with 498 additions and 3,217 deletions.
3 changes: 3 additions & 0 deletions .gitmodules
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,6 @@
[submodule "third_party/googletest"]
path = third_party/googletest
url = https://github.com/google/googletest.git
[submodule "third_party/nanopb"]
path = third_party/nanopb
url = https://github.com/nanopb/nanopb.git
54 changes: 27 additions & 27 deletions BUILD
View file
Original file line number Diff line number Diff line change
Expand Up @@ -162,12 +162,7 @@ cc_library(
"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",
Expand Down Expand Up @@ -229,6 +224,7 @@ cc_library(
"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",
Expand Down Expand Up @@ -267,6 +263,10 @@ cc_library(
"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",
Expand Down Expand Up @@ -304,11 +304,7 @@ cc_library(
"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",
Expand Down Expand Up @@ -374,6 +370,7 @@ cc_library(
"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",
Expand Down Expand Up @@ -419,6 +416,9 @@ cc_library(
"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",
Expand Down Expand Up @@ -461,12 +461,7 @@ cc_library(
"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",
Expand Down Expand Up @@ -528,6 +523,7 @@ cc_library(
"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",
Expand Down Expand Up @@ -566,6 +562,10 @@ cc_library(
"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",
Expand All @@ -583,11 +583,7 @@ cc_library(
"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",
Expand Down Expand Up @@ -653,6 +649,7 @@ cc_library(
"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",
Expand Down Expand Up @@ -698,6 +695,9 @@ cc_library(
"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",
Expand Down Expand Up @@ -1116,11 +1116,7 @@ objc_library(
"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",
Expand Down Expand Up @@ -1186,6 +1182,7 @@ objc_library(
"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",
Expand Down Expand Up @@ -1231,6 +1228,9 @@ objc_library(
"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",
Expand Down Expand Up @@ -1270,12 +1270,7 @@ objc_library(
"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",
Expand Down Expand Up @@ -1337,6 +1332,7 @@ objc_library(
"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",
Expand Down Expand Up @@ -1375,6 +1371,10 @@ objc_library(
"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",
Expand Down
30 changes: 15 additions & 15 deletions Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3696,15 +3696,15 @@ $(LIBDIR)/$(CONFIG)/pkgconfig/grpc++_unsecure.pc:
$(Q) echo "$(GRPCXX_UNSECURE_PC_FILE)" | tr , '\n' >$@

ifeq ($(NO_PROTOC),true)
$(GENDIR)/src/core/client_config/lb_policies/protos/load_balancer.pb.cc: protoc_dep_error
$(GENDIR)/src/core/client_config/lb_policies/protos/load_balancer.grpc.pb.cc: protoc_dep_error
$(GENDIR)/src/core/client_config/lb_policies/proto/load_balancer.pb.cc: protoc_dep_error
$(GENDIR)/src/core/client_config/lb_policies/proto/load_balancer.grpc.pb.cc: protoc_dep_error
else
$(GENDIR)/src/core/client_config/lb_policies/protos/load_balancer.pb.cc: src/core/client_config/lb_policies/protos/load_balancer.proto $(PROTOBUF_DEP) $(PROTOC_PLUGINS)
$(GENDIR)/src/core/client_config/lb_policies/proto/load_balancer.pb.cc: src/core/client_config/lb_policies/proto/load_balancer.proto $(PROTOBUF_DEP) $(PROTOC_PLUGINS)
$(E) "[PROTOC] Generating protobuf CC file from $<"
$(Q) mkdir -p `dirname $@`
$(Q) $(PROTOC) --cpp_out=$(GENDIR) $<

$(GENDIR)/src/core/client_config/lb_policies/protos/load_balancer.grpc.pb.cc: src/core/client_config/lb_policies/protos/load_balancer.proto $(PROTOBUF_DEP) $(PROTOC_PLUGINS)
$(GENDIR)/src/core/client_config/lb_policies/proto/load_balancer.grpc.pb.cc: src/core/client_config/lb_policies/proto/load_balancer.proto $(PROTOBUF_DEP) $(PROTOC_PLUGINS)
$(E) "[GRPC] Generating gRPC's protobuf service CC file from $<"
$(Q) mkdir -p `dirname $@`
$(Q) $(PROTOC) --grpc_out=$(GENDIR) --plugin=protoc-gen-grpc=$(BINDIR)/$(CONFIG)/grpc_cpp_plugin $<
Expand Down Expand Up @@ -4272,11 +4272,7 @@ LIBGRPC_SRC = \
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 \
Expand Down Expand Up @@ -4342,6 +4338,7 @@ LIBGRPC_SRC = \
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 \
Expand Down Expand Up @@ -4387,6 +4384,9 @@ LIBGRPC_SRC = \
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 \
Expand Down Expand Up @@ -4559,11 +4559,7 @@ LIBGRPC_UNSECURE_SRC = \
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 \
Expand Down Expand Up @@ -4629,6 +4625,7 @@ LIBGRPC_UNSECURE_SRC = \
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 \
Expand Down Expand Up @@ -4674,6 +4671,9 @@ LIBGRPC_UNSECURE_SRC = \
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 \
Expand Down Expand Up @@ -9882,7 +9882,7 @@ endif


GRPCLB_API_TEST_SRC = \
$(GENDIR)/src/core/client_config/lb_policies/protos/load_balancer.pb.cc $(GENDIR)/src/core/client_config/lb_policies/protos/load_balancer.grpc.pb.cc \
$(GENDIR)/src/core/client_config/lb_policies/proto/load_balancer.pb.cc $(GENDIR)/src/core/client_config/lb_policies/proto/load_balancer.grpc.pb.cc \
test/cpp/grpclb/grpclb_api_test.cc \

GRPCLB_API_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(GRPCLB_API_TEST_SRC))))
Expand Down Expand Up @@ -9912,7 +9912,7 @@ endif

endif

$(OBJDIR)/$(CONFIG)/src/core/client_config/lb_policies/protos/load_balancer.o: $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr.a
$(OBJDIR)/$(CONFIG)/src/core/client_config/lb_policies/proto/load_balancer.o: $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr.a
$(OBJDIR)/$(CONFIG)/test/cpp/grpclb/grpclb_api_test.o: $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr.a
deps_grpclb_api_test: $(GRPCLB_API_TEST_OBJS:.o=.dep)

Expand All @@ -9921,7 +9921,7 @@ ifneq ($(NO_DEPS),true)
-include $(GRPCLB_API_TEST_OBJS:.o=.dep)
endif
endif
$(OBJDIR)/$(CONFIG)/test/cpp/grpclb/grpclb_api_test.o: $(GENDIR)/src/core/client_config/lb_policies/protos/load_balancer.pb.cc $(GENDIR)/src/core/client_config/lb_policies/protos/load_balancer.grpc.pb.cc
$(OBJDIR)/$(CONFIG)/test/cpp/grpclb/grpclb_api_test.o: $(GENDIR)/src/core/client_config/lb_policies/proto/load_balancer.pb.cc $(GENDIR)/src/core/client_config/lb_policies/proto/load_balancer.grpc.pb.cc


ifeq ($(NO_SECURE),true)
Expand Down
8 changes: 4 additions & 4 deletions binding.gyp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -185,11 +185,7 @@
'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',
Expand Down Expand Up @@ -255,6 +251,7 @@
'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',
Expand Down Expand Up @@ -300,6 +297,9 @@
'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',
Expand Down
Loading

0 comments on commit ff03847

Please sign in to comment.