diff options
| author |  Nicolas "Pixel" Noble <pixel@nobis-crew.org> | 2017-01-11 01:03:09 +0100 |
|---|---|---|
| committer | Nicolas "Pixel" Noble <pixel@nobis-crew.org> | 2017-01-13 02:55:13 +0100 |
| commit | 24263c3f7a3b04f073712e40376829e47772d7db (patch) | |
| tree | 8ef2fc0492ebb36cb437b134ae36fe6ce69ea201 /bazel | |
| parent | 6cf58c81731343e0ffb134febd3e576425399e5e (diff) | |
Fixing a few items with the new Bazel BUILD system:
-) Fixing Bazel 0.4.x breakage
-) Adding helloworld BUILD examples
-) Fixing grpc++ missing files.
-) Adding helloworld example as a test for Bazel basic.
Diffstat (limited to 'bazel')
| -rw-r--r-- | bazel/BUILD | 8 | ||||
| -rw-r--r-- | bazel/cc_grpc_library.bzl | 1 | ||||
| -rw-r--r-- | bazel/generate_cc.bzl | 4 |
3 files changed, 10 insertions, 3 deletions
diff --git a/bazel/BUILD b/bazel/BUILD index 940a379404..44a1673212 100644 --- a/bazel/BUILD +++ b/bazel/BUILD @@ -2,8 +2,14 @@ package(default_visibility = ["//:__subpackages__"]) load(":cc_grpc_library.bzl", "cc_grpc_library") +proto_library( + name = "well_known_protos_list", + srcs = ["@submodule_protobuf//:well_known_protos"], +) + cc_grpc_library( name = "well_known_protos", - srcs = "@submodule_protobuf//:well_known_protos", + srcs = "well_known_protos_list", + deps = [], proto_only = True, ) diff --git a/bazel/cc_grpc_library.bzl b/bazel/cc_grpc_library.bzl index e1dd27b0c3..9020eacb74 100644 --- a/bazel/cc_grpc_library.bzl +++ b/bazel/cc_grpc_library.bzl @@ -44,7 +44,6 @@ def cc_grpc_library(name, srcs, deps, proto_only, **kwargs): **kwargs ) - if not proto_only: native.cc_library( name = name, srcs = [":" + codegen_grpc_target, ":" + codegen_target], diff --git a/bazel/generate_cc.bzl b/bazel/generate_cc.bzl index 3665733681..d49cbe8d72 100644 --- a/bazel/generate_cc.bzl +++ b/bazel/generate_cc.bzl @@ -24,13 +24,15 @@ def generate_cc_impl(ctx): if ctx.executable.plugin: arguments += ["--plugin=protoc-gen-PLUGIN=" + ctx.executable.plugin.path] arguments += ["--PLUGIN_out=" + ",".join(ctx.attr.flags) + ":" + dir_out] + additional_input = [ctx.executable.plugin] else: arguments += ["--cpp_out=" + ",".join(ctx.attr.flags) + ":" + dir_out] + additional_input = [] arguments += ["-I{0}={0}".format(include.path) for include in includes] arguments += [proto.path for proto in protos] ctx.action( - inputs = protos + includes, + inputs = protos + includes + additional_input, outputs = out_files, executable = ctx.executable._protoc, arguments = arguments, |