AuroraMiddleware/protobuf
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity

Make protobuf Skylark extension appends the workspace root

Browse Source 
This change make protobuf skylark extension works when using
remote repository.

Note that this make the Skylark extension unusable prior
to Bazel 0.1.4 because the workspace_root is not available
on prior version.

Tested with Bazel 0.1.4rc2.

Fixes https://github.com/bazelbuild/bazel/issues/784.
This commit is contained in:
Damien Martin-Guillerez 2016-01-15 14:01:37 +01:00
parent b6ef4015d7
commit 76547e5190
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
protobuf.bzl
View File

@ -1,13 +1,19 @@
# -*- mode: python; -*- PYTHON-PREPROCESSING-REQUIRED
def _GetPath(ctx, path):
if ctx.label.workspace_root:
return ctx.label.workspace_root + '/' + path
else:
return path
def _GenDir(ctx):
if not ctx.attr.includes:
return ""
return ctx.label.workspace_root
if not ctx.attr.includes[0]:
return ctx.label.package
return _GetPath(ctx, ctx.label.package)
if not ctx.label.package:
return ctx.attr.includes[0]
return ctx.label.package + '/' + ctx.attr.includes[0]
return _GetPath(ctx, ctx.attr.includes[0])
return _GetPath(ctx, ctx.label.package + '/' + ctx.attr.includes[0])
def _CcOuts(srcs):
return [s[:-len(".proto")] + ".pb.h" for s in srcs] + \
@ -36,8 +42,6 @@ def _RelativeOutputPath(path, include):
return path[len(PACKAGE_NAME)+1:]
def _proto_gen_impl(ctx):
"""General implementation for generating protos"""
srcs = ctx.files.srcs