diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2015-09-28 18:09:54 +0300 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2015-09-28 18:09:54 +0300 |
| commit | d4a922c21a65a1fc8c52bbce2c18fe3a0f169002 (patch) | |
| tree | 909823a12e5115bc62e88a2dcfcef7231117fdae /ninjabackend.py | |
| parent | d23e59ed5f82a3f2d3b0d70faf71a6d4ca16eaaa (diff) | |
| download | meson-d4a922c21a65a1fc8c52bbce2c18fe3a0f169002.zip meson-d4a922c21a65a1fc8c52bbce2c18fe3a0f169002.tar.gz meson-d4a922c21a65a1fc8c52bbce2c18fe3a0f169002.tar.bz2 | |
Can set build targets as arguments to run_target. Closes #270.
Diffstat (limited to 'ninjabackend.py')
| -rw-r--r-- | ninjabackend.py | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/ninjabackend.py b/ninjabackend.py index 01223ab..b9eef19 100644 --- a/ninjabackend.py +++ b/ninjabackend.py @@ -345,8 +345,11 @@ class NinjaBackend(backends.Backend): if isinstance(i, str): arg_strings.append(i) elif isinstance(i, build.BuildTarget): - deps.append(self.get_target_filename(i)) + relfname = self.get_target_filename(i) + deps.append(relfname) + arg_strings.append(os.path.join(self.environment.get_build_dir(), relfname)) else: + mlog.debug(str(i)) raise MesonException('Unreachable code.') elem = NinjaBuildElement(target.name, 'CUSTOM_COMMAND', deps) cmd = [sys.executable, runnerscript, self.environment.get_source_dir(), self.environment.get_build_dir(), target.subdir] @@ -364,7 +367,7 @@ class NinjaBackend(backends.Backend): cmd.append(abs_exe) else: cmd.append(target.command) - cmd += target.args + cmd += arg_strings elem.add_item('COMMAND', cmd) elem.add_item('description', 'Running external command %s.' % target.name) elem.add_item('pool', 'console') |