Skip to content

Mark file paths in format for path mapping #609

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

Draft
fmeum wants to merge 1 commit into
base: main
Choose a base branch
from
+15 −7
Draft

Mark file paths in format for path mapping #609

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
22 changes: 15 additions & 7 deletions cc/toolchains/impl/nested_args.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -294,14 +294,22 @@ def _escape(s):
def _format_target(target, fail = fail):
if VariableInfo in target:
return "%%{%s}" % target[VariableInfo].name
elif DirectoryInfo in target:
return _escape(target[DirectoryInfo].path)

files = target[DefaultInfo].files.to_list()
if len(files) == 1:
return _escape(files[0].path)

fail("%s should be either a variable, a directory, or a single file." % target.label)
path = None
if DirectoryInfo in target:
path = target[DirectoryInfo].path
else:
files = target[DefaultInfo].files.to_list()
if len(files) == 1:
path = files[0].path
if path == None:
fail("%s should be either a variable, a directory, or a single file." % target.label)
if "}" in path:
fail("The path %r of target %s used with 'format' cannot contain } because it would interfere with the formatting." % (
path,
target.label,
))
return "%%{path:%s}" % path

def _format_string(arg, format, used_vars, fail = fail):
upto = 0
Expand Down