diff options
| author | Feng Xiao <xiaofeng@google.com> | 2016-10-13 15:31:18 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-13 15:31:18 -0700 |
| commit | 993d60403015392b5897c1ed36f8feafc51f8186 (patch) | |
| tree | 8d30210077bc520bf4b4e8f0a4db2efdd75df4c1 /protobuf.bzl | |
| parent | ad88f905ae33a4c8824441c53f54736e2ae357dd (diff) | |
| parent | bbeb983bac166392c787ae7130abac474faaae10 (diff) | |
| download | protobuf-993d60403015392b5897c1ed36f8feafc51f8186.tar.gz protobuf-993d60403015392b5897c1ed36f8feafc51f8186.tar.bz2 protobuf-993d60403015392b5897c1ed36f8feafc51f8186.zip | |
Merge pull request #1959 from abergmeier-dsfishlabs/feature/cpp
Need to expose generated protobuf C++ headers
Diffstat (limited to 'protobuf.bzl')
| -rw-r--r-- | protobuf.bzl | 24 |
1 files changed, 17 insertions, 7 deletions
diff --git a/protobuf.bzl b/protobuf.bzl index e56a5365..ac448201 100644 --- a/protobuf.bzl +++ b/protobuf.bzl @@ -15,14 +15,21 @@ def _GenDir(ctx): return _GetPath(ctx, ctx.attr.includes[0]) return _GetPath(ctx, ctx.label.package + '/' + ctx.attr.includes[0]) -def _CcOuts(srcs, use_grpc_plugin=False): - ret = [s[:-len(".proto")] + ".pb.h" for s in srcs] + \ - [s[:-len(".proto")] + ".pb.cc" for s in srcs] +def _CcHdrs(srcs, use_grpc_plugin=False): + ret = [s[:-len(".proto")] + ".pb.h" for s in srcs] + if use_grpc_plugin: + ret += [s[:-len(".proto")] + ".grpc.pb.h" for s in srcs] + return ret + +def _CcSrcs(srcs, use_grpc_plugin=False): + ret = [s[:-len(".proto")] + ".pb.cc" for s in srcs] if use_grpc_plugin: - ret += [s[:-len(".proto")] + ".grpc.pb.h" for s in srcs] + \ - [s[:-len(".proto")] + ".grpc.pb.cc" for s in srcs] + ret += [s[:-len(".proto")] + ".grpc.pb.cc" for s in srcs] return ret +def _CcOuts(srcs, use_grpc_plugin=False): + return _CcHdrs(srcs, use_grpc_plugin) + _CcSrcs(srcs, use_grpc_plugin) + def _PyOuts(srcs): return [s[:-len(".proto")] + "_pb2.py" for s in srcs] @@ -203,7 +210,9 @@ def cc_proto_library( if use_grpc_plugin: grpc_cpp_plugin = "//external:grpc_cpp_plugin" - outs = _CcOuts(srcs, use_grpc_plugin) + gen_srcs = _CcSrcs(srcs, use_grpc_plugin) + gen_hdrs = _CcHdrs(srcs, use_grpc_plugin) + outs = gen_srcs + gen_hdrs proto_gen( name=name + "_genproto", @@ -225,7 +234,8 @@ def cc_proto_library( native.cc_library( name=name, - srcs=outs, + srcs=gen_srcs, + hdrs=gen_hdrs, deps=cc_libs + deps, includes=includes, **kargs) |