Add setup_args and run `meson setup` explictly (#1223)

Co-authored-by: James Sharpe <james.sharpe@zenotech.com>
This commit is contained in:
Michael Allwright 2024-08-08 12:19:19 +02:00 committed by GitHub
parent d58cdf65cd
commit af66969246
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 8 additions and 1 deletions

View File

@ -110,10 +110,13 @@ def _create_meson_script(configureParameters):
prefix = "{} ".format(expand_locations_and_make_variables(ctx, attrs.tool_prefix, "tool_prefix", data)) if attrs.tool_prefix else "" prefix = "{} ".format(expand_locations_and_make_variables(ctx, attrs.tool_prefix, "tool_prefix", data)) if attrs.tool_prefix else ""
script.append("{prefix}{meson} --prefix={install_dir} {options} {source_dir}".format( setup_args_str = " ".join(expand_locations_and_make_variables(ctx, ctx.attr.setup_args, "setup_args", data))
script.append("{prefix}{meson} setup --prefix={install_dir} {setup_args} {options} {source_dir}".format(
prefix = prefix, prefix = prefix,
meson = attrs.meson_path, meson = attrs.meson_path,
install_dir = "$$INSTALLDIR$$", install_dir = "$$INSTALLDIR$$",
setup_args = setup_args_str,
options = options_str, options = options_str,
source_dir = "$$EXT_BUILD_ROOT$$/" + root, source_dir = "$$EXT_BUILD_ROOT$$/" + root,
)) ))
@ -171,6 +174,10 @@ def _attrs():
mandatory = False, mandatory = False,
default = {}, default = {},
), ),
"setup_args": attr.string_list(
doc = "Arguments for the Meson setup command",
mandatory = False,
),
}) })
return attrs return attrs