Rename attribute 'srcs' back to 'protos'

Author: pcj

bzl/cpp/rules.bzl

@@ -15,27 +15,27 @@ def cc_proto_library(
     protobuf_plugin_options = [],
     protobuf_plugin = None,
     proto_compile = cc_proto_compile,
+    proto_deps = [],
     protoc = PROTOC,
+    protos = [],
     srcs = [],
     verbose = 0,
     visibility = None,
     with_grpc = False,
-    cc_deps = [],
-    cc_srcs = [],
     **kwargs):
 
   args = {}
   args["name"] = name + ".pb"
   args["copy_protos_to_genfiles"] = copy_protos_to_genfiles
-  args["deps"] = [d + ".pb" for d in deps]
   args["imports"] = imports
   args["gen_" + lang.name] = True
   args["gen_grpc_" + lang.name] = with_grpc
   args["gen_protobuf_" + lang.name + "_plugin"] = protobuf_plugin
   args["gen_" + lang.name + "_plugin_options"] = protobuf_plugin_options
   args["gen_grpc_" + lang.name + "_plugin"] = grpc_plugin
+  args["proto_deps"] = [d + ".pb" for d in proto_deps]
   args["protoc"] = protoc
-  args["protos"] = srcs
+  args["protos"] = protos
   args["verbose"] = verbose
   args["with_grpc"] = with_grpc
 
@@ -46,11 +46,11 @@ def cc_proto_library(
   elif hasattr(lang, "protobuf"):
     deps += [str(Label(dep)) for dep in getattr(lang.protobuf, "compile_deps", [])]
 
-  deps = list(set(deps + cc_deps))
+  deps = list(set(deps + proto_deps))
 
   native.cc_library(
     name = name,
-    srcs = cc_srcs + [name + ".pb"],
+    srcs = srcs + [name + ".pb"],
     deps = deps,
     **kwargs
   )

bzl/go/class.bzl

@@ -49,7 +49,7 @@ def build_imports(lang, self):
 
     go_prefix = ctx.attr.go_prefix.go_prefix
 
-    for dep in ctx.attr.deps:
+    for dep in ctx.attr.proto_deps:
         provider = dep.proto
         proto_packages = provider.transitive_packages
         for pkg, srcs in proto_packages.items():

bzl/go/rules.bzl

@@ -15,27 +15,27 @@ def go_proto_library(
     protobuf_plugin_options = [],
     protobuf_plugin = None,
     proto_compile = go_proto_compile,
+    proto_deps = [],
     protoc = PROTOC,
+    protos = [],
     srcs = [],
     verbose = 0,
     visibility = None,
     with_grpc = False,
-    go_deps = [],
-    go_srcs = [],
     **kwargs):
 
   args = {}
   args["name"] = name + ".pb"
   args["copy_protos_to_genfiles"] = copy_protos_to_genfiles
-  args["deps"] = [d + ".pb" for d in deps]
+  args["proto_deps"] = [d + ".pb" for d in proto_deps]
   args["imports"] = imports
   args["gen_" + lang.name] = True
   args["gen_grpc_" + lang.name] = with_grpc
   args["gen_protobuf_" + lang.name + "_plugin"] = protobuf_plugin
   args["gen_" + lang.name + "_plugin_options"] = protobuf_plugin_options
   args["gen_grpc_" + lang.name + "_plugin"] = grpc_plugin
   args["protoc"] = protoc
-  args["protos"] = srcs
+  args["protos"] = protos
   args["verbose"] = verbose
   args["with_grpc"] = with_grpc
 
@@ -46,11 +46,11 @@ def go_proto_library(
   elif hasattr(lang, "protobuf"):
     deps += [str(Label(dep)) for dep in getattr(lang.protobuf, "compile_deps", [])]
 
-  deps = list(set(deps + go_deps))
+  deps = list(set(deps + proto_deps))
 
   go_library(
      name = name,
-     srcs = go_srcs + [ name + ".pb"],
+     srcs = srcs + [ name + ".pb"],
      deps = deps,
      **kwargs
   )

bzl/grpc_gateway/rules.bzl

@@ -17,27 +17,26 @@ def grpc_gateway_proto_library(
     protobuf_plugin_options = [],
     protobuf_plugin = None,
     proto_compile = grpc_gateway_proto_compile,
+    proto_deps = [],
     protoc = PROTOC,
+    protos = [],
     srcs = [],
     verbose = 0,
     visibility = None,
-    go_deps = [],
     go_rule = go_library,
-    go_srcs = [],
 
+    go_import_map = {},
     logtostderr = True,
     alsologtostderr = False,
     log_dir = None,
     log_level = None,
     import_prefix = None,
-    go_import_map = {},
 
     **kwargs):
 
   args = {}
   args["name"] = name + ".pb"
   args["copy_protos_to_genfiles"] = copy_protos_to_genfiles
-  args["deps"] = [d + ".pb" for d in deps]
   args["imports"] = imports
 
   args["gen_" + lang.name] = True
@@ -51,8 +50,9 @@ def grpc_gateway_proto_library(
   args["gen_protobuf_" + GO.name + "_plugin"] = GO.protobuf.executable
   args[GO.name + "_import_map"] = go_import_map + GATEWAY.default_go_import_map
 
+  args["proto_deps"] = [d + ".pb" for d in proto_deps]
   args["protoc"] = protoc
-  args["protos"] = srcs
+  args["protos"] = protos
   args["verbose"] = verbose
   args["with_grpc"] = True
 
@@ -65,26 +65,26 @@ def grpc_gateway_proto_library(
   proto_compile(**args)
 
   deps += [str(Label(dep)) for dep in lang.grpc.compile_deps]
-  deps = list(set(deps + go_deps))
+  deps = list(set(deps + proto_deps))
 
   go_rule(
      name = name,
-     srcs = go_srcs + [name + ".pb"],
+     srcs = srcs + [name + ".pb"],
      deps = deps,
      **kwargs
   )
 
 
-def grpc_gateway_binary(name, protolib_name = "go_default_library", srcs = [], deps = [], protos = [], proto_deps = [], **kwargs):
+def grpc_gateway_binary(name, srcs = [], deps = [], protos = [], proto_label = "go_default_library", proto_deps = [], **kwargs):
   grpc_gateway_proto_library(
-    name = protolib_name,
-    srcs = protos,
-    deps = proto_deps,
+    name = proto_label,
+    protos = protos,
+    proto_deps = proto_deps,
      **kwargs
   )
 
   go_binary(
      name = name,
      srcs = srcs,
-     deps = deps + [protolib_name] + GATEWAY.grpc.compile_deps,
+     deps = deps + [proto_label] + GATEWAY.grpc.compile_deps,
   )

bzl/java/rules.bzl

@@ -14,27 +14,27 @@ def java_proto_library(
     protobuf_plugin_options = [],
     protobuf_plugin = None,
     proto_compile = java_proto_compile,
+    proto_deps = [],
     protoc = PROTOC,
+    protos = [],
     srcs = [],
     verbose = 0,
     visibility = None,
     with_grpc = False,
-    java_deps = [],
-    java_srcs = [],
     **kwargs):
 
   args = {}
   args["name"] = name + ".pb"
   args["copy_protos_to_genfiles"] = False
-  args["deps"] = [d + "_pb" for d in deps]
   args["imports"] = imports
   args["gen_" + lang.name] = True
   args["gen_grpc_" + lang.name] = with_grpc
   args["gen_protobuf_" + lang.name + "_plugin"] = protobuf_plugin
   args["gen_" + lang.name + "_plugin_options"] = protobuf_plugin_options
   args["gen_grpc_" + lang.name + "_plugin"] = grpc_plugin
+  args["proto_deps"] = [d + "_pb" for d in deps]
   args["protoc"] = protoc
-  args["protos"] = srcs
+  args["protos"] = protos
   args["verbose"] = verbose
   args["with_grpc"] = with_grpc
 
@@ -45,11 +45,11 @@ def java_proto_library(
   elif hasattr(lang, "protobuf"):
     deps += [str(Label(dep)) for dep in getattr(lang.protobuf, "compile_deps", [])]
 
-  deps = list(set(deps + java_deps))
+  deps = list(set(deps + proto_deps))
 
   native.java_library(
     name = name,
-    srcs = java_srcs + [name + ".pb.srcjar"],
+    srcs = srcs + [name + ".pb.srcjar"],
     deps = deps,
     **kwargs
   )

bzl/protoc.bzl

@@ -103,7 +103,7 @@ def _protoc_rule_impl(ctx):
   }
 
   # Propogate proto deps:
-  for dep in ctx.attr.deps:
+  for dep in ctx.attr.proto_deps:
     self["transitive_imports"] += dep.proto.transitive_imports
     self["transitive_packages"] += dep.proto.transitive_packages
     self["transitive_requires"] += dep.proto.transitive_requires
@@ -188,7 +188,7 @@ def implement(spec):
   )
 
   # *_proto_{compile,library} rule dependencies.
-  attrs["deps"] = attr.label_list(providers = ["proto"])
+  attrs["proto_deps"] = attr.label_list(providers = ["proto"])
 
   # Options to be passed to protoc as --proto_path.
   attrs["imports"] = attr.string_list()

examples/helloworld/grpc_gateway/BUILD

@@ -7,14 +7,14 @@ load("//bzl:grpc_gateway/rules.bzl", "grpc_gateway_proto_library", "grpc_gateway
 
 # grpc_gateway_proto_library(
 #     name = "gateway",
-#     srcs = ["helloworld.proto"],
+#     protos = ["helloworld.proto"],
 #     verbose = 2,
 # )
 
 grpc_gateway_binary(
     name = "greeter",
     srcs = ["greeter.go"],
-    protolib_name = "gateway",
+    proto_label = "gateway",
     protos = ["helloworld.proto"],
     verbose = 0,
 )
@@ -34,13 +34,6 @@ grpc_gateway_binary(
 # )
 
 
-# grpc_gateway_binary(
-#     name = "gateway",
-#     srcs = ["helloworld.proto"],
-#     go_srcs = ["greeter.go"]
-#     verbose = 2,
-# )
-
 go_test(
     name = "greeter_test",
     size = "small",

examples/helloworld/java/org/pubref/rules_protobuf/examples/helloworld/proto/BUILD

@@ -4,9 +4,9 @@ load("//bzl:java/rules.bzl", "java_proto_library")
 
 java_proto_library(
     name = "proto",
-    srcs = [
-        "//examples/helloworld/proto:srcs",
-        "//examples/proto:srcs",
+    protos = [
+        "//examples/helloworld/proto:protos",
+        "//examples/proto:protos",
     ],
     verbose = 0,
     with_grpc = True,

examples/helloworld/proto/BUILD

@@ -4,26 +4,26 @@ load("//bzl:cpp/rules.bzl", "cc_proto_library")
 load("//bzl:go/rules.bzl", "go_proto_library")
 
 filegroup(
-    name = "srcs",
+    name = "protos",
     srcs = ["helloworld.proto"],
 )
 
 go_proto_library(
     name = "go",
-    srcs = [":srcs"],
+    protos = [":protos"],
     verbose = 0,
     with_grpc = True,
-    deps = [
+    proto_deps = [
         "//examples/proto:go_default_library",
     ],
 )
 
 cc_proto_library(
     name = "cpp",
-    srcs = [":srcs"],
+    protos = [":protos"],
     verbose = 0,
     with_grpc = True,
-    deps = [
+    proto_deps = [
         "//examples/proto:cpp",
     ],
 )

examples/proto/BUILD

@@ -4,19 +4,19 @@ load("//bzl:cpp/rules.bzl", "cc_proto_library")
 load("//bzl:go/rules.bzl", "go_proto_library")
 
 filegroup(
-    name = "srcs",
+    name = "protos",
     srcs = [
         "common.proto",
     ],
 )
 
 go_proto_library(
     name = "go_default_library",
-    srcs = [":srcs"],
+    protos = [":protos"],
 )
 
 cc_proto_library(
     name = "cpp",
-    srcs = [":srcs"],
+    protos = [":protos"],
     verbose = 0,
 )