Spliting filegroup.

pull/6792/head
yang-g 9 years ago
parent aaee544d69
commit 34b5861e5c
  1. 4
      Makefile
  2. 11
      build.yaml
  3. 2
      test/cpp/util/proto_file_parser.cc
  4. 24
      tools/run_tests/sources_and_headers.json
  5. 2
      vsprojects/vcxproj/test/codegen_test_full/codegen_test_full.vcxproj
  6. 9
      vsprojects/vcxproj/test/codegen_test_full/codegen_test_full.vcxproj.filters

@ -10009,7 +10009,6 @@ CODEGEN_TEST_FULL_SRC = \
$(GENDIR)/src/proto/grpc/testing/services.pb.cc $(GENDIR)/src/proto/grpc/testing/services.grpc.pb.cc \
$(GENDIR)/src/proto/grpc/testing/stats.pb.cc $(GENDIR)/src/proto/grpc/testing/stats.grpc.pb.cc \
test/cpp/codegen/codegen_test_full.cc \
src/cpp/codegen/codegen_init.cc \
CODEGEN_TEST_FULL_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(CODEGEN_TEST_FULL_SRC))))
ifeq ($(NO_SECURE),true)
@ -10052,8 +10051,6 @@ $(OBJDIR)/$(CONFIG)/src/proto/grpc/testing/stats.o: $(LIBDIR)/$(CONFIG)/libgrpc
$(OBJDIR)/$(CONFIG)/test/cpp/codegen/codegen_test_full.o: $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr.a
$(OBJDIR)/$(CONFIG)/src/cpp/codegen/codegen_init.o: $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr.a
deps_codegen_test_full: $(CODEGEN_TEST_FULL_OBJS:.o=.dep)
ifneq ($(NO_SECURE),true)
@ -10062,7 +10059,6 @@ ifneq ($(NO_DEPS),true)
endif
endif
$(OBJDIR)/$(CONFIG)/test/cpp/codegen/codegen_test_full.o: $(GENDIR)/src/proto/grpc/testing/control.pb.cc $(GENDIR)/src/proto/grpc/testing/control.grpc.pb.cc $(GENDIR)/src/proto/grpc/testing/messages.pb.cc $(GENDIR)/src/proto/grpc/testing/messages.grpc.pb.cc $(GENDIR)/src/proto/grpc/testing/payloads.pb.cc $(GENDIR)/src/proto/grpc/testing/payloads.grpc.pb.cc $(GENDIR)/src/proto/grpc/testing/services.pb.cc $(GENDIR)/src/proto/grpc/testing/services.grpc.pb.cc $(GENDIR)/src/proto/grpc/testing/stats.pb.cc $(GENDIR)/src/proto/grpc/testing/stats.grpc.pb.cc
$(OBJDIR)/$(CONFIG)/src/cpp/codegen/codegen_init.o: $(GENDIR)/src/proto/grpc/testing/control.pb.cc $(GENDIR)/src/proto/grpc/testing/control.grpc.pb.cc $(GENDIR)/src/proto/grpc/testing/messages.pb.cc $(GENDIR)/src/proto/grpc/testing/messages.grpc.pb.cc $(GENDIR)/src/proto/grpc/testing/payloads.pb.cc $(GENDIR)/src/proto/grpc/testing/payloads.grpc.pb.cc $(GENDIR)/src/proto/grpc/testing/services.pb.cc $(GENDIR)/src/proto/grpc/testing/services.grpc.pb.cc $(GENDIR)/src/proto/grpc/testing/stats.pb.cc $(GENDIR)/src/proto/grpc/testing/stats.grpc.pb.cc
CODEGEN_TEST_MINIMAL_SRC = \

@ -143,6 +143,11 @@ filegroups:
- include/grpc/impl/codegen/sync_posix.h
- include/grpc/impl/codegen/sync_windows.h
- include/grpc/impl/codegen/time.h
- name: grpc++_codegen_base_src
src:
- src/cpp/codegen/codegen_init.cc
uses:
- grpc++_codegen_base
- name: grpc_base
public_headers:
- include/grpc/byte_buffer.h
@ -728,8 +733,6 @@ filegroups:
- include/grpc++/impl/codegen/sync_no_cxx11.h
- include/grpc++/impl/codegen/sync_stream.h
- include/grpc++/impl/codegen/time.h
src:
- src/cpp/codegen/codegen_init.cc
uses:
- grpc_codegen
- name: grpc++_codegen_proto
@ -927,6 +930,7 @@ libs:
filegroups:
- grpc++_base
- grpc++_codegen_base
- grpc++_codegen_base_src
secure: check
vs_project_guid: '{C187A093-A0FE-489D-A40A-6E33DE0F9FEB}'
- name: grpc++_test_config
@ -961,6 +965,7 @@ libs:
- grpc_test_util
filegroups:
- grpc++_codegen_base
- grpc++_codegen_base_src
- grpc++_codegen_proto
- grpc++_config_proto
- name: grpc++_unsecure
@ -976,6 +981,7 @@ libs:
filegroups:
- grpc++_base
- grpc++_codegen_base
- grpc++_codegen_base_src
secure: false
vs_project_guid: '{6EE56155-DF7C-4F6E-BFC4-F6F776BEB211}'
- name: grpc_cli_libs
@ -2477,6 +2483,7 @@ targets:
- test/cpp/codegen/codegen_test_minimal.cc
filegroups:
- grpc++_codegen_base
- grpc++_codegen_base_src
- name: credentials_test
gtest: true
build: test

@ -37,8 +37,8 @@
#include <iostream>
#include <sstream>
#include <grpc++/support/config.h>
#include <google/protobuf/text_format.h>
#include <grpc++/support/config.h>
namespace grpc {
namespace testing {

@ -1928,7 +1928,8 @@
},
{
"deps": [
"grpc++_codegen_base"
"grpc++_codegen_base",
"grpc++_codegen_base_src"
],
"headers": [
"src/proto/grpc/testing/control.grpc.pb.h",
@ -4241,7 +4242,8 @@
"deps": [
"grpc",
"grpc++_base",
"grpc++_codegen_base"
"grpc++_codegen_base",
"grpc++_codegen_base_src"
],
"headers": [
"src/cpp/client/secure_credentials.h",
@ -4284,6 +4286,7 @@
"deps": [
"grpc++",
"grpc++_codegen_base",
"grpc++_codegen_base_src",
"grpc++_codegen_proto",
"grpc++_config_proto",
"grpc_test_util"
@ -4327,6 +4330,7 @@
"grpc",
"grpc++_base",
"grpc++_codegen_base",
"grpc++_codegen_base_src",
"grpc_unsecure"
],
"headers": [],
@ -5555,6 +5559,19 @@
"third_party": false,
"type": "filegroup"
},
{
"deps": [
"grpc++_codegen_base"
],
"headers": [],
"language": "c",
"name": "grpc++_codegen_base_src",
"src": [
"src/cpp/codegen/codegen_init.cc"
],
"third_party": false,
"type": "filegroup"
},
{
"deps": [
"gpr",
@ -6549,8 +6566,7 @@
"include/grpc++/impl/codegen/sync_cxx11.h",
"include/grpc++/impl/codegen/sync_no_cxx11.h",
"include/grpc++/impl/codegen/sync_stream.h",
"include/grpc++/impl/codegen/time.h",
"src/cpp/codegen/codegen_init.cc"
"include/grpc++/impl/codegen/time.h"
],
"third_party": false,
"type": "filegroup"

@ -255,8 +255,6 @@
</ClInclude>
<ClCompile Include="$(SolutionDir)\..\test\cpp\codegen\codegen_test_full.cc">
</ClCompile>
<ClCompile Include="$(SolutionDir)\..\src\cpp\codegen\codegen_init.cc">
</ClCompile>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="$(SolutionDir)\..\vsprojects\vcxproj\.\grpc++\grpc++.vcxproj">

@ -19,9 +19,6 @@
<ClCompile Include="$(SolutionDir)\..\test\cpp\codegen\codegen_test_full.cc">
<Filter>test\cpp\codegen</Filter>
</ClCompile>
<ClCompile Include="$(SolutionDir)\..\src\cpp\codegen\codegen_init.cc">
<Filter>src\cpp\codegen</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="$(SolutionDir)\..\include\grpc++\impl\codegen\async_stream.h">
@ -207,12 +204,6 @@
<Filter Include="src">
<UniqueIdentifier>{909027fc-be54-d7d9-3e0b-b034a6f7ff8f}</UniqueIdentifier>
</Filter>
<Filter Include="src\cpp">
<UniqueIdentifier>{0944bc3e-4288-3a9e-81df-b4eb0910e74f}</UniqueIdentifier>
</Filter>
<Filter Include="src\cpp\codegen">
<UniqueIdentifier>{88566202-70b0-f87e-2ce8-3cd61e5a57da}</UniqueIdentifier>
</Filter>
<Filter Include="src\proto">
<UniqueIdentifier>{84c6b0c4-1143-abcf-cc7b-3ee6ef87f16a}</UniqueIdentifier>
</Filter>

Loading…
Cancel
Save