From 9235fd4ec1cfdea9f1c73719c80607ee0cdad39b Mon Sep 17 00:00:00 2001 From: Jussi Pakkanen Date: Wed, 7 Sep 2016 23:04:11 +0300 Subject: Permit use of file objects in run targets. --- mesonbuild/backend/ninjabackend.py | 2 ++ 1 file changed, 2 insertions(+) (limited to 'mesonbuild/backend/ninjabackend.py') diff --git a/mesonbuild/backend/ninjabackend.py b/mesonbuild/backend/ninjabackend.py index e81c407..adf9b71 100644 --- a/mesonbuild/backend/ninjabackend.py +++ b/mesonbuild/backend/ninjabackend.py @@ -424,6 +424,8 @@ int dummy; elif isinstance(i, (build.BuildTarget, build.CustomTarget)): relfname = self.get_target_filename(i) arg_strings.append(os.path.join(self.environment.get_build_dir(), relfname)) + elif isinstance(i, mesonlib.File): + arg_strings.append(i.rel_to_builddir(self.build_to_src)) else: mlog.debug(str(i)) raise MesonException('Unreachable code in generate_run_target.') -- cgit v1.1 From d26ab47072906d7a28a8843617487e601b56dfb2 Mon Sep 17 00:00:00 2001 From: Jussi Pakkanen Date: Wed, 7 Sep 2016 23:14:14 +0300 Subject: Can use custom targets as executables to run in a run_target. --- mesonbuild/backend/ninjabackend.py | 3 +++ 1 file changed, 3 insertions(+) (limited to 'mesonbuild/backend/ninjabackend.py') diff --git a/mesonbuild/backend/ninjabackend.py b/mesonbuild/backend/ninjabackend.py index adf9b71..481b800 100644 --- a/mesonbuild/backend/ninjabackend.py +++ b/mesonbuild/backend/ninjabackend.py @@ -448,6 +448,9 @@ int dummy; cmd.append(abs_exe) elif isinstance(texe, dependencies.ExternalProgram): cmd += texe.get_command() + elif isinstance(texe, build.CustomTarget): + deps.append(self.get_target_filename(texe)) + cmd += [os.path.join(self.environment.get_build_dir(), self.get_target_filename(texe))] else: cmd.append(target.command) cmd += arg_strings -- cgit v1.1