lzhr/v2fly
1
0
Fork 0
mirror of https://github.com/v2fly/v2ray-core.git synced 2024-12-22 01:57:12 -05:00
Code Issues Releases Wiki Activity

Merge pull request #1783 from lucifer9/fix-bazel

Browse Source 
fix incompatible errors when building with bazel 0.26+
This commit is contained in:
Kslr 2019-06-29 10:59:20 +08:00 committed by GitHub
commit de43bc7eb9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
infra/bazel/zip.bzl
View File

@ -47,10 +47,7 @@ def _zip_file(ctx):
if (s.startswith("/") or s.endswith("/") or if (s.startswith("/") or s.endswith("/") or
d.startswith("/") or d.endswith("/")): d.startswith("/") or d.endswith("/")):
fail("mappings should not begin or end with slash") fail("mappings should not begin or end with slash")
srcs = depset() srcs = depset(transitive = [depset(ctx.files.srcs),depset(ctx.files.data),depset(collect_runfiles(ctx.attr.data))])
srcs += ctx.files.srcs
srcs += ctx.files.data
srcs += collect_runfiles(ctx.attr.data)
mapped = _map_sources(ctx, srcs, ctx.attr.mappings) mapped = _map_sources(ctx, srcs, ctx.attr.mappings)
cmd = [ cmd = [
"#!/bin/sh", "#!/bin/sh",
@ -74,7 +71,7 @@ def _zip_file(ctx):
for _, zip_path in mapped for _, zip_path in mapped
if "/" in zip_path if "/" in zip_path
], ],
) ).to_list()
] ]
cmd += [ cmd += [
'ln -sf "${repo}/%s" "${tmp}/%s"' % (path, zip_path) 'ln -sf "${repo}/%s" "${tmp}/%s"' % (path, zip_path)
@ -86,12 +83,12 @@ def _zip_file(ctx):
'cd "${repo}"', 'cd "${repo}"',
'rm -rf "${tmp}"', 'rm -rf "${tmp}"',
] ]
script = ctx.new_file(ctx.bin_dir, "%s.sh" % ctx.label.name) script = ctx.actions.declare_file("%s/%s.sh" % (ctx.bin_dir, ctx.label.name))
ctx.file_action(output = script, content = "\n".join(cmd), executable = True) ctx.actions.write(output = script, content = "\n".join(cmd), is_executable = True)
inputs = [ctx.file._zipper] inputs = [ctx.file._zipper]
inputs += [dep.zip_file for dep in ctx.attr.deps] inputs += [dep.zip_file for dep in ctx.attr.deps]
inputs += list(srcs) inputs += list(srcs.to_list())
ctx.action( ctx.actions.run(
inputs = inputs, inputs = inputs,
outputs = [ctx.outputs.out], outputs = [ctx.outputs.out],
executable = script, executable = script,
@ -117,7 +114,7 @@ def _map_sources(ctx, srcs, mappings):
mappings_indexes = range(len(mappings)) mappings_indexes = range(len(mappings))
used = {i: False for i in mappings_indexes} used = {i: False for i in mappings_indexes}
mapped = [] mapped = []
for file_ in srcs: for file_ in srcs.to_list():
run_path = long_path(ctx, file_) run_path = long_path(ctx, file_)
zip_path = None zip_path = None
for i in mappings_indexes: for i in mappings_indexes:
@ -159,6 +156,6 @@ pkg_zip = rule(
"deps": attr.label_list(providers = ["zip_file"]), "deps": attr.label_list(providers = ["zip_file"]),
"exclude": attr.string_list(), "exclude": attr.string_list(),
"mappings": attr.string_dict(), "mappings": attr.string_dict(),
"_zipper": attr.label(default = Label(ZIPPER), single_file = True), "_zipper": attr.label(default = Label(ZIPPER), allow_single_file = True),
}, },
) )