diff options
| author | Charles Brunet <charles.brunet@optelgroup.com> | 2023-03-17 16:27:37 -0400 |
|---|---|---|
| committer | Eli Schwartz <eschwartz93@gmail.com> | 2023-08-31 07:52:41 -0400 |
| commit | cf5adf0c646474f0259d123fad60ca5ed38ec891 (patch) | |
| tree | 85ccd32aa73eecf274a937f1fc3b6f4d484b77da /mesonbuild/interpreter | |
| parent | cd30d1889f2bae34f17231b9cabe665edd57e7ba (diff) | |
| download | meson-cf5adf0c646474f0259d123fad60ca5ed38ec891.zip meson-cf5adf0c646474f0259d123fad60ca5ed38ec891.tar.gz meson-cf5adf0c646474f0259d123fad60ca5ed38ec891.tar.bz2 | |
add json output format to configure file
Diffstat (limited to 'mesonbuild/interpreter')
| -rw-r--r-- | mesonbuild/interpreter/interpreter.py | 4 | ||||
| -rw-r--r-- | mesonbuild/interpreter/kwargs.py | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/mesonbuild/interpreter/interpreter.py b/mesonbuild/interpreter/interpreter.py index 4751af9..0ba8dc7 100644 --- a/mesonbuild/interpreter/interpreter.py +++ b/mesonbuild/interpreter/interpreter.py @@ -2594,8 +2594,8 @@ class Interpreter(InterpreterBase, HoldableObject): KwargInfo('install_dir', (str, bool), default='', validator=lambda x: 'must be `false` if boolean' if x is True else None), OUTPUT_KW, - KwargInfo('output_format', str, default='c', since='0.47.0', - validator=in_set_validator({'c', 'nasm'})), + KwargInfo('output_format', str, default='c', since='0.47.0', since_values={'json': '1.3.0'}, + validator=in_set_validator({'c', 'json', 'nasm'})), ) def func_configure_file(self, node: mparser.BaseNode, args: T.List[TYPE_var], kwargs: kwtypes.ConfigureFile): diff --git a/mesonbuild/interpreter/kwargs.py b/mesonbuild/interpreter/kwargs.py index af5733f..0aee164 100644 --- a/mesonbuild/interpreter/kwargs.py +++ b/mesonbuild/interpreter/kwargs.py @@ -286,7 +286,7 @@ class ConfigureFile(TypedDict): output: str capture: bool format: T.Literal['meson', 'cmake', 'cmake@'] - output_format: T.Literal['c', 'nasm'] + output_format: T.Literal['c', 'json', 'nasm'] depfile: T.Optional[str] install: T.Optional[bool] install_dir: T.Union[str, T.Literal[False]] |