Consolidate C++ proto files under src/proto

- make the directory structure match the package structure
- sanitize the package structure (test --> testing)
- add auto-detection of proto file dependencies

1 files changed, 24 insertions, 24 deletions

diff --git a/vsprojects/vcxproj/qps/qps.vcxproj b/vsprojects/vcxproj/qps/qps.vcxproj
index 549a303292..f175efae5f 100644
--- a/vsprojects/vcxproj/qps/qps.vcxproj
+++ b/vsprojects/vcxproj/qps/qps.vcxproj
@@ -150,53 +150,53 @@
     <ClInclude Include="..\..\..\test\cpp\util\benchmark_config.h" />
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\..\test\proto\messages.pb.cc">
+    <ClCompile Include="..\..\..\src\proto\grpc\testing\messages.pb.cc">
     </ClCompile>
-    <ClInclude Include="..\..\..\test\proto\messages.pb.h">
+    <ClInclude Include="..\..\..\src\proto\grpc\testing\messages.pb.h">
     </ClInclude>
-    <ClCompile Include="..\..\..\test\proto\messages.grpc.pb.cc">
+    <ClCompile Include="..\..\..\src\proto\grpc\testing\messages.grpc.pb.cc">
     </ClCompile>
-    <ClInclude Include="..\..\..\test\proto\messages.grpc.pb.h">
+    <ClInclude Include="..\..\..\src\proto\grpc\testing\messages.grpc.pb.h">
     </ClInclude>
-    <ClCompile Include="..\..\..\test\proto\benchmarks\control.pb.cc">
+    <ClCompile Include="..\..\..\src\proto\grpc\testing\control.pb.cc">
     </ClCompile>
-    <ClInclude Include="..\..\..\test\proto\benchmarks\control.pb.h">
+    <ClInclude Include="..\..\..\src\proto\grpc\testing\control.pb.h">
     </ClInclude>
-    <ClCompile Include="..\..\..\test\proto\benchmarks\control.grpc.pb.cc">
+    <ClCompile Include="..\..\..\src\proto\grpc\testing\control.grpc.pb.cc">
     </ClCompile>
-    <ClInclude Include="..\..\..\test\proto\benchmarks\control.grpc.pb.h">
+    <ClInclude Include="..\..\..\src\proto\grpc\testing\control.grpc.pb.h">
     </ClInclude>
-    <ClCompile Include="..\..\..\test\proto\benchmarks\payloads.pb.cc">
+    <ClCompile Include="..\..\..\src\proto\grpc\testing\payloads.pb.cc">
     </ClCompile>
-    <ClInclude Include="..\..\..\test\proto\benchmarks\payloads.pb.h">
+    <ClInclude Include="..\..\..\src\proto\grpc\testing\payloads.pb.h">
     </ClInclude>
-    <ClCompile Include="..\..\..\test\proto\benchmarks\payloads.grpc.pb.cc">
+    <ClCompile Include="..\..\..\src\proto\grpc\testing\payloads.grpc.pb.cc">
     </ClCompile>
-    <ClInclude Include="..\..\..\test\proto\benchmarks\payloads.grpc.pb.h">
+    <ClInclude Include="..\..\..\src\proto\grpc\testing\payloads.grpc.pb.h">
     </ClInclude>
-    <ClCompile Include="..\..\..\test\proto\benchmarks\services.pb.cc">
+    <ClCompile Include="..\..\..\src\proto\grpc\testing\services.pb.cc">
     </ClCompile>
-    <ClInclude Include="..\..\..\test\proto\benchmarks\services.pb.h">
+    <ClInclude Include="..\..\..\src\proto\grpc\testing\services.pb.h">
     </ClInclude>
-    <ClCompile Include="..\..\..\test\proto\benchmarks\services.grpc.pb.cc">
+    <ClCompile Include="..\..\..\src\proto\grpc\testing\services.grpc.pb.cc">
     </ClCompile>
-    <ClInclude Include="..\..\..\test\proto\benchmarks\services.grpc.pb.h">
+    <ClInclude Include="..\..\..\src\proto\grpc\testing\services.grpc.pb.h">
     </ClInclude>
-    <ClCompile Include="..\..\..\test\proto\benchmarks\stats.pb.cc">
+    <ClCompile Include="..\..\..\src\proto\grpc\testing\stats.pb.cc">
     </ClCompile>
-    <ClInclude Include="..\..\..\test\proto\benchmarks\stats.pb.h">
+    <ClInclude Include="..\..\..\src\proto\grpc\testing\stats.pb.h">
     </ClInclude>
-    <ClCompile Include="..\..\..\test\proto\benchmarks\stats.grpc.pb.cc">
+    <ClCompile Include="..\..\..\src\proto\grpc\testing\stats.grpc.pb.cc">
     </ClCompile>
-    <ClInclude Include="..\..\..\test\proto\benchmarks\stats.grpc.pb.h">
+    <ClInclude Include="..\..\..\src\proto\grpc\testing\stats.grpc.pb.h">
     </ClInclude>
-    <ClCompile Include="..\..\..\test\cpp\qps\perf_db.pb.cc">
+    <ClCompile Include="..\..\..\src\proto\grpc\testing\perf_db.pb.cc">
     </ClCompile>
-    <ClInclude Include="..\..\..\test\cpp\qps\perf_db.pb.h">
+    <ClInclude Include="..\..\..\src\proto\grpc\testing\perf_db.pb.h">
     </ClInclude>
-    <ClCompile Include="..\..\..\test\cpp\qps\perf_db.grpc.pb.cc">
+    <ClCompile Include="..\..\..\src\proto\grpc\testing\perf_db.grpc.pb.cc">
     </ClCompile>
-    <ClInclude Include="..\..\..\test\cpp\qps\perf_db.grpc.pb.h">
+    <ClInclude Include="..\..\..\src\proto\grpc\testing\perf_db.grpc.pb.h">
     </ClInclude>
     <ClCompile Include="..\..\..\test\cpp\qps\client_async.cc">
     </ClCompile>