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

Fix moving generated files onto themselves

Browse Source
This commit is contained in:
Fahrzin Hemmati 2018-03-26 19:09:08 -07:00
parent 0d68b29ac4
commit 2cfa7612b2
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
protobuf.bzl
View File

@ -72,7 +72,7 @@ def _proto_gen_impl(ctx):
deps = []
deps += ctx.files.srcs
source_dir = _SourceDir(ctx)
gen_dir = _GenDir(ctx)
gen_dir = _GenDir(ctx).rstrip('/')
if source_dir:
import_flags = ["-I" + source_dir, "-I" + gen_dir]
else:
@ -94,7 +94,7 @@ def _proto_gen_impl(ctx):
for src in srcs:
args = []
in_gen_dir = src.root.path == gen_dir.rstrip('/')
in_gen_dir = src.root.path == gen_dir
if in_gen_dir:
import_flags_real = []
for f in depset(import_flags):
@ -148,8 +148,10 @@ def _proto_gen_impl(ctx):
"cd %s" % src.dirname,
"${CMD}",
"cd -",
"mv %s/%s %s" % (gen_dir, out.basename, out.path)
])
generated_out = '/'.join([gen_dir, out.basename])
if generated_out != out.path:
command += ";mv %s %s" % (generated_out, out.path)
ctx.action(
inputs=inputs + [ctx.executable.protoc],
outputs=[out],