Browse Source

Merge pull request #2246 from fweikert/patch-1

Declare all inputs of protoc action
Feng Xiao 9 years ago
parent
commit
afaa827860
1 changed files with 3 additions and 1 deletions
  1. 3 1
      protobuf.bzl

+ 3 - 1
protobuf.bzl

@@ -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):
       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,