Virtualization
/
meson
mirror of https://gitlab.com/qemu-project/meson.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Hide 'rewrite' and 'runpython' commands from help

This commit is contained in:
Xavier Claessens 2018-09-23 10:51:47 -04:00
parent 37067a53c4
commit adae6b56de
1 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
mesonbuild/mesonmain.py
View File

@ -29,6 +29,7 @@ from .wrap import wraptool
class CommandLineParser: class CommandLineParser:
def __init__(self): def __init__(self):
self.commands = {} self.commands = {}
self.hidden_commands = []
self.parser = argparse.ArgumentParser(prog='meson') self.parser = argparse.ArgumentParser(prog='meson')
self.subparsers = self.parser.add_subparsers(title='Commands', self.subparsers = self.parser.add_subparsers(title='Commands',
description='If no command is specified it defaults to setup command.') description='If no command is specified it defaults to setup command.')
@ -44,17 +45,25 @@ class CommandLineParser:
help='Create a new project') help='Create a new project')
self.add_command('test', mtest.add_arguments, mtest.run, self.add_command('test', mtest.add_arguments, mtest.run,
help='Run tests') help='Run tests')
self.add_command('rewrite', rewriter.add_arguments, rewriter.run,
help='Edit project files')
self.add_command('wrap', wraptool.add_arguments, wraptool.run, self.add_command('wrap', wraptool.add_arguments, wraptool.run,
help='Wrap tools') help='Wrap tools')
self.add_command('runpython', self.add_runpython_arguments, self.run_runpython_command,
help='Run a python script')
self.add_command('help', self.add_help_arguments, self.run_help_command, self.add_command('help', self.add_help_arguments, self.run_help_command,
help='Print help of a subcommand') help='Print help of a subcommand')
# Hidden commands
self.add_command('rewrite', rewriter.add_arguments, rewriter.run,
help=argparse.SUPPRESS)
self.add_command('runpython', self.add_runpython_arguments, self.run_runpython_command,
help=argparse.SUPPRESS)
def add_command(self, name, add_arguments_func, run_func, help): def add_command(self, name, add_arguments_func, run_func, help):
p = self.subparsers.add_parser(name, help=help) # FIXME: Cannot have hidden subparser:
# https://bugs.python.org/issue22848
if help == argparse.SUPPRESS:
p = argparse.ArgumentParser(prog='meson ' + name)
self.hidden_commands.append(name)
else:
p = self.subparsers.add_parser(name, help=help)
add_arguments_func(p) add_arguments_func(p)
p.set_defaults(run_func=run_func) p.set_defaults(run_func=run_func)
self.commands[name] = p self.commands[name] = p
@ -86,8 +95,15 @@ class CommandLineParser:
if len(args) == 0 or args[0] not in known_commands: if len(args) == 0 or args[0] not in known_commands:
args = ['setup'] + args args = ['setup'] + args
# Hidden commands have their own parser instead of using the global one
if args[0] in self.hidden_commands:
parser = self.commands[args[0]]
args = args[1:]
else:
parser = self.parser
args = mesonlib.expand_arguments(args) args = mesonlib.expand_arguments(args)
options = self.parser.parse_args(args) options = parser.parse_args(args)
try: try:
return options.run_func(options) return options.run_func(options)