Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(builtin): additional_root_paths in pkg_web should also include paths in genfiles and bin dirs #1402

Merged
merged 1 commit into from
Nov 27, 2019
Merged

fix(builtin): additional_root_paths in pkg_web should also include paths in genfiles and bin dirs #1402

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions internal/pkg_web/pkg_web.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,13 @@ def move_files(output_name, files, action_factory, assembler, root_paths):

def additional_root_paths(ctx):
return ctx.attr.additional_root_paths + [
# also add additional_root_paths variants from genfiles dir and bin dir
"/".join([ctx.genfiles_dir.path, p])
for p in ctx.attr.additional_root_paths
] + [
"/".join([ctx.bin_dir.path, p])
for p in ctx.attr.additional_root_paths
] + [
# package path is the root, including in bin/gen
ctx.label.package,
"/".join([ctx.bin_dir.path, ctx.label.package]),
Expand Down