Move reflection src/hdr to src/cpp/ext include/grpc++/ext

9 years ago · 0601df3a04
parent 1495cb5b24
commit 0601df3a04
18 changed files with 95 additions and 94 deletions
--- a/16
+++ b/16
@ -1000,16 +1000,16 @@ cc_library(
 cc_library(
  name = "grpc++_reflection",
  srcs = [
-    "extensions/reflection/proto_server_reflection.h",
-    "extensions/reflection/proto_server_reflection.cc",
-    "extensions/reflection/proto_server_reflection_plugin.cc",
-    "extensions/reflection/reflection.grpc.pb.cc",
-    "extensions/reflection/reflection.pb.cc",
+    "src/cpp/ext/proto_server_reflection.h",
+    "src/cpp/ext/proto_server_reflection.cc",
+    "src/cpp/ext/proto_server_reflection_plugin.cc",
+    "src/cpp/ext/reflection.grpc.pb.cc",
+    "src/cpp/ext/reflection.pb.cc",
  ],
  hdrs = [
-    "extensions/include/grpc++/impl/proto_server_reflection_plugin.h",
-    "extensions/include/grpc++/impl/reflection.grpc.pb.h",
-    "extensions/include/grpc++/impl/reflection.pb.h",
+    "include/grpc++/ext/proto_server_reflection_plugin.h",
+    "include/grpc++/ext/reflection.grpc.pb.h",
+    "include/grpc++/ext/reflection.pb.h",
  ],
  includes = [
    "include",
--- a/29
+++ b/29
@ -84,7 +84,6 @@ BINDIR = $(BUILDDIR_ABSOLUTE)/bins
 OBJDIR = $(BUILDDIR_ABSOLUTE)/objs
 LIBDIR = $(BUILDDIR_ABSOLUTE)/libs
 GENDIR = $(BUILDDIR_ABSOLUTE)/gens
-EXTDIR = $(BUILDDIR_ABSOLUTE)/extensions

 # Configurations

@ -370,7 +369,7 @@ CPPFLAGS += -fPIC
 LDFLAGS += -fPIC
 endif

-INCLUDES = . include $(GENDIR) $(EXTDIR) $(EXTDIR)/include
+INCLUDES = . include $(GENDIR)
 LDFLAGS += -Llibs/$(CONFIG)

 ifeq ($(SYSTEM),Darwin)
@ -2155,8 +2154,8 @@ install-headers_c:

 install-headers_cxx:
 	$(E) "[INSTALL] Installing public C++ headers"
-	$(Q) $(foreach h, $(PUBLIC_HEADERS_CXX), $(INSTALL) -d $(prefix)/$(patsubst extensions/%,%,$(dir $(h))) && ) exit 0 || exit 1
-	$(Q) $(foreach h, $(PUBLIC_HEADERS_CXX), $(INSTALL) $(h) $(prefix)/$(patsubst extensions/%,%,$(h)) && ) exit 0 || exit 1
+	$(Q) $(foreach h, $(PUBLIC_HEADERS_CXX), $(INSTALL) -d $(prefix)/$(dir $(h)) && ) exit 0 || exit 1
+	$(Q) $(foreach h, $(PUBLIC_HEADERS_CXX), $(INSTALL) $(h) $(prefix)/$(h) && ) exit 0 || exit 1

 install-static: install-static_c install-static_cxx

@ -3391,15 +3390,15 @@ endif


 LIBGRPC++_REFLECTION_SRC = \
-    extensions/reflection/proto_server_reflection.cc \
-    extensions/reflection/proto_server_reflection_plugin.cc \
-    extensions/reflection/reflection.grpc.pb.cc \
-    extensions/reflection/reflection.pb.cc \
+    src/cpp/ext/proto_server_reflection.cc \
+    src/cpp/ext/proto_server_reflection_plugin.cc \
+    src/cpp/ext/reflection.grpc.pb.cc \
+    src/cpp/ext/reflection.pb.cc \

 PUBLIC_HEADERS_CXX += \
-    extensions/include/grpc++/impl/proto_server_reflection_plugin.h \
-    extensions/include/grpc++/impl/reflection.grpc.pb.h \
-    extensions/include/grpc++/impl/reflection.pb.h \
+    include/grpc++/ext/proto_server_reflection_plugin.h \
+    include/grpc++/ext/reflection.grpc.pb.h \
+    include/grpc++/ext/reflection.pb.h \

 LIBGRPC++_REFLECTION_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(LIBGRPC++_REFLECTION_SRC))))

@ -14544,10 +14543,6 @@ ifneq ($(OPENSSL_DEP),)
 # This is to ensure the embedded OpenSSL is built beforehand, properly
 # installing headers to their final destination on the drive. We need this
 # otherwise parallel compilation will fail if a source is compiled first.
-extensions/reflection/proto_server_reflection.cc: $(OPENSSL_DEP)
-extensions/reflection/proto_server_reflection_plugin.cc: $(OPENSSL_DEP)
-extensions/reflection/reflection.grpc.pb.cc: $(OPENSSL_DEP)
-extensions/reflection/reflection.pb.cc: $(OPENSSL_DEP)
 src/core/ext/transport/chttp2/client/secure/secure_channel_create.c: $(OPENSSL_DEP)
 src/core/ext/transport/chttp2/server/secure/server_secure_chttp2.c: $(OPENSSL_DEP)
 src/core/ext/transport/cronet/client/secure/cronet_channel_create.c: $(OPENSSL_DEP)
@ -14578,6 +14573,10 @@ src/cpp/common/auth_property_iterator.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_create_auth_context.cc: $(OPENSSL_DEP)
+src/cpp/ext/proto_server_reflection.cc: $(OPENSSL_DEP)
+src/cpp/ext/proto_server_reflection_plugin.cc: $(OPENSSL_DEP)
+src/cpp/ext/reflection.grpc.pb.cc: $(OPENSSL_DEP)
+src/cpp/ext/reflection.pb.cc: $(OPENSSL_DEP)
 src/cpp/server/secure_server_credentials.cc: $(OPENSSL_DEP)
 src/csharp/ext/grpc_csharp_ext.c: $(OPENSSL_DEP)
 test/core/bad_client/bad_client.c: $(OPENSSL_DEP)
--- a/build.yaml
+++ b/build.yaml
@ -904,16 +904,16 @@ libs:
  build: all
  language: c++
  public_headers:
-  - extensions/include/grpc++/impl/proto_server_reflection_plugin.h
-  - extensions/include/grpc++/impl/reflection.grpc.pb.h
-  - extensions/include/grpc++/impl/reflection.pb.h
+  - include/grpc++/ext/proto_server_reflection_plugin.h
+  - include/grpc++/ext/reflection.grpc.pb.h
+  - include/grpc++/ext/reflection.pb.h
  headers:
-  - extensions/reflection/proto_server_reflection.h
+  - src/cpp/ext/proto_server_reflection.h
  src:
-  - extensions/reflection/proto_server_reflection.cc
-  - extensions/reflection/proto_server_reflection_plugin.cc
-  - extensions/reflection/reflection.grpc.pb.cc
-  - extensions/reflection/reflection.pb.cc
+  - src/cpp/ext/proto_server_reflection.cc
+  - src/cpp/ext/proto_server_reflection_plugin.cc
+  - src/cpp/ext/reflection.grpc.pb.cc
+  - src/cpp/ext/reflection.pb.cc
  uses:
  - grpc++_base
 - name: grpc++_test_config
--- a/extensions/include/grpc++/impl/proto_server_reflection_plugin.h
+++ b/extensions/include/grpc++/impl/proto_server_reflection_plugin.h
--- a/extensions/include/grpc++/impl/reflection.grpc.pb.h
+++ b/extensions/include/grpc++/impl/reflection.grpc.pb.h
@ -70,7 +70,7 @@
 #ifndef GRPC_reflection_2eproto__INCLUDED
 #define GRPC_reflection_2eproto__INCLUDED

-#include <grpc++/impl/reflection.pb.h>
+#include <grpc++/ext/reflection.pb.h>

 #include <grpc++/impl/codegen/async_stream.h>
 #include <grpc++/impl/codegen/async_unary_call.h>
--- a/extensions/include/grpc++/impl/reflection.pb.h
+++ b/extensions/include/grpc++/impl/reflection.pb.h
--- a/extensions/reflection/proto_server_reflection.cc
+++ b/extensions/reflection/proto_server_reflection.cc
@ -36,7 +36,7 @@

 #include <grpc++/grpc++.h>

-#include "reflection/proto_server_reflection.h"
+#include "src/cpp/ext/proto_server_reflection.h"

 using grpc::Status;
 using grpc::StatusCode;
--- a/extensions/reflection/proto_server_reflection.h
+++ b/extensions/reflection/proto_server_reflection.h
@ -39,7 +39,7 @@

 #include <grpc++/grpc++.h>

-#include <grpc++/impl/reflection.grpc.pb.h>
+#include <grpc++/ext/reflection.grpc.pb.h>

 namespace grpc {

--- a/extensions/reflection/proto_server_reflection_plugin.cc
+++ b/extensions/reflection/proto_server_reflection_plugin.cc
@ -31,12 +31,12 @@
 *
 */

-#include <grpc++/impl/proto_server_reflection_plugin.h>
+#include <grpc++/ext/proto_server_reflection_plugin.h>
 #include <grpc++/impl/server_builder_plugin.h>
 #include <grpc++/impl/server_initializer.h>
 #include <grpc++/server.h>

-#include "reflection/proto_server_reflection.h"
+#include "src/cpp/ext/proto_server_reflection.h"

 namespace grpc {
 namespace reflection {
--- a/extensions/reflection/reflection.grpc.pb.cc
+++ b/extensions/reflection/reflection.grpc.pb.cc
@ -36,8 +36,8 @@
 // If you make any local change, they will be lost.
 // source: reflection.proto

-#include <grpc++/impl/reflection.pb.h>
-#include <grpc++/impl/reflection.grpc.pb.h>
+#include <grpc++/ext/reflection.pb.h>
+#include <grpc++/ext/reflection.grpc.pb.h>

 #include <grpc++/impl/codegen/async_stream.h>
 #include <grpc++/impl/codegen/async_unary_call.h>
--- a/extensions/reflection/reflection.pb.cc
+++ b/extensions/reflection/reflection.pb.cc
@ -36,7 +36,7 @@
 // source: reflection.proto

 #define INTERNAL_SUPPRESS_PROTOBUF_FIELD_DEPRECATION
-#include <grpc++/impl/reflection.pb.h>
+#include <grpc++/ext/reflection.pb.h>

 #include <algorithm>

--- a/templates/Makefile.template
+++ b/templates/Makefile.template
@ -113,7 +113,6 @@
  OBJDIR = $(BUILDDIR_ABSOLUTE)/objs
  LIBDIR = $(BUILDDIR_ABSOLUTE)/libs
  GENDIR = $(BUILDDIR_ABSOLUTE)/gens
-  EXTDIR = $(BUILDDIR_ABSOLUTE)/extensions

  # Configurations

@ -248,7 +247,7 @@
  LDFLAGS += -fPIC
  endif

-  INCLUDES = . include $(GENDIR) $(EXTDIR) $(EXTDIR)/include
+  INCLUDES = . include $(GENDIR)
  LDFLAGS += -Llibs/$(CONFIG)

  ifeq ($(SYSTEM),Darwin)
@ -1289,8 +1288,8 @@

  install-headers_cxx:
  	$(E) "[INSTALL] Installing public C++ headers"
-  	$(Q) $(foreach h, $(PUBLIC_HEADERS_CXX), $(INSTALL) -d $(prefix)/$(patsubst extensions/%,%,$(dir $(h))) && ) exit 0 || exit 1
-  	$(Q) $(foreach h, $(PUBLIC_HEADERS_CXX), $(INSTALL) $(h) $(prefix)/$(patsubst extensions/%,%,$(h)) && ) exit 0 || exit 1
+  	$(Q) $(foreach h, $(PUBLIC_HEADERS_CXX), $(INSTALL) -d $(prefix)/$(dir $(h)) && ) exit 0 || exit 1
+  	$(Q) $(foreach h, $(PUBLIC_HEADERS_CXX), $(INSTALL) $(h) $(prefix)/$(h) && ) exit 0 || exit 1

  install-static: install-static_c install-static_cxx

--- a/test/cpp/end2end/proto_server_reflection_test.cc
+++ b/test/cpp/end2end/proto_server_reflection_test.cc
@ -35,7 +35,7 @@
 #include <grpc++/channel.h>
 #include <grpc++/client_context.h>
 #include <grpc++/create_channel.h>
-#include <grpc++/impl/proto_server_reflection_plugin.h>
+#include <grpc++/ext/proto_server_reflection_plugin.h>
 #include <grpc++/security/credentials.h>
 #include <grpc++/security/server_credentials.h>
 #include <grpc++/server.h>
--- a/test/cpp/util/proto_reflection_descriptor_database.h
+++ b/test/cpp/util/proto_reflection_descriptor_database.h
@ -40,7 +40,7 @@
 #include <google/protobuf/descriptor.pb.h>
 #include <google/protobuf/descriptor_database.h>
 #include <grpc++/grpc++.h>
-#include <grpc++/impl/reflection.grpc.pb.h>
+#include <grpc++/ext/reflection.grpc.pb.h>

 namespace grpc {

--- a/tools/codegen/extensions/gen_reflection_proto.sh
+++ b/tools/codegen/extensions/gen_reflection_proto.sh
@ -31,9 +31,9 @@

 PROTO_DIR="src/proto/grpc/reflection/v1alpha"
 PROTO_FILE="reflection"
-HEADER_DIR="extensions/include/grpc++/impl"
-SRC_DIR="extensions/reflection"
-INCLUDE_DIR="grpc++/impl"
+HEADER_DIR="include/grpc++/ext"
+SRC_DIR="src/cpp/ext"
+INCLUDE_DIR="grpc++/ext"
 TMP_DIR="tmp"
 GRPC_PLUGIN="bins/opt/grpc_cpp_plugin"
 PROTOC=third_party/protobuf/src/protoc
--- a/tools/run_tests/sources_and_headers.json
+++ b/tools/run_tests/sources_and_headers.json
@ -4375,22 +4375,22 @@
      "grpc++_base"
    ], 
    "headers": [
-      "extensions/include/grpc++/impl/proto_server_reflection_plugin.h", 
-      "extensions/include/grpc++/impl/reflection.grpc.pb.h", 
-      "extensions/include/grpc++/impl/reflection.pb.h", 
-      "extensions/reflection/proto_server_reflection.h"
+      "include/grpc++/ext/proto_server_reflection_plugin.h", 
+      "include/grpc++/ext/reflection.grpc.pb.h", 
+      "include/grpc++/ext/reflection.pb.h", 
+      "src/cpp/ext/proto_server_reflection.h"
    ], 
    "language": "c++", 
    "name": "grpc++_reflection", 
    "src": [
-      "extensions/include/grpc++/impl/proto_server_reflection_plugin.h", 
-      "extensions/include/grpc++/impl/reflection.grpc.pb.h", 
-      "extensions/include/grpc++/impl/reflection.pb.h", 
-      "extensions/reflection/proto_server_reflection.cc", 
-      "extensions/reflection/proto_server_reflection.h", 
-      "extensions/reflection/proto_server_reflection_plugin.cc", 
-      "extensions/reflection/reflection.grpc.pb.cc", 
-      "extensions/reflection/reflection.pb.cc"
+      "include/grpc++/ext/proto_server_reflection_plugin.h", 
+      "include/grpc++/ext/reflection.grpc.pb.h", 
+      "include/grpc++/ext/reflection.pb.h", 
+      "src/cpp/ext/proto_server_reflection.cc", 
+      "src/cpp/ext/proto_server_reflection.h", 
+      "src/cpp/ext/proto_server_reflection_plugin.cc", 
+      "src/cpp/ext/reflection.grpc.pb.cc", 
+      "src/cpp/ext/reflection.pb.cc"
    ], 
    "third_party": false, 
    "type": "lib"
--- a/vsprojects/vcxproj/grpc++_reflection/grpc++_reflection.vcxproj
+++ b/vsprojects/vcxproj/grpc++_reflection/grpc++_reflection.vcxproj
@ -147,21 +147,21 @@
  </ItemDefinitionGroup>

  <ItemGroup>
-    <ClInclude Include="$(SolutionDir)\..\extensions\include\grpc++\impl\proto_server_reflection_plugin.h" />
-    <ClInclude Include="$(SolutionDir)\..\extensions\include\grpc++\impl\reflection.grpc.pb.h" />
-    <ClInclude Include="$(SolutionDir)\..\extensions\include\grpc++\impl\reflection.pb.h" />
+    <ClInclude Include="$(SolutionDir)\..\include\grpc++\ext\proto_server_reflection_plugin.h" />
+    <ClInclude Include="$(SolutionDir)\..\include\grpc++\ext\reflection.grpc.pb.h" />
+    <ClInclude Include="$(SolutionDir)\..\include\grpc++\ext\reflection.pb.h" />
  </ItemGroup>
  <ItemGroup>
-    <ClInclude Include="$(SolutionDir)\..\extensions\reflection\proto_server_reflection.h" />
+    <ClInclude Include="$(SolutionDir)\..\src\cpp\ext\proto_server_reflection.h" />
  </ItemGroup>
  <ItemGroup>
-    <ClCompile Include="$(SolutionDir)\..\extensions\reflection\proto_server_reflection.cc">
+    <ClCompile Include="$(SolutionDir)\..\src\cpp\ext\proto_server_reflection.cc">
    </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\extensions\reflection\proto_server_reflection_plugin.cc">
+    <ClCompile Include="$(SolutionDir)\..\src\cpp\ext\proto_server_reflection_plugin.cc">
    </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\extensions\reflection\reflection.grpc.pb.cc">
+    <ClCompile Include="$(SolutionDir)\..\src\cpp\ext\reflection.grpc.pb.cc">
    </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\extensions\reflection\reflection.pb.cc">
+    <ClCompile Include="$(SolutionDir)\..\src\cpp\ext\reflection.pb.cc">
    </ClCompile>
  </ItemGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
--- a/vsprojects/vcxproj/grpc++_reflection/grpc++_reflection.vcxproj.filters
+++ b/vsprojects/vcxproj/grpc++_reflection/grpc++_reflection.vcxproj.filters
@ -1,51 +1,54 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <ItemGroup>
-    <ClCompile Include="$(SolutionDir)\..\extensions\reflection\proto_server_reflection.cc">
-      <Filter>extensions\reflection</Filter>
+    <ClCompile Include="$(SolutionDir)\..\src\cpp\ext\proto_server_reflection.cc">
+      <Filter>src\cpp\ext</Filter>
    </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\extensions\reflection\proto_server_reflection_plugin.cc">
-      <Filter>extensions\reflection</Filter>
+    <ClCompile Include="$(SolutionDir)\..\src\cpp\ext\proto_server_reflection_plugin.cc">
+      <Filter>src\cpp\ext</Filter>
    </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\extensions\reflection\reflection.grpc.pb.cc">
-      <Filter>extensions\reflection</Filter>
+    <ClCompile Include="$(SolutionDir)\..\src\cpp\ext\reflection.grpc.pb.cc">
+      <Filter>src\cpp\ext</Filter>
    </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\extensions\reflection\reflection.pb.cc">
-      <Filter>extensions\reflection</Filter>
+    <ClCompile Include="$(SolutionDir)\..\src\cpp\ext\reflection.pb.cc">
+      <Filter>src\cpp\ext</Filter>
    </ClCompile>
  </ItemGroup>
  <ItemGroup>
-    <ClInclude Include="$(SolutionDir)\..\extensions\include\grpc++\impl\proto_server_reflection_plugin.h">
-      <Filter>extensions\include\grpc++\impl</Filter>
+    <ClInclude Include="$(SolutionDir)\..\include\grpc++\ext\proto_server_reflection_plugin.h">
+      <Filter>include\grpc++\ext</Filter>
    </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\extensions\include\grpc++\impl\reflection.grpc.pb.h">
-      <Filter>extensions\include\grpc++\impl</Filter>
+    <ClInclude Include="$(SolutionDir)\..\include\grpc++\ext\reflection.grpc.pb.h">
+      <Filter>include\grpc++\ext</Filter>
    </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\extensions\include\grpc++\impl\reflection.pb.h">
-      <Filter>extensions\include\grpc++\impl</Filter>
+    <ClInclude Include="$(SolutionDir)\..\include\grpc++\ext\reflection.pb.h">
+      <Filter>include\grpc++\ext</Filter>
    </ClInclude>
  </ItemGroup>
  <ItemGroup>
-    <ClInclude Include="$(SolutionDir)\..\extensions\reflection\proto_server_reflection.h">
-      <Filter>extensions\reflection</Filter>
+    <ClInclude Include="$(SolutionDir)\..\src\cpp\ext\proto_server_reflection.h">
+      <Filter>src\cpp\ext</Filter>
    </ClInclude>
  </ItemGroup>

  <ItemGroup>
-    <Filter Include="extensions">
-      <UniqueIdentifier>{8fd45ce8-8f02-367f-e3f7-4c0ae0e36566}</UniqueIdentifier>
+    <Filter Include="include">
+      <UniqueIdentifier>{e9441021-f78a-ec84-7efd-1883975feddb}</UniqueIdentifier>
    </Filter>
-    <Filter Include="extensions\include">
-      <UniqueIdentifier>{1a18dfcc-bedf-226e-6929-377aba53249b}</UniqueIdentifier>
+    <Filter Include="include\grpc++">
+      <UniqueIdentifier>{c66e66b4-a64e-79bf-40e8-1a1bac124a3d}</UniqueIdentifier>
    </Filter>
-    <Filter Include="extensions\include\grpc++">
-      <UniqueIdentifier>{83bf0cce-01da-a93c-0ff3-a1abca63ec5f}</UniqueIdentifier>
+    <Filter Include="include\grpc++\ext">
+      <UniqueIdentifier>{8d96203b-d3ce-2164-74a6-06e0ff2b09af}</UniqueIdentifier>
    </Filter>
-    <Filter Include="extensions\include\grpc++\impl">
-      <UniqueIdentifier>{d34e8821-f67b-a793-3419-e2781ab9b3ee}</UniqueIdentifier>
+    <Filter Include="src">
+      <UniqueIdentifier>{5ec5476e-3d72-e3f9-4f05-3f7c31c13651}</UniqueIdentifier>
    </Filter>
-    <Filter Include="extensions\reflection">
-      <UniqueIdentifier>{11feb184-a1d9-5485-26f0-538ddb50deff}</UniqueIdentifier>
+    <Filter Include="src\cpp">
+      <UniqueIdentifier>{a642ac8e-cec2-35d3-9a8a-78313d03b440}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="src\cpp\ext">
+      <UniqueIdentifier>{d0204618-0f6a-dbc6-cf41-ffc04e76075a}</UniqueIdentifier>
    </Filter>
  </ItemGroup>
 </Project>