backends: remove unused name parameter from as_meson_exe_cmdline

This parameter isn't used, at all, so just remove it
pull/9143/head
Dylan Baker 3 years ago committed by Daniel Mensinger
parent 2a70c039bf
commit 0ca0e6116c
  1. 2
      mesonbuild/backend/backends.py
  2. 7
      mesonbuild/backend/ninjabackend.py
  3. 5
      mesonbuild/backend/vs2010backend.py
  4. 3
      mesonbuild/backend/xcodebackend.py

@ -500,7 +500,7 @@ class Backend:
exe_wrapper, workdir, exe_wrapper, workdir,
extra_paths, capture, feed, tag) extra_paths, capture, feed, tag)
def as_meson_exe_cmdline(self, tname, exe, cmd_args, workdir=None, def as_meson_exe_cmdline(self, exe, cmd_args, workdir=None,
extra_bdeps=None, capture=None, feed=None, extra_bdeps=None, capture=None, feed=None,
force_serialize=False, force_serialize=False,
env: T.Optional[build.EnvironmentVariables] = None, env: T.Optional[build.EnvironmentVariables] = None,

@ -984,7 +984,7 @@ class NinjaBackend(backends.Backend):
for output in d.get_outputs(): for output in d.get_outputs():
elem.add_dep(os.path.join(self.get_target_dir(d), output)) elem.add_dep(os.path.join(self.get_target_dir(d), output))
cmd, reason = self.as_meson_exe_cmdline(target.name, target.command[0], cmd[1:], cmd, reason = self.as_meson_exe_cmdline(target.command[0], cmd[1:],
extra_bdeps=target.get_transitive_build_target_deps(), extra_bdeps=target.get_transitive_build_target_deps(),
capture=ofilenames[0] if target.capture else None, capture=ofilenames[0] if target.capture else None,
feed=srcs[0] if target.feed else None, feed=srcs[0] if target.feed else None,
@ -1022,7 +1022,7 @@ class NinjaBackend(backends.Backend):
else: else:
target_env = self.get_run_target_env(target) target_env = self.get_run_target_env(target)
_, _, cmd = self.eval_custom_target_command(target) _, _, cmd = self.eval_custom_target_command(target)
meson_exe_cmd, reason = self.as_meson_exe_cmdline(target_name, target.command[0], cmd[1:], meson_exe_cmd, reason = self.as_meson_exe_cmdline(target.command[0], cmd[1:],
force_serialize=True, env=target_env, force_serialize=True, env=target_env,
verbose=True) verbose=True)
cmd_type = f' (wrapped by meson {reason})' cmd_type = f' (wrapped by meson {reason})'
@ -2218,8 +2218,7 @@ https://gcc.gnu.org/bugzilla/show_bug.cgi?id=47485'''))
outfilelist = outfilelist[len(generator.outputs):] outfilelist = outfilelist[len(generator.outputs):]
args = self.replace_paths(target, args, override_subdir=subdir) args = self.replace_paths(target, args, override_subdir=subdir)
cmdlist = exe_arr + self.replace_extra_args(args, genlist) cmdlist = exe_arr + self.replace_extra_args(args, genlist)
cmdlist, reason = self.as_meson_exe_cmdline('generator ' + cmdlist[0], cmdlist, reason = self.as_meson_exe_cmdline(cmdlist[0], cmdlist[1:],
cmdlist[0], cmdlist[1:],
capture=outfiles[0] if generator.capture else None) capture=outfiles[0] if generator.capture else None)
abs_pdir = os.path.join(self.environment.get_build_dir(), self.get_target_dir(target)) abs_pdir = os.path.join(self.environment.get_build_dir(), self.get_target_dir(target))
os.makedirs(abs_pdir, exist_ok=True) os.makedirs(abs_pdir, exist_ok=True)

@ -150,7 +150,6 @@ class Vs2010Backend(backends.Backend):
# there are many arguments. # there are many arguments.
tdir_abs = os.path.join(self.environment.get_build_dir(), self.get_target_dir(target)) tdir_abs = os.path.join(self.environment.get_build_dir(), self.get_target_dir(target))
cmd, _ = self.as_meson_exe_cmdline( cmd, _ = self.as_meson_exe_cmdline(
'generator ' + cmd[0],
cmd[0], cmd[0],
cmd[1:], cmd[1:],
workdir=tdir_abs, workdir=tdir_abs,
@ -560,7 +559,7 @@ class Vs2010Backend(backends.Backend):
_, _, cmd_raw = self.eval_custom_target_command(target) _, _, cmd_raw = self.eval_custom_target_command(target)
depend_files = self.get_custom_target_depend_files(target) depend_files = self.get_custom_target_depend_files(target)
target_env = self.get_run_target_env(target) target_env = self.get_run_target_env(target)
wrapper_cmd, _ = self.as_meson_exe_cmdline(target.name, target.command[0], cmd_raw[1:], wrapper_cmd, _ = self.as_meson_exe_cmdline(target.command[0], cmd_raw[1:],
force_serialize=True, env=target_env, force_serialize=True, env=target_env,
verbose=True) verbose=True)
self.add_custom_build(root, 'run_target', ' '.join(self.quote_arguments(wrapper_cmd)), self.add_custom_build(root, 'run_target', ' '.join(self.quote_arguments(wrapper_cmd)),
@ -581,7 +580,7 @@ class Vs2010Backend(backends.Backend):
# there are many arguments. # there are many arguments.
tdir_abs = os.path.join(self.environment.get_build_dir(), self.get_target_dir(target)) tdir_abs = os.path.join(self.environment.get_build_dir(), self.get_target_dir(target))
extra_bdeps = target.get_transitive_build_target_deps() extra_bdeps = target.get_transitive_build_target_deps()
wrapper_cmd, _ = self.as_meson_exe_cmdline(target.name, target.command[0], cmd[1:], wrapper_cmd, _ = self.as_meson_exe_cmdline(target.command[0], cmd[1:],
# All targets run from the target dir # All targets run from the target dir
workdir=tdir_abs, workdir=tdir_abs,
extra_bdeps=extra_bdeps, extra_bdeps=extra_bdeps,

@ -1169,8 +1169,7 @@ class XCodeBackend(backends.Backend):
if not isinstance(t, build.CustomTarget): if not isinstance(t, build.CustomTarget):
continue continue
(srcs, ofilenames, cmd) = self.eval_custom_target_command(t, absolute_outputs=True) (srcs, ofilenames, cmd) = self.eval_custom_target_command(t, absolute_outputs=True)
fixed_cmd, _ = self.as_meson_exe_cmdline(t.name, fixed_cmd, _ = self.as_meson_exe_cmdline(cmd[0],
cmd[0],
cmd[1:], cmd[1:],
#workdir=None, #workdir=None,
env=t.env) env=t.env)

Loading…
Cancel
Save