rewriter: Remove command alias

pull/4992/head
Daniel Mensinger 6 years ago
parent 1290330894
commit 90b557e38a
No known key found for this signature in database
GPG Key ID: 54DD94C131E277D4
  1. 7
      docs/markdown/Rewriter.md
  2. 2
      mesonbuild/mesonmain.py
  3. 6
      mesonbuild/rewriter.py

@ -26,10 +26,9 @@ frontends, etc.)
## Using the rewriter ## Using the rewriter
All rewriter functions are accessed via `meson rewrite` (or the rewriter alias All rewriter functions are accessed via `meson rewrite`. The meson rewriter
`meson rw`). The meson rewriter assumes that it is run inside the project root assumes that it is run inside the project root directory. If this isn't the
directory. If this isn't the case, use `--sourcedir` to specify the actual case, use `--sourcedir` to specify the actual project source directory.
project source directory.
### Adding and removing sources ### Adding and removing sources

@ -57,7 +57,7 @@ class CommandLineParser:
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')
self.add_command('rewrite', lambda parser: rewriter.add_arguments(parser, self.formater), rewriter.run, self.add_command('rewrite', lambda parser: rewriter.add_arguments(parser, self.formater), rewriter.run,
help='Modify the project definition', aliases=['rw']) help='Modify the project definition')
# Hidden commands # Hidden commands
self.add_command('runpython', self.add_runpython_arguments, self.run_runpython_command, self.add_command('runpython', self.add_runpython_arguments, self.run_runpython_command,

@ -39,7 +39,7 @@ def add_arguments(parser, formater=None):
subparsers = parser.add_subparsers(dest='type', title='Rewriter commands', description='Rewrite command to execute') subparsers = parser.add_subparsers(dest='type', title='Rewriter commands', description='Rewrite command to execute')
# Target # Target
tgt_parser = subparsers.add_parser('target', aliases=['tgt'], help='Modify a target', formatter_class=formater) tgt_parser = subparsers.add_parser('target', help='Modify a target', formatter_class=formater)
tgt_parser.add_argument('-s', '--subdir', default='', dest='subdir', help='Subdirectory of the new target (only for the "add_target" action)') tgt_parser.add_argument('-s', '--subdir', default='', dest='subdir', help='Subdirectory of the new target (only for the "add_target" action)')
tgt_parser.add_argument('--type', dest='tgt_type', choices=rewriter_keys['target']['target_type'][2], default='executable', tgt_parser.add_argument('--type', dest='tgt_type', choices=rewriter_keys['target']['target_type'][2], default='executable',
help='Type of the target to add (only for the "add_target" action)') help='Type of the target to add (only for the "add_target" action)')
@ -58,13 +58,13 @@ def add_arguments(parser, formater=None):
kw_parser.add_argument('kwargs', nargs='*', help='Pairs of keyword and value') kw_parser.add_argument('kwargs', nargs='*', help='Pairs of keyword and value')
# Default options # Default options
def_parser = subparsers.add_parser('default-options', aliases=['def'], help='Modify the project default options', formatter_class=formater) def_parser = subparsers.add_parser('default-options', help='Modify the project default options', formatter_class=formater)
def_parser.add_argument('operation', choices=rewriter_keys['default_options']['operation'][2], def_parser.add_argument('operation', choices=rewriter_keys['default_options']['operation'][2],
help='Action to execute') help='Action to execute')
def_parser.add_argument('options', nargs='*', help='Key, value pairs of configuration option') def_parser.add_argument('options', nargs='*', help='Key, value pairs of configuration option')
# JSON file/command # JSON file/command
cmd_parser = subparsers.add_parser('command', aliases=['cmd'], help='Execute a JSON array of commands', formatter_class=formater) cmd_parser = subparsers.add_parser('command', help='Execute a JSON array of commands', formatter_class=formater)
cmd_parser.add_argument('json', help='JSON string or file to execute') cmd_parser.add_argument('json', help='JSON string or file to execute')
class RequiredKeys: class RequiredKeys:

Loading…
Cancel
Save