opendev/gerrit
Code Issues Proposed changes

Merge branch 'stable-2.14' into stable-2.15

Browse Source 
* stable-2.14:
  Bazel: Make build tool chain forward compatible

Change-Id: I05fefd79f3a4509aabf2425b52c39b7047e2b160
This commit is contained in:
David Ostrovsky
2019-06-12 22:16:22 +02:00
parent 6cecdd5c97 2b720e7630
commit 80bf61d68d
1 changed files with 32 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
tools/bzl/js.bzl
View File

@@ -44,6 +44,8 @@ npm_binary = repository_rule(
implementation = _npm_binary_impl, implementation = _npm_binary_impl,
) )
ComponentInfo = provider()
# for use in repo rules. # for use in repo rules.
def _run_npm_binary_str(ctx, tarball, args): def _run_npm_binary_str(ctx, tarball, args):
python_bin = ctx.which("python") python_bin = ctx.which("python")
@@ -132,31 +134,29 @@ bower_archive = repository_rule(
def _bower_component_impl(ctx): def _bower_component_impl(ctx):
transitive_zipfiles = depset( transitive_zipfiles = depset(
direct = [ctx.file.zipfile], direct = [ctx.file.zipfile],
transitive = [d.transitive_zipfiles for d in ctx.attr.deps], transitive = [d[ComponentInfo].transitive_zipfiles for d in ctx.attr.deps],
) )
transitive_licenses = depset( transitive_licenses = depset(
direct = [ctx.file.license], direct = [ctx.file.license],
transitive = [d.transitive_licenses for d in ctx.attr.deps], transitive = [d[ComponentInfo].transitive_licenses for d in ctx.attr.deps],
) )
transitive_versions = depset( transitive_versions = depset(
direct = ctx.files.version_json, direct = ctx.files.version_json,
transitive = [d.transitive_versions for d in ctx.attr.deps], transitive = [d[ComponentInfo].transitive_versions for d in ctx.attr.deps],
) )
return struct( return [
transitive_zipfiles = transitive_zipfiles, ComponentInfo(
transitive_versions = transitive_versions, transitive_licenses = transitive_licenses,
transitive_licenses = transitive_licenses, transitive_versions = transitive_versions,
) transitive_zipfiles = transitive_zipfiles,
),
]
_common_attrs = { _common_attrs = {
"deps": attr.label_list(providers = [ "deps": attr.label_list(providers = [ComponentInfo]),
"transitive_zipfiles",
"transitive_versions",
"transitive_licenses",
]),
} }
def _js_component(ctx): def _js_component(ctx):
@@ -186,11 +186,13 @@ def _js_component(ctx):
if ctx.file.license: if ctx.file.license:
licenses.append(ctx.file.license) licenses.append(ctx.file.license)
return struct( return [
transitive_zipfiles = list([ctx.outputs.zip]), ComponentInfo(
transitive_versions = depset(), transitive_licenses = depset(licenses),
transitive_licenses = depset(licenses), transitive_versions = depset(),
) transitive_zipfiles = list([ctx.outputs.zip]),
),
]
js_component = rule( js_component = rule(
_js_component, _js_component,
@@ -232,16 +234,16 @@ def _bower_component_bundle_impl(ctx):
"""A bunch of bower components zipped up.""" """A bunch of bower components zipped up."""
zips = depset() zips = depset()
for d in ctx.attr.deps: for d in ctx.attr.deps:
files = d.transitive_zipfiles files = d[ComponentInfo].transitive_zipfiles
# TODO(davido): Make sure the field always contains a depset # TODO(davido): Make sure the field always contains a depset
if type(files) == "list": if type(files) == "list":
files = depset(files) files = depset(files)
zips = depset(transitive = [zips, files]) zips = depset(transitive = [zips, files])
versions = depset(transitive = [d.transitive_versions for d in ctx.attr.deps]) versions = depset(transitive = [d[ComponentInfo].transitive_versions for d in ctx.attr.deps])
licenses = depset(transitive = [d.transitive_versions for d in ctx.attr.deps]) licenses = depset(transitive = [d[ComponentInfo].transitive_versions for d in ctx.attr.deps])
out_zip = ctx.outputs.zip out_zip = ctx.outputs.zip
out_versions = ctx.outputs.version_json out_versions = ctx.outputs.version_json
@@ -271,11 +273,13 @@ def _bower_component_bundle_impl(ctx):
command = "(echo '{' ; for j in %s ; do cat $j; echo ',' ; done ; echo \\\"\\\":\\\"\\\"; echo '}') > %s" % (" ".join([v.path for v in versions.to_list()]), out_versions.path), command = "(echo '{' ; for j in %s ; do cat $j; echo ',' ; done ; echo \\\"\\\":\\\"\\\"; echo '}') > %s" % (" ".join([v.path for v in versions.to_list()]), out_versions.path),
) )
return struct( return [
transitive_zipfiles = zips, ComponentInfo(
transitive_versions = versions, transitive_licenses = licenses,
transitive_licenses = licenses, transitive_versions = versions,
) transitive_zipfiles = zips,
),
]
bower_component_bundle = rule( bower_component_bundle = rule(
_bower_component_bundle_impl, _bower_component_bundle_impl,
@@ -301,7 +305,7 @@ def _vulcanize_impl(ctx):
ctx.outputs.html.path + ".vulcanized.html", ctx.outputs.html.path + ".vulcanized.html",
) )
destdir = ctx.outputs.html.path + ".dir" destdir = ctx.outputs.html.path + ".dir"
zips = [z for d in ctx.attr.deps for z in d.transitive_zipfiles.to_list()] zips = [z for d in ctx.attr.deps for z in d[ComponentInfo].transitive_zipfiles.to_list()]
hermetic_npm_binary = " ".join([ hermetic_npm_binary = " ".join([
"python", "python",
@@ -392,7 +396,7 @@ _vulcanize_rule = rule(
allow_single_file = True, allow_single_file = True,
), ),
"pkg": attr.string(mandatory = True), "pkg": attr.string(mandatory = True),
"deps": attr.label_list(providers = ["transitive_zipfiles"]), "deps": attr.label_list(providers = [ComponentInfo]),
"_crisper_archive": attr.label( "_crisper_archive": attr.label(
default = Label("@crisper//:%s" % _npm_tarball("crisper")), default = Label("@crisper//:%s" % _npm_tarball("crisper")),
allow_single_file = True, allow_single_file = True,