Skip to content

P
protobuf
Commit afaa8278 authored by Feng Xiao's avatar Feng Xiao Committed by GitHub
Browse files
Options

Merge pull request #2246 from fweikert/patch-1 

Declare all inputs of protoc action
parents fd046f62 c2b3e70e
Show whitespace changes
Inline Side-by-side
Showing with 3 additions and 1 deletion
protobuf.bzl
View file @ afaa8278
...@@ -62,6 +62,7 @@ def _proto_gen_impl(ctx): ...@@ -62,6 +62,7 @@ def _proto_gen_impl(ctx):
if ctx.attr.gen_py: if ctx.attr.gen_py:
args += ["--python_out=" + ctx.var["GENDIR"] + "/" + gen_dir] args += ["--python_out=" + ctx.var["GENDIR"] + "/" + gen_dir]
inputs = srcs + deps
if ctx.executable.plugin: if ctx.executable.plugin:
plugin = ctx.executable.plugin plugin = ctx.executable.plugin
lang = ctx.attr.plugin_language lang = ctx.attr.plugin_language
...@@ -75,10 +76,11 @@ def _proto_gen_impl(ctx): ...@@ -75,10 +76,11 @@ def _proto_gen_impl(ctx):
outdir = ",".join(ctx.attr.plugin_options) + ":" + outdir outdir = ",".join(ctx.attr.plugin_options) + ":" + outdir
args += ["--plugin=protoc-gen-%s=%s" % (lang, plugin.path)] args += ["--plugin=protoc-gen-%s=%s" % (lang, plugin.path)]
args += ["--%s_out=%s" % (lang, outdir)] args += ["--%s_out=%s" % (lang, outdir)]
inputs += [plugin]
if args: if args:
ctx.action( ctx.action(
inputs=srcs + deps, inputs=inputs,
outputs=ctx.outputs.outs, outputs=ctx.outputs.outs,
arguments=args + import_flags + [s.path for s in srcs], arguments=args + import_flags + [s.path for s in srcs],
executable=ctx.executable.protoc, executable=ctx.executable.protoc,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment