Changed run_target to take command as kwarg and add depends. This makes it behave the same as custom_target.

2 files changed, 13 insertions, 0 deletions

diff --git a/mesonbuild/backend/backends.py b/mesonbuild/backend/backends.py
index bc49966..05a3565 100644
--- a/mesonbuild/backend/backends.py
+++ b/mesonbuild/backend/backends.py
@@ -92,6 +92,7 @@ class Backend():
         raise RuntimeError('No specified compiler can handle file ' + src)
 
     def get_target_filename(self, target):
+        assert(isinstance(target, (build.BuildTarget, build.CustomTarget)))
         targetdir = self.get_target_dir(target)
         fname = target.get_filename()
         if isinstance(fname, list):
@@ -101,6 +102,9 @@ class Backend():
         filename = os.path.join(targetdir, fname)
         return filename
 
+    def get_target_filename_abs(self, target):
+        return os.path.join(self.environment.get_build_dir(), self.get_target_filename(target))
+
     def get_target_filename_for_linking(self, target):
         # On some platforms (msvc for instance), the file that is used for
         # dynamic linking is not the same as the dynamic library itself. This
diff --git a/mesonbuild/backend/ninjabackend.py b/mesonbuild/backend/ninjabackend.py
index b583e62..74a17f3 100644
--- a/mesonbuild/backend/ninjabackend.py
+++ b/mesonbuild/backend/ninjabackend.py
@@ -409,7 +409,16 @@ int dummy;
             else:
                 mlog.debug(str(i))
                 raise MesonException('Unreachable code in generate_run_target.')
+        for i in target.get_dependencies():
+            # FIXME, should not grab element at zero but rather expand all.
+            if isinstance(i, list):
+                i = i[0]
+            fname = i.get_filename()
+            if isinstance(fname, list):
+                fname = fname[0]
+            deps.append(os.path.join(self.get_target_dir(i), fname))
         elem = NinjaBuildElement(self.all_outputs, target.name, 'CUSTOM_COMMAND', deps)
+        elem.add_dep(deps)
         cmd = runnerscript + [self.environment.get_source_dir(), self.environment.get_build_dir(), target.subdir]
         texe = target.command
         try: