Use grpc/grpc cc_binary plugin targets.

pcj · pcj · commit a9db1bbb0b54 · 2016-10-02T22:53:14.000-06:00
Extends gRPC protobuf support to python, ruby, objective-c by using
the plugin cc_binary targets.
diff --git a/README.md b/README.md
@@ -48,20 +48,20 @@ of this project are to:
 | [gRPC gateway](grpc_gateway) | [grpc_gateway_proto_compile](grpc_gateway#grpc_gateway_proto_compile)<br/>[grpc_gateway_swagger_compile](grpc_gateway#grpc_gateway_swagger_compile)   | [grpc_gateway_proto_library](grpc_gateway#grpc_gateway_proto_library)<br/>[grpc_gateway_binary](grpc_gateway#grpc_gateway_binary) | [v1.0.0](https://github.com/grpc/grpc-go/releases/tag/v1.0.0) |
 | [Java](java)                 | [java_proto_compile](java#java_proto_compile) | [java_proto_library](java#java_proto_library) | [v1.0.1](https://github.com/grpc/grpc-java/releases/tag/v1.0.1) |
 | [Node](node)                 | [node_proto_compile](js#node_proto_compile) | [node_proto_library](js#node_proto_library)          | [1.0.0](https://www.npmjs.com/package/grpc) |
-| [Objective-C](objc) | [objc_proto_compile](objc#objc_proto_compile) | [objc_proto_library](objc#objc_proto_library) <sup>5</sup> | <sup>4</sup> |
-| [Python](python)             | [py_proto_compile](python#py_proto_compile)         |           | <sup>4</sup> |
-| [Ruby](ruby)                 | [ruby_proto_compile](ruby#ruby_proto_compile)          |           | <sup>4</sup> |
+| [Objective-C](objc) | [objc_proto_compile](objc#objc_proto_compile) | [objc_proto_library](objc#objc_proto_library) <sup>4</sup> | [v0.15.2](https://github.com/grpc/grpc/releases/tag/v0.15.2) |
+| [Python](python)             | [py_proto_compile](python#py_proto_compile)         |           | [v0.15.2](https://github.com/grpc/grpc/releases/tag/v0.15.2) |
+| [Ruby](ruby)                 | [ruby_proto_compile](ruby#ruby_proto_compile)          |           | [v0.15.2](https://github.com/grpc/grpc/releases/tag/v0.15.2) |
 | Custom [proto_language](protobuf#proto_language) | [proto_compile](protobuf#proto_compile) | |  |
 
-1. Support for generation of protoc outputs via `proto_compile()` rule.
+1. Support for generation of protoc outputs via `proto_compile()`
+   rule.
 
-2. Support for generation + compilation of outputs with protobuf dependencies.
+2. Support for generation + compilation of outputs with protobuf
+   dependencies.
 
 3. gRPC support.
 
-4. gRPC *is* supported in this language, but not currently within rules_protobuf)
-
-5. Highly experimental (probably not functional yet). A
+4. Highly experimental (probably not functional yet). A
    work-in-progress for those interested in contributing further work.
 
 
diff --git a/closure/README.md b/closure/README.md
@@ -6,7 +6,7 @@
 | [closure_proto_compile](#closure_proto_compile) | Generate closure js protobuf source files. |
 | [closure_proto_library](#closure_proto_library) | Generate and compiles closure js source files. |
 
-## closure\_proto\_repositores
+## closure\_proto\_repositories
 
 Enable closure support by loading the dependencies in your workspace.
 
diff --git a/cpp/README.md b/cpp/README.md
@@ -6,7 +6,7 @@
 | [cc_proto_compile](#cc_proto_compile) | Generate protobuf source files. |
 | [cc_proto_library](#cc_proto_library) | Generate and compiles protobuf source files. |
 
-## cpp\_proto\_repositores
+## cpp\_proto\_repositories
 
 Enable C++ support by loading the dependencies in your workspace.
 
diff --git a/csharp/BUILD b/csharp/BUILD
@@ -11,8 +11,9 @@ proto_language(
         "@nuget_google_protobuf//:libnet45",
     ],
     supports_grpc = True,
-    grpc_plugin = "@nuget_grpc_tools//:protoc-gen-grpc-csharp_bin",
     grpc_file_extensions = ["Grpc.cs"],
+    grpc_plugin = "@com_github_grpc_grpc//:grpc_csharp_plugin",
+    grpc_plugin_name = "grpc_csharp",
     grpc_compile_deps = [
         "@nuget_grpc//:core",
     ],
diff --git a/csharp/README.md b/csharp/README.md
@@ -6,7 +6,7 @@
 | [csharp_proto_compile](#csharp_proto_compile) | Generate protobuf source files. |
 | [csharp_proto_library](#csharp_proto_library) | Generate and compiles protobuf source files. |
 
-## csharp\_proto\_repositores
+## csharp\_proto\_repositories
 
 Enable C# support by loading the dependencies in your workspace.
 
diff --git a/csharp/rules.bzl b/csharp/rules.bzl
@@ -1,7 +1,6 @@
 load("@io_bazel_rules_dotnet//dotnet:csharp.bzl", "nuget_package", "new_nuget_package", "csharp_library", "dll_import")
 load("//protobuf:rules.bzl", "proto_compile", "proto_repositories", "proto_language_deps")
 
-
 def csharp_proto_repositories():
   proto_repositories()
 
@@ -44,36 +43,6 @@ dll_import(
   srcs = glob(["Grpc.Core.1.0.0/lib/net45/**/*.dll"]),
   visibility = ["//visibility:public"],
 )
-"""
-  )
-
-  new_nuget_package(
-    name = "nuget_grpc_tools",
-    package = "Grpc.Tools",
-    version = "1.0.0",
-    build_file_content =
-"""
-load("@io_bazel_rules_dotnet//dotnet:csharp.bzl", "dll_import", "csharp_binary")
-genrule(
-  name = "protoc-gen-grpc-csharp_bin",
-  srcs = [":grpc_csharp_plugin"],
-  outs = ["protoc-gen-grpc-csharp"],
-  cmd = "cp $(location :grpc_csharp_plugin) $$(pwd)/$@",
-  executable = True,
-  visibility = ["//visibility:public"],
-)
-filegroup(
-  name = "grpc_csharp_plugin",
-  srcs = select({
-    ":darwin": ["Grpc.Tools.1.0.0/tools/macosx_x64/grpc_csharp_plugin"],
-    "//conditions:default": ["Grpc.Tools.1.0.0/tools/linux_x64/grpc_csharp_plugin"],
-  }),
-)
-config_setting(
-    name = "darwin",
-    values = {"cpu": "darwin"},
-    visibility = ["//visibility:private"],
-)
 """
   )
 
diff --git a/examples/helloworld/proto/BUILD b/examples/helloworld/proto/BUILD
@@ -77,7 +77,14 @@ proto_compile(
     name = "ruby",
     langs = ["//ruby"],
     protos = [":protos"],
-    with_grpc = False,
+    with_grpc = True,
+)
+
+proto_compile(
+    name = "objc",
+    langs = ["//objc"],
+    protos = [":protos"],
+    with_grpc = True,
 )
 
 csharp_proto_library(
diff --git a/go/README.md b/go/README.md
@@ -6,7 +6,7 @@
 | [go_proto_compile](#go_proto_compile) | Generate protobuf source files. |
 | [go_proto_library](#go_proto_library) | Generate and compiles protobuf source files. |
 
-## go\_proto\_repositores
+## go\_proto\_repositories
 
 Enable go support by loading the dependencies in your workspace.
 
diff --git a/gogo/README.md b/gogo/README.md
@@ -6,7 +6,7 @@
 | [gogo_proto_compile](#gogo_proto_compile) | Generate protobuf source files. |
 | [gogo_proto_library](#gogo_proto_library) | Generate and compiles protobuf source files. |
 
-## gogo\_proto\_repositores
+## gogo\_proto\_repositories
 
 Enable C# support by loading the dependencies in your workspace.
 
diff --git a/grpc_gateway/README.md b/grpc_gateway/README.md
@@ -7,7 +7,7 @@
 | [grpc_gateway_proto_library](#grpc_gateway_proto_library) | Generate and compiles protobuf source files. |
 | [grpc_gateway_swagger_compile](#grpc_gateway_swagger_compile) | Generate swwagger.json source files. |
 
-## grpc_gateway\_proto\_repositores
+## grpc_gateway\_proto\_repositories
 
 Enable [grpc-gateway](https://github.com/grpc-ecosystem/grpc-gateway)
 support by loading the dependencies in your workspace.
diff --git a/node/README.md b/node/README.md
@@ -5,8 +5,7 @@
 | [node_proto_repositories](#node_proto_repositories) | Load workspace dependencies. |
 | [node_proto_compile](#node_proto_compile) | Generate node js protobuf source files. |
 
-
-## node\_proto\_repositores
+## node\_proto\_repositories
 
 Enable node support by loading the dependencies in your workspace.
 
diff --git a/objc/BUILD b/objc/BUILD
@@ -6,5 +6,8 @@ proto_language(
     name = "objc",
     pb_file_extensions = [".pbobjc.h", ".pbobjc.m"],
     output_file_style = "capitalize",
-    supports_grpc = False, # not yet implemented to get plugin and deps.
+    supports_grpc = True,
+    grpc_file_extensions = [".pbrpc.h", ".pbrpc.m"],
+    grpc_plugin = "//external:protoc_gen_grpc_ruby",
+    grpc_plugin_name = "grpc_objc",
 )
diff --git a/objc/README.md b/objc/README.md
@@ -9,7 +9,7 @@
 | [objc_proto_compile](#objc_proto_compile) | Generate protobuf source files. |
 | [objc_proto_library](#objc_proto_library) | Generate and compiles protobuf source files. |
 
-## objc\_proto\_repositores
+## objc\_proto\_repositories
 
 Enable support by loading the dependencies in your workspace.
 
diff --git a/objc/rules.bzl b/objc/rules.bzl
@@ -2,6 +2,9 @@ load("//protobuf:rules.bzl", "proto_compile", "proto_repositories")
 
 def objc_proto_repositories(
     lang_requires = [
+      "grpc",
+      "external_protobuf_compiler",
+      "external_protoc_gen_grpc_ruby",
     ], **kwargs):
   proto_repositories(lang_requires = lang_requires, **kwargs)
 
@@ -10,7 +13,7 @@ PB_COMPILE_DEPS = [
 ]
 
 GRPC_COMPILE_DEPS = PB_COMPILE_DEPS + [
-    #"@com_github_grpc_grpc//:grpc_objc",
+    "@com_github_grpc_grpc//:grpc_objc",
 ]
 
 def objc_proto_compile(langs = [str(Label("//objc"))], **kwargs):
diff --git a/protobuf/build_file/com_github_golang_protobuf.BUILD b/protobuf/build_file/com_github_golang_protobuf.BUILD
@@ -34,18 +34,18 @@ go_library(
     name = "protoc-gen-go/grpc",
     srcs = ["protoc-gen-go/grpc/grpc.go"],
     deps = [
-        ":protoc-gen-go/descriptor",
-        ":protoc-gen-go/generator",
+        "protoc-gen-go/descriptor",
+        "protoc-gen-go/generator",
     ],
 )
 
 go_library(
     name = "protoc-gen-go/generator",
     srcs = ["protoc-gen-go/generator/generator.go"],
     deps = [
-        ":proto",
-        ":protoc-gen-go/descriptor",
-        ":protoc-gen-go/plugin",
+        "proto",
+        "protoc-gen-go/descriptor",
+        "protoc-gen-go/plugin",
     ],
 )
 
@@ -76,12 +76,10 @@ go_library(
 go_library(
     name = "ptypes",
     srcs = glob(
-        include = ["ptypes/*.go"],
-        exclude = ["ptypes/*._test.go"],
+        include = ["ptypes/go"],
+        exclude = ["ptypes/_test.go"],
     ),
     deps = [
-        ":proto",
-        ":protoc-gen-go/descriptor",
         ":ptypes/any",
         ":ptypes/duration",
         ":ptypes/empty",
diff --git a/protobuf/internal/repositories.bzl b/protobuf/internal/repositories.bzl
@@ -192,10 +192,41 @@ REPOSITORIES = {
         "kind": "new_git_repository",
         "name": "com_github_grpc_ecosystem_grpc_gateway",
         "remote": "https://github.com/grpc-ecosystem/grpc-gateway.git",
-        "commit": "acebe0f9ff5993e130b141ee60e83e592839ca22",
+        "commit": "ccd4e6b091a44f9f6b32848ffc63b3e8f8e26092",
         "build_file": str(Label("//protobuf:build_file/com_github_grpc_ecosystem_grpc_gateway.BUILD")),
     },
 
+
+    # ****************************************************************
+    # PYTHON
+    # ****************************************************************
+
+    "external_protoc_gen_grpc_python": {
+        "kind": "bind",
+        "name": "protoc_gen_grpc_python",
+        "actual": "@com_github_grpc_grpc//:grpc_python_plugin",
+    },
+
+    # ****************************************************************
+    # RUBY
+    # ****************************************************************
+
+    "external_protoc_gen_grpc_ruby": {
+        "kind": "bind",
+        "name": "protoc_gen_grpc_ruby",
+        "actual": "@com_github_grpc_grpc//:grpc_ruby_plugin",
+    },
+
+    # ****************************************************************
+    # OBJC
+    # ****************************************************************
+
+    "external_protoc_gen_grpc_objc": {
+        "kind": "bind",
+        "name": "protoc_gen_grpc_objc",
+        "actual": "@com_github_grpc_grpc//:grpc_objc_plugin",
+    },
+
     # ****************************************************************
     # JAVA
     # ****************************************************************
diff --git a/python/BUILD b/python/BUILD
@@ -7,6 +7,6 @@ proto_language(
     pb_file_extensions = ["_pb2.py"],
     supports_grpc = True,
     grpc_file_extensions = ["_pb2.py"],
-    grpc_plugin = "@com_github_grpc_grpc//:grpc_python_plugin",
+    grpc_plugin = "//external:protoc_gen_grpc_python",
     grpc_plugin_name = "grpc_python",
 )
diff --git a/python/README.md b/python/README.md
@@ -2,8 +2,18 @@
 
 | Rule | Description |
 | ---: | :--- |
+| [py_proto_repositories](#py_proto_repositories) | Load workspace dependencies. |
 | [py_proto_compile](#py_proto_compile) | Generate python protobuf source files. |
 
+## python\_proto\_repositories
+
+Enable python support by loading the dependencies in your workspace.
+
+```python
+load("@org_pubref_rules_protobuf//python:rules.bzl", "python_proto_repositories")
+python_proto_repositories()
+```
+
 ## py\_proto\_compile
 
 This is a thin wrapper over the
@@ -16,6 +26,7 @@ load("@org_pubref_rules_protobuf//python:rules.bzl", "python_proto_compile")
 py_proto_compile(
   name = "protos",
   protos = ["message.proto"],
+  with_grpc = True, # only one file is generated with or without grpc
 )
 ```
 
@@ -25,6 +36,7 @@ Target //:protos up-to-date:
   bazel-genfiles/message_pb2.py
 ```
 
-Support for a library rule is dependent on loading the workspace
-dependencies for the py_library rule which has not been implemented
-yet.
+## py\_proto\_library (not implemented)
+
+Support for a library rule would be dependent on loading of pip
+dependencies (this does not exist in bazel ecosystem at the moment).
diff --git a/python/rules.bzl b/python/rules.bzl
@@ -1,4 +1,12 @@
-load("//protobuf:rules.bzl", "proto_compile")
+load("//protobuf:rules.bzl", "proto_compile", "proto_repositories")
+
+def py_proto_repositories(
+    lang_requires = [
+      "grpc",
+      "external_protobuf_compiler",
+      "external_protoc_gen_grpc_python",
+    ], **kwargs):
+  proto_repositories(lang_requires = lang_requires, **kwargs)
 
 def py_proto_compile(langs = [str(Label("//python"))], **kwargs):
   proto_compile(langs = langs, **kwargs)
diff --git a/ruby/BUILD b/ruby/BUILD
@@ -5,4 +5,8 @@ load("//protobuf:rules.bzl", "proto_language")
 proto_language(
     name = "ruby",
     pb_file_extensions = ["_pb.rb"],
+    supports_grpc = True,
+    grpc_file_extensions = ["_services.rb"],
+    grpc_plugin = "//external:protoc_gen_grpc_ruby",
+    grpc_plugin_name = "grpc_ruby",
 )
diff --git a/ruby/README.md b/ruby/README.md
@@ -2,8 +2,18 @@
 
 | Rule | Description |
 | ---: | :--- |
+| [ruby_proto_repositories](#ruby_proto_repositories) | Load workspace dependencies. |
 | [ruby_proto_compile](#ruby_proto_compile) | Generate ruby protobuf source files. |
 
+## ruby\_proto\_repositories
+
+Enable ruby support by loading the dependencies in your workspace.
+
+```python
+load("@org_pubref_rules_protobuf//ruby:rules.bzl", "ruby_proto_repositories")
+ruby_proto_repositories()
+```
+
 ## ruby\_proto\_compile
 
 This is a thin wrapper over the
@@ -24,3 +34,9 @@ $ bazel build :protos
 Target //:protos up-to-date:
   bazel-genfiles/message_pb.rb
 ```
+
+## ruby\_proto\_library (not implemented)
+
+Support for a library rule would be dependent on loading the ruby
+runtime and ruby gems dependencies (this does not exist in bazel
+ecosystem at the moment).
diff --git a/ruby/rules.bzl b/ruby/rules.bzl
@@ -1,4 +1,12 @@
-load("//protobuf:rules.bzl", "proto_compile")
+load("//protobuf:rules.bzl", "proto_compile", "proto_repositories")
+
+def ruby_proto_repositories(
+    lang_requires = [
+      "grpc",
+      "external_protobuf_compiler",
+      "external_protoc_gen_grpc_ruby",
+    ], **kwargs):
+  proto_repositories(lang_requires = lang_requires, **kwargs)
 
 def ruby_proto_compile(langs = [str(Label("//ruby"))], **kwargs):
   proto_compile(langs = langs, **kwargs)
