moved grpc_library.cc moved out of codegen

pull/5354/head^2
David Garcia Quintas 9 years ago
parent 2173eea18b
commit a37d9d8c59
  1. 2
      BUILD
  2. 3
      Makefile
  3. 4
      build.yaml
  4. 1
      tools/doxygen/Doxyfile.c++.internal
  5. 4
      tools/run_tests/sources_and_headers.json
  6. 2
      vsprojects/vcxproj/grpc++/grpc++.vcxproj
  7. 6
      vsprojects/vcxproj/grpc++/grpc++.vcxproj.filters
  8. 4
      vsprojects/vcxproj/grpc++_codegen_lib/grpc++_codegen_lib.vcxproj
  9. 14
      vsprojects/vcxproj/grpc++_codegen_lib/grpc++_codegen_lib.vcxproj.filters

@ -775,6 +775,7 @@ cc_library(
"src/cpp/server/dynamic_thread_pool.h", "src/cpp/server/dynamic_thread_pool.h",
"src/cpp/server/thread_pool_interface.h", "src/cpp/server/thread_pool_interface.h",
"src/cpp/client/secure_credentials.cc", "src/cpp/client/secure_credentials.cc",
"src/cpp/codegen/grpc_library.cc",
"src/cpp/common/auth_property_iterator.cc", "src/cpp/common/auth_property_iterator.cc",
"src/cpp/common/secure_auth_context.cc", "src/cpp/common/secure_auth_context.cc",
"src/cpp/common/secure_channel_arguments.cc", "src/cpp/common/secure_channel_arguments.cc",
@ -883,7 +884,6 @@ cc_library(
"include/grpc/impl/codegen/sync_posix.h", "include/grpc/impl/codegen/sync_posix.h",
"include/grpc/impl/codegen/sync_win32.h", "include/grpc/impl/codegen/sync_win32.h",
"include/grpc/impl/codegen/time.h", "include/grpc/impl/codegen/time.h",
"src/cpp/codegen/grpc_library.cc",
], ],
hdrs = [ hdrs = [
"include/grpc++/impl/codegen/async_stream.h", "include/grpc++/impl/codegen/async_stream.h",

@ -2952,6 +2952,7 @@ endif
LIBGRPC++_SRC = \ LIBGRPC++_SRC = \
src/cpp/client/secure_credentials.cc \ src/cpp/client/secure_credentials.cc \
src/cpp/codegen/grpc_library.cc \
src/cpp/common/auth_property_iterator.cc \ src/cpp/common/auth_property_iterator.cc \
src/cpp/common/secure_auth_context.cc \ src/cpp/common/secure_auth_context.cc \
src/cpp/common/secure_channel_arguments.cc \ src/cpp/common/secure_channel_arguments.cc \
@ -3094,7 +3095,6 @@ endif
LIBGRPC++_CODEGEN_LIB_SRC = \ LIBGRPC++_CODEGEN_LIB_SRC = \
src/cpp/codegen/grpc_library.cc \
PUBLIC_HEADERS_CXX += \ PUBLIC_HEADERS_CXX += \
include/grpc++/impl/codegen/async_stream.h \ include/grpc++/impl/codegen/async_stream.h \
@ -13040,6 +13040,7 @@ src/core/tsi/fake_transport_security.c: $(OPENSSL_DEP)
src/core/tsi/ssl_transport_security.c: $(OPENSSL_DEP) src/core/tsi/ssl_transport_security.c: $(OPENSSL_DEP)
src/core/tsi/transport_security.c: $(OPENSSL_DEP) src/core/tsi/transport_security.c: $(OPENSSL_DEP)
src/cpp/client/secure_credentials.cc: $(OPENSSL_DEP) src/cpp/client/secure_credentials.cc: $(OPENSSL_DEP)
src/cpp/codegen/grpc_library.cc: $(OPENSSL_DEP)
src/cpp/common/auth_property_iterator.cc: $(OPENSSL_DEP) src/cpp/common/auth_property_iterator.cc: $(OPENSSL_DEP)
src/cpp/common/secure_auth_context.cc: $(OPENSSL_DEP) src/cpp/common/secure_auth_context.cc: $(OPENSSL_DEP)
src/cpp/common/secure_channel_arguments.cc: $(OPENSSL_DEP) src/cpp/common/secure_channel_arguments.cc: $(OPENSSL_DEP)

@ -643,6 +643,7 @@ libs:
- src/cpp/server/secure_server_credentials.h - src/cpp/server/secure_server_credentials.h
src: src:
- src/cpp/client/secure_credentials.cc - src/cpp/client/secure_credentials.cc
- src/cpp/codegen/grpc_library.cc
- src/cpp/common/auth_property_iterator.cc - src/cpp/common/auth_property_iterator.cc
- src/cpp/common/secure_auth_context.cc - src/cpp/common/secure_auth_context.cc
- src/cpp/common/secure_channel_arguments.cc - src/cpp/common/secure_channel_arguments.cc
@ -706,8 +707,7 @@ libs:
- include/grpc/impl/codegen/sync_posix.h - include/grpc/impl/codegen/sync_posix.h
- include/grpc/impl/codegen/sync_win32.h - include/grpc/impl/codegen/sync_win32.h
- include/grpc/impl/codegen/time.h - include/grpc/impl/codegen/time.h
src: src: []
- src/cpp/codegen/grpc_library.cc
private: true private: true
secure: false secure: false
- name: grpc++_test_config - name: grpc++_test_config

@ -812,6 +812,7 @@ src/cpp/common/create_auth_context.h \
src/cpp/server/dynamic_thread_pool.h \ src/cpp/server/dynamic_thread_pool.h \
src/cpp/server/thread_pool_interface.h \ src/cpp/server/thread_pool_interface.h \
src/cpp/client/secure_credentials.cc \ src/cpp/client/secure_credentials.cc \
src/cpp/codegen/grpc_library.cc \
src/cpp/common/auth_property_iterator.cc \ src/cpp/common/auth_property_iterator.cc \
src/cpp/common/secure_auth_context.cc \ src/cpp/common/secure_auth_context.cc \
src/cpp/common/secure_channel_arguments.cc \ src/cpp/common/secure_channel_arguments.cc \

@ -4044,6 +4044,7 @@
"src/cpp/client/insecure_credentials.cc", "src/cpp/client/insecure_credentials.cc",
"src/cpp/client/secure_credentials.cc", "src/cpp/client/secure_credentials.cc",
"src/cpp/client/secure_credentials.h", "src/cpp/client/secure_credentials.h",
"src/cpp/codegen/grpc_library.cc",
"src/cpp/common/alarm.cc", "src/cpp/common/alarm.cc",
"src/cpp/common/auth_property_iterator.cc", "src/cpp/common/auth_property_iterator.cc",
"src/cpp/common/call.cc", "src/cpp/common/call.cc",
@ -4169,8 +4170,7 @@
"include/grpc/impl/codegen/sync_generic.h", "include/grpc/impl/codegen/sync_generic.h",
"include/grpc/impl/codegen/sync_posix.h", "include/grpc/impl/codegen/sync_posix.h",
"include/grpc/impl/codegen/sync_win32.h", "include/grpc/impl/codegen/sync_win32.h",
"include/grpc/impl/codegen/time.h", "include/grpc/impl/codegen/time.h"
"src/cpp/codegen/grpc_library.cc"
] ]
}, },
{ {

@ -315,6 +315,8 @@
<ItemGroup> <ItemGroup>
<ClCompile Include="$(SolutionDir)\..\src\cpp\client\secure_credentials.cc"> <ClCompile Include="$(SolutionDir)\..\src\cpp\client\secure_credentials.cc">
</ClCompile> </ClCompile>
<ClCompile Include="$(SolutionDir)\..\src\cpp\codegen\grpc_library.cc">
</ClCompile>
<ClCompile Include="$(SolutionDir)\..\src\cpp\common\auth_property_iterator.cc"> <ClCompile Include="$(SolutionDir)\..\src\cpp\common\auth_property_iterator.cc">
</ClCompile> </ClCompile>
<ClCompile Include="$(SolutionDir)\..\src\cpp\common\secure_auth_context.cc"> <ClCompile Include="$(SolutionDir)\..\src\cpp\common\secure_auth_context.cc">

@ -4,6 +4,9 @@
<ClCompile Include="$(SolutionDir)\..\src\cpp\client\secure_credentials.cc"> <ClCompile Include="$(SolutionDir)\..\src\cpp\client\secure_credentials.cc">
<Filter>src\cpp\client</Filter> <Filter>src\cpp\client</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="$(SolutionDir)\..\src\cpp\codegen\grpc_library.cc">
<Filter>src\cpp\codegen</Filter>
</ClCompile>
<ClCompile Include="$(SolutionDir)\..\src\cpp\common\auth_property_iterator.cc"> <ClCompile Include="$(SolutionDir)\..\src\cpp\common\auth_property_iterator.cc">
<Filter>src\cpp\common</Filter> <Filter>src\cpp\common</Filter>
</ClCompile> </ClCompile>
@ -284,6 +287,9 @@
<Filter Include="src\cpp\client"> <Filter Include="src\cpp\client">
<UniqueIdentifier>{7febf32a-d7a6-76fa-9e17-f189f591c062}</UniqueIdentifier> <UniqueIdentifier>{7febf32a-d7a6-76fa-9e17-f189f591c062}</UniqueIdentifier>
</Filter> </Filter>
<Filter Include="src\cpp\codegen">
<UniqueIdentifier>{3c3e27f4-d3d9-3c42-5204-08b5e839f2de}</UniqueIdentifier>
</Filter>
<Filter Include="src\cpp\common"> <Filter Include="src\cpp\common">
<UniqueIdentifier>{2336e396-7e0b-8bf9-3b09-adc6ad1f0e5b}</UniqueIdentifier> <UniqueIdentifier>{2336e396-7e0b-8bf9-3b09-adc6ad1f0e5b}</UniqueIdentifier>
</Filter> </Filter>

@ -194,10 +194,6 @@
<ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\sync_win32.h" /> <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\sync_win32.h" />
<ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\time.h" /> <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\time.h" />
</ItemGroup> </ItemGroup>
<ItemGroup>
<ClCompile Include="$(SolutionDir)\..\src\cpp\codegen\grpc_library.cc">
</ClCompile>
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets"> <ImportGroup Label="ExtensionTargets">
</ImportGroup> </ImportGroup>

@ -1,10 +1,5 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<ClCompile Include="$(SolutionDir)\..\src\cpp\codegen\grpc_library.cc">
<Filter>src\cpp\codegen</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="$(SolutionDir)\..\include\grpc++\impl\codegen\async_stream.h"> <ClInclude Include="$(SolutionDir)\..\include\grpc++\impl\codegen\async_stream.h">
<Filter>include\grpc++\impl\codegen</Filter> <Filter>include\grpc++\impl\codegen</Filter>
@ -167,15 +162,6 @@
<Filter Include="include\grpc\impl\codegen"> <Filter Include="include\grpc\impl\codegen">
<UniqueIdentifier>{311586c5-1a08-e1ba-8dd8-d1cbe10156b3}</UniqueIdentifier> <UniqueIdentifier>{311586c5-1a08-e1ba-8dd8-d1cbe10156b3}</UniqueIdentifier>
</Filter> </Filter>
<Filter Include="src">
<UniqueIdentifier>{e9bdb195-1cf9-a0f4-231c-fcee59eb54ca}</UniqueIdentifier>
</Filter>
<Filter Include="src\cpp">
<UniqueIdentifier>{d2e57ea3-c758-0f7c-3bc9-e71dd87bd654}</UniqueIdentifier>
</Filter>
<Filter Include="src\cpp\codegen">
<UniqueIdentifier>{f93ade18-7c50-7ed9-b8e7-383b11f077c2}</UniqueIdentifier>
</Filter>
</ItemGroup> </ItemGroup>
</Project> </Project>

Loading…
Cancel
Save