diff options
author | Xavier Claessens <xavier.claessens@collabora.com> | 2019-07-03 13:32:24 -0400 |
---|---|---|
committer | Xavier Claessens <xavier.claessens@collabora.com> | 2019-07-10 15:01:18 -0400 |
commit | 12d4031f52a8c09014a840b2cf263478602618d0 (patch) | |
tree | 1db3d1a5008400e828f890e1e860d2724b4a4e79 /mesonbuild/backend/ninjabackend.py | |
parent | 716140ddb4f108dac2c2395e24e9ca17d68593d5 (diff) | |
download | meson-12d4031f52a8c09014a840b2cf263478602618d0.zip meson-12d4031f52a8c09014a840b2cf263478602618d0.tar.gz meson-12d4031f52a8c09014a840b2cf263478602618d0.tar.bz2 |
Add alias_target() function
Diffstat (limited to 'mesonbuild/backend/ninjabackend.py')
-rw-r--r-- | mesonbuild/backend/ninjabackend.py | 30 |
1 files changed, 19 insertions, 11 deletions
diff --git a/mesonbuild/backend/ninjabackend.py b/mesonbuild/backend/ninjabackend.py index b830e37..b57a783 100644 --- a/mesonbuild/backend/ninjabackend.py +++ b/mesonbuild/backend/ninjabackend.py @@ -702,6 +702,13 @@ int dummy; self.add_build(elem) self.processed_targets[target.get_id()] = True + def build_run_target_name(self, target): + if target.subproject != '': + subproject_prefix = '{}@@'.format(target.subproject) + else: + subproject_prefix = '' + return '{}{}'.format(subproject_prefix, target.name) + def generate_run_target(self, target): cmd = self.environment.get_build_command() + ['--internal', 'commandrunner'] deps = self.unwrap_dep_list(target) @@ -718,12 +725,6 @@ int dummy; arg_strings.append(os.path.join(self.environment.get_build_dir(), relfname)) else: raise AssertionError('Unreachable code in generate_run_target: ' + str(i)) - if target.subproject != '': - subproject_prefix = '{}@@'.format(target.subproject) - else: - subproject_prefix = '' - target_name = 'meson-{}{}'.format(subproject_prefix, target.name) - elem = NinjaBuildElement(self.all_outputs, target_name, 'CUSTOM_COMMAND', []) cmd += [self.environment.get_source_dir(), self.environment.get_build_dir(), target.subdir] + self.environment.get_build_command() @@ -756,14 +757,21 @@ int dummy; cmd.append(target.command) cmd += arg_strings + if texe: + target_name = 'meson-{}'.format(self.build_run_target_name(target)) + elem = NinjaBuildElement(self.all_outputs, target_name, 'CUSTOM_COMMAND', []) + elem.add_item('COMMAND', cmd) + elem.add_item('description', 'Running external command %s.' % target.name) + elem.add_item('pool', 'console') + # Alias that runs the target defined above with the name the user specified + self.create_target_alias(target_name) + else: + target_name = self.build_run_target_name(target) + elem = NinjaBuildElement(self.all_outputs, target_name, 'phony', []) + elem.add_dep(deps) cmd = self.replace_paths(target, cmd) - elem.add_item('COMMAND', cmd) - elem.add_item('description', 'Running external command %s.' % target.name) - elem.add_item('pool', 'console') self.add_build(elem) - # Alias that runs the target defined above with the name the user specified - self.create_target_alias(target_name) self.processed_targets[target.get_id()] = True def generate_coverage_command(self, elem, outputs): |