Chiebot-Mirror
/
grpc
mirror of https://github.com/grpc/grpc.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #1099 from nicolasnoble/build-regen

Browse Source 
Adding missing public files to build.json, and re-generating all project files.
pull/1102/head
Jan Tattermusch 10 years ago
parent 889b5e1d0e 51f5b91715
commit 49d0df3cbc
14 changed files with 59 additions and 0 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. 5
      Makefile
  2. 3
      build.json
  3. 1
      vsprojects/vs2013/gpr.vcxproj
  4. 3
      vsprojects/vs2013/gpr.vcxproj.filters
  5. 1
      vsprojects/vs2013/gpr_shared.vcxproj
  6. 3
      vsprojects/vs2013/gpr_shared.vcxproj.filters
  7. 10
      vsprojects/vs2013/grpc++.vcxproj
  8. 21
      vsprojects/vs2013/grpc++.vcxproj.filters
  9. 1
      vsprojects/vs2013/grpc.vcxproj
  10. 3
      vsprojects/vs2013/grpc.vcxproj.filters
  11. 1
      vsprojects/vs2013/grpc_shared.vcxproj
  12. 3
      vsprojects/vs2013/grpc_shared.vcxproj.filters
  13. 1
      vsprojects/vs2013/grpc_unsecure.vcxproj
  14. 3
      vsprojects/vs2013/grpc_unsecure.vcxproj.filters

5
Makefile
Unescape View File

@ -2331,6 +2331,7 @@ PUBLIC_HEADERS_C += \
include/grpc/support/atm_win32.h \ include/grpc/support/atm_win32.h \
include/grpc/support/cancellable_platform.h \ include/grpc/support/cancellable_platform.h \
include/grpc/support/cmdline.h \ include/grpc/support/cmdline.h \
include/grpc/support/cpu.h \
include/grpc/support/histogram.h \ include/grpc/support/histogram.h \
include/grpc/support/host_port.h \ include/grpc/support/host_port.h \
include/grpc/support/log.h \ include/grpc/support/log.h \
@ -2585,6 +2586,7 @@ PUBLIC_HEADERS_C += \
include/grpc/byte_buffer.h \ include/grpc/byte_buffer.h \
include/grpc/byte_buffer_reader.h \ include/grpc/byte_buffer_reader.h \
include/grpc/grpc.h \ include/grpc/grpc.h \
include/grpc/grpc_http.h \
include/grpc/status.h \ include/grpc/status.h \
LIBGRPC_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(LIBGRPC_SRC)))) LIBGRPC_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(LIBGRPC_SRC))))
@ -3066,6 +3068,7 @@ PUBLIC_HEADERS_C += \
include/grpc/byte_buffer.h \ include/grpc/byte_buffer.h \
include/grpc/byte_buffer_reader.h \ include/grpc/byte_buffer_reader.h \
include/grpc/grpc.h \ include/grpc/grpc.h \
include/grpc/grpc_http.h \
include/grpc/status.h \ include/grpc/status.h \
LIBGRPC_UNSECURE_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(LIBGRPC_UNSECURE_SRC)))) LIBGRPC_UNSECURE_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(LIBGRPC_UNSECURE_SRC))))
@ -3239,6 +3242,7 @@ PUBLIC_HEADERS_CXX += \
include/grpc++/config.h \ include/grpc++/config.h \
include/grpc++/create_channel.h \ include/grpc++/create_channel.h \
include/grpc++/credentials.h \ include/grpc++/credentials.h \
include/grpc++/generic_stub.h \
include/grpc++/impl/call.h \ include/grpc++/impl/call.h \
include/grpc++/impl/client_unary_call.h \ include/grpc++/impl/client_unary_call.h \
include/grpc++/impl/internal_stub.h \ include/grpc++/impl/internal_stub.h \
@ -3483,6 +3487,7 @@ PUBLIC_HEADERS_CXX += \
include/grpc++/config.h \ include/grpc++/config.h \
include/grpc++/create_channel.h \ include/grpc++/create_channel.h \
include/grpc++/credentials.h \ include/grpc++/credentials.h \
include/grpc++/generic_stub.h \
include/grpc++/impl/call.h \ include/grpc++/impl/call.h \
include/grpc++/impl/client_unary_call.h \ include/grpc++/impl/client_unary_call.h \
include/grpc++/impl/internal_stub.h \ include/grpc++/impl/internal_stub.h \

3
build.json
Unescape View File

@ -22,6 +22,7 @@
"include/grpc++/config.h", "include/grpc++/config.h",
"include/grpc++/create_channel.h", "include/grpc++/create_channel.h",
"include/grpc++/credentials.h", "include/grpc++/credentials.h",
"include/grpc++/generic_stub.h",
"include/grpc++/impl/call.h", "include/grpc++/impl/call.h",
"include/grpc++/impl/client_unary_call.h", "include/grpc++/impl/client_unary_call.h",
"include/grpc++/impl/internal_stub.h", "include/grpc++/impl/internal_stub.h",
@ -76,6 +77,7 @@
"include/grpc/byte_buffer.h", "include/grpc/byte_buffer.h",
"include/grpc/byte_buffer_reader.h", "include/grpc/byte_buffer_reader.h",
"include/grpc/grpc.h", "include/grpc/grpc.h",
"include/grpc/grpc_http.h",
"include/grpc/status.h" "include/grpc/status.h"
], ],
"headers": [ "headers": [
@ -278,6 +280,7 @@
"include/grpc/support/atm_win32.h", "include/grpc/support/atm_win32.h",
"include/grpc/support/cancellable_platform.h", "include/grpc/support/cancellable_platform.h",
"include/grpc/support/cmdline.h", "include/grpc/support/cmdline.h",
"include/grpc/support/cpu.h",
"include/grpc/support/histogram.h", "include/grpc/support/histogram.h",
"include/grpc/support/host_port.h", "include/grpc/support/host_port.h",
"include/grpc/support/log.h", "include/grpc/support/log.h",

1
vsprojects/vs2013/gpr.vcxproj
Unescape View File

@ -85,6 +85,7 @@
<ClInclude Include="..\..\include\grpc\support\atm_win32.h" /> <ClInclude Include="..\..\include\grpc\support\atm_win32.h" />
<ClInclude Include="..\..\include\grpc\support\cancellable_platform.h" /> <ClInclude Include="..\..\include\grpc\support\cancellable_platform.h" />
<ClInclude Include="..\..\include\grpc\support\cmdline.h" /> <ClInclude Include="..\..\include\grpc\support\cmdline.h" />
<ClInclude Include="..\..\include\grpc\support\cpu.h" />
<ClInclude Include="..\..\include\grpc\support\histogram.h" /> <ClInclude Include="..\..\include\grpc\support\histogram.h" />
<ClInclude Include="..\..\include\grpc\support\host_port.h" /> <ClInclude Include="..\..\include\grpc\support\host_port.h" />
<ClInclude Include="..\..\include\grpc\support\log.h" /> <ClInclude Include="..\..\include\grpc\support\log.h" />

3
vsprojects/vs2013/gpr.vcxproj.filters
Unescape View File

@ -123,6 +123,9 @@
<ClInclude Include="..\..\include\grpc\support\cmdline.h"> <ClInclude Include="..\..\include\grpc\support\cmdline.h">
<Filter>include\grpc\support</Filter> <Filter>include\grpc\support</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\..\include\grpc\support\cpu.h">
<Filter>include\grpc\support</Filter>
</ClInclude>
<ClInclude Include="..\..\include\grpc\support\histogram.h"> <ClInclude Include="..\..\include\grpc\support\histogram.h">
<Filter>include\grpc\support</Filter> <Filter>include\grpc\support</Filter>
</ClInclude> </ClInclude>

1
vsprojects/vs2013/gpr_shared.vcxproj
Unescape View File

@ -85,6 +85,7 @@
<ClInclude Include="..\..\include\grpc\support\atm_win32.h" /> <ClInclude Include="..\..\include\grpc\support\atm_win32.h" />
<ClInclude Include="..\..\include\grpc\support\cancellable_platform.h" /> <ClInclude Include="..\..\include\grpc\support\cancellable_platform.h" />
<ClInclude Include="..\..\include\grpc\support\cmdline.h" /> <ClInclude Include="..\..\include\grpc\support\cmdline.h" />
<ClInclude Include="..\..\include\grpc\support\cpu.h" />
<ClInclude Include="..\..\include\grpc\support\histogram.h" /> <ClInclude Include="..\..\include\grpc\support\histogram.h" />
<ClInclude Include="..\..\include\grpc\support\host_port.h" /> <ClInclude Include="..\..\include\grpc\support\host_port.h" />
<ClInclude Include="..\..\include\grpc\support\log.h" /> <ClInclude Include="..\..\include\grpc\support\log.h" />

3
vsprojects/vs2013/gpr_shared.vcxproj.filters
Unescape View File

@ -123,6 +123,9 @@
<ClInclude Include="..\..\include\grpc\support\cmdline.h"> <ClInclude Include="..\..\include\grpc\support\cmdline.h">
<Filter>include\grpc\support</Filter> <Filter>include\grpc\support</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\..\include\grpc\support\cpu.h">
<Filter>include\grpc\support</Filter>
</ClInclude>
<ClInclude Include="..\..\include\grpc\support\histogram.h"> <ClInclude Include="..\..\include\grpc\support\histogram.h">
<Filter>include\grpc\support</Filter> <Filter>include\grpc\support</Filter>
</ClInclude> </ClInclude>

10
vsprojects/vs2013/grpc++.vcxproj
Unescape View File

@ -78,7 +78,9 @@
</Link> </Link>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="..\..\include\grpc++\async_generic_service.h" />
<ClInclude Include="..\..\include\grpc++\async_unary_call.h" /> <ClInclude Include="..\..\include\grpc++\async_unary_call.h" />
<ClInclude Include="..\..\include\grpc++\byte_buffer.h" />
<ClInclude Include="..\..\include\grpc++\channel_arguments.h" /> <ClInclude Include="..\..\include\grpc++\channel_arguments.h" />
<ClInclude Include="..\..\include\grpc++\channel_interface.h" /> <ClInclude Include="..\..\include\grpc++\channel_interface.h" />
<ClInclude Include="..\..\include\grpc++\client_context.h" /> <ClInclude Include="..\..\include\grpc++\client_context.h" />
@ -86,6 +88,7 @@
<ClInclude Include="..\..\include\grpc++\config.h" /> <ClInclude Include="..\..\include\grpc++\config.h" />
<ClInclude Include="..\..\include\grpc++\create_channel.h" /> <ClInclude Include="..\..\include\grpc++\create_channel.h" />
<ClInclude Include="..\..\include\grpc++\credentials.h" /> <ClInclude Include="..\..\include\grpc++\credentials.h" />
<ClInclude Include="..\..\include\grpc++\generic_stub.h" />
<ClInclude Include="..\..\include\grpc++\impl\call.h" /> <ClInclude Include="..\..\include\grpc++\impl\call.h" />
<ClInclude Include="..\..\include\grpc++\impl\client_unary_call.h" /> <ClInclude Include="..\..\include\grpc++\impl\client_unary_call.h" />
<ClInclude Include="..\..\include\grpc++\impl\internal_stub.h" /> <ClInclude Include="..\..\include\grpc++\impl\internal_stub.h" />
@ -96,6 +99,7 @@
<ClInclude Include="..\..\include\grpc++\server_builder.h" /> <ClInclude Include="..\..\include\grpc++\server_builder.h" />
<ClInclude Include="..\..\include\grpc++\server_context.h" /> <ClInclude Include="..\..\include\grpc++\server_context.h" />
<ClInclude Include="..\..\include\grpc++\server_credentials.h" /> <ClInclude Include="..\..\include\grpc++\server_credentials.h" />
<ClInclude Include="..\..\include\grpc++\slice.h" />
<ClInclude Include="..\..\include\grpc++\status.h" /> <ClInclude Include="..\..\include\grpc++\status.h" />
<ClInclude Include="..\..\include\grpc++\status_code_enum.h" /> <ClInclude Include="..\..\include\grpc++\status_code_enum.h" />
<ClInclude Include="..\..\include\grpc++\stream.h" /> <ClInclude Include="..\..\include\grpc++\stream.h" />
@ -136,6 +140,8 @@
</ClCompile> </ClCompile>
<ClCompile Include="..\..\src\cpp\proto\proto_utils.cc"> <ClCompile Include="..\..\src\cpp\proto\proto_utils.cc">
</ClCompile> </ClCompile>
<ClCompile Include="..\..\src\cpp\server\async_generic_service.cc">
</ClCompile>
<ClCompile Include="..\..\src\cpp\server\insecure_server_credentials.cc"> <ClCompile Include="..\..\src\cpp\server\insecure_server_credentials.cc">
</ClCompile> </ClCompile>
<ClCompile Include="..\..\src\cpp\server\server.cc"> <ClCompile Include="..\..\src\cpp\server\server.cc">
@ -148,6 +154,10 @@
</ClCompile> </ClCompile>
<ClCompile Include="..\..\src\cpp\server\thread_pool.cc"> <ClCompile Include="..\..\src\cpp\server\thread_pool.cc">
</ClCompile> </ClCompile>
<ClCompile Include="..\..\src\cpp\util\byte_buffer.cc">
</ClCompile>
<ClCompile Include="..\..\src\cpp\util\slice.cc">
</ClCompile>
<ClCompile Include="..\..\src\cpp\util\status.cc"> <ClCompile Include="..\..\src\cpp\util\status.cc">
</ClCompile> </ClCompile>
<ClCompile Include="..\..\src\cpp\util\time.cc"> <ClCompile Include="..\..\src\cpp\util\time.cc">

21
vsprojects/vs2013/grpc++.vcxproj.filters
Unescape View File

@ -43,6 +43,9 @@
<ClCompile Include="..\..\src\cpp\proto\proto_utils.cc"> <ClCompile Include="..\..\src\cpp\proto\proto_utils.cc">
<Filter>src\cpp\proto</Filter> <Filter>src\cpp\proto</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\src\cpp\server\async_generic_service.cc">
<Filter>src\cpp\server</Filter>
</ClCompile>
<ClCompile Include="..\..\src\cpp\server\insecure_server_credentials.cc"> <ClCompile Include="..\..\src\cpp\server\insecure_server_credentials.cc">
<Filter>src\cpp\server</Filter> <Filter>src\cpp\server</Filter>
</ClCompile> </ClCompile>
@ -61,6 +64,12 @@
<ClCompile Include="..\..\src\cpp\server\thread_pool.cc"> <ClCompile Include="..\..\src\cpp\server\thread_pool.cc">
<Filter>src\cpp\server</Filter> <Filter>src\cpp\server</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\src\cpp\util\byte_buffer.cc">
<Filter>src\cpp\util</Filter>
</ClCompile>
<ClCompile Include="..\..\src\cpp\util\slice.cc">
<Filter>src\cpp\util</Filter>
</ClCompile>
<ClCompile Include="..\..\src\cpp\util\status.cc"> <ClCompile Include="..\..\src\cpp\util\status.cc">
<Filter>src\cpp\util</Filter> <Filter>src\cpp\util</Filter>
</ClCompile> </ClCompile>
@ -69,9 +78,15 @@
</ClCompile> </ClCompile>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="..\..\include\grpc++\async_generic_service.h">
<Filter>include\grpc++</Filter>
</ClInclude>
<ClInclude Include="..\..\include\grpc++\async_unary_call.h"> <ClInclude Include="..\..\include\grpc++\async_unary_call.h">
<Filter>include\grpc++</Filter> <Filter>include\grpc++</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\..\include\grpc++\byte_buffer.h">
<Filter>include\grpc++</Filter>
</ClInclude>
<ClInclude Include="..\..\include\grpc++\channel_arguments.h"> <ClInclude Include="..\..\include\grpc++\channel_arguments.h">
<Filter>include\grpc++</Filter> <Filter>include\grpc++</Filter>
</ClInclude> </ClInclude>
@ -93,6 +108,9 @@
<ClInclude Include="..\..\include\grpc++\credentials.h"> <ClInclude Include="..\..\include\grpc++\credentials.h">
<Filter>include\grpc++</Filter> <Filter>include\grpc++</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\..\include\grpc++\generic_stub.h">
<Filter>include\grpc++</Filter>
</ClInclude>
<ClInclude Include="..\..\include\grpc++\impl\call.h"> <ClInclude Include="..\..\include\grpc++\impl\call.h">
<Filter>include\grpc++\impl</Filter> <Filter>include\grpc++\impl</Filter>
</ClInclude> </ClInclude>
@ -123,6 +141,9 @@
<ClInclude Include="..\..\include\grpc++\server_credentials.h"> <ClInclude Include="..\..\include\grpc++\server_credentials.h">
<Filter>include\grpc++</Filter> <Filter>include\grpc++</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\..\include\grpc++\slice.h">
<Filter>include\grpc++</Filter>
</ClInclude>
<ClInclude Include="..\..\include\grpc++\status.h"> <ClInclude Include="..\..\include\grpc++\status.h">
<Filter>include\grpc++</Filter> <Filter>include\grpc++</Filter>
</ClInclude> </ClInclude>

1
vsprojects/vs2013/grpc.vcxproj
Unescape View File

@ -82,6 +82,7 @@
<ClInclude Include="..\..\include\grpc\byte_buffer.h" /> <ClInclude Include="..\..\include\grpc\byte_buffer.h" />
<ClInclude Include="..\..\include\grpc\byte_buffer_reader.h" /> <ClInclude Include="..\..\include\grpc\byte_buffer_reader.h" />
<ClInclude Include="..\..\include\grpc\grpc.h" /> <ClInclude Include="..\..\include\grpc\grpc.h" />
<ClInclude Include="..\..\include\grpc\grpc_http.h" />
<ClInclude Include="..\..\include\grpc\status.h" /> <ClInclude Include="..\..\include\grpc\status.h" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

3
vsprojects/vs2013/grpc.vcxproj.filters
Unescape View File

@ -363,6 +363,9 @@
<ClInclude Include="..\..\include\grpc\grpc.h"> <ClInclude Include="..\..\include\grpc\grpc.h">
<Filter>include\grpc</Filter> <Filter>include\grpc</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\..\include\grpc\grpc_http.h">
<Filter>include\grpc</Filter>
</ClInclude>
<ClInclude Include="..\..\include\grpc\status.h"> <ClInclude Include="..\..\include\grpc\status.h">
<Filter>include\grpc</Filter> <Filter>include\grpc</Filter>
</ClInclude> </ClInclude>

1
vsprojects/vs2013/grpc_shared.vcxproj
Unescape View File

@ -86,6 +86,7 @@
<ClInclude Include="..\..\include\grpc\byte_buffer.h" /> <ClInclude Include="..\..\include\grpc\byte_buffer.h" />
<ClInclude Include="..\..\include\grpc\byte_buffer_reader.h" /> <ClInclude Include="..\..\include\grpc\byte_buffer_reader.h" />
<ClInclude Include="..\..\include\grpc\grpc.h" /> <ClInclude Include="..\..\include\grpc\grpc.h" />
<ClInclude Include="..\..\include\grpc\grpc_http.h" />
<ClInclude Include="..\..\include\grpc\status.h" /> <ClInclude Include="..\..\include\grpc\status.h" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

3
vsprojects/vs2013/grpc_shared.vcxproj.filters
Unescape View File

@ -363,6 +363,9 @@
<ClInclude Include="..\..\include\grpc\grpc.h"> <ClInclude Include="..\..\include\grpc\grpc.h">
<Filter>include\grpc</Filter> <Filter>include\grpc</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\..\include\grpc\grpc_http.h">
<Filter>include\grpc</Filter>
</ClInclude>
<ClInclude Include="..\..\include\grpc\status.h"> <ClInclude Include="..\..\include\grpc\status.h">
<Filter>include\grpc</Filter> <Filter>include\grpc</Filter>
</ClInclude> </ClInclude>

1
vsprojects/vs2013/grpc_unsecure.vcxproj
Unescape View File

@ -81,6 +81,7 @@
<ClInclude Include="..\..\include\grpc\byte_buffer.h" /> <ClInclude Include="..\..\include\grpc\byte_buffer.h" />
<ClInclude Include="..\..\include\grpc\byte_buffer_reader.h" /> <ClInclude Include="..\..\include\grpc\byte_buffer_reader.h" />
<ClInclude Include="..\..\include\grpc\grpc.h" /> <ClInclude Include="..\..\include\grpc\grpc.h" />
<ClInclude Include="..\..\include\grpc\grpc_http.h" />
<ClInclude Include="..\..\include\grpc\status.h" /> <ClInclude Include="..\..\include\grpc\status.h" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

3
vsprojects/vs2013/grpc_unsecure.vcxproj.filters
Unescape View File

@ -300,6 +300,9 @@
<ClInclude Include="..\..\include\grpc\grpc.h"> <ClInclude Include="..\..\include\grpc\grpc.h">
<Filter>include\grpc</Filter> <Filter>include\grpc</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\..\include\grpc\grpc_http.h">
<Filter>include\grpc</Filter>
</ClInclude>
<ClInclude Include="..\..\include\grpc\status.h"> <ClInclude Include="..\..\include\grpc\status.h">
<Filter>include\grpc</Filter> <Filter>include\grpc</Filter>
</ClInclude> </ClInclude>

Write Preview
Loading…
Cancel
Save