aboutsummaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorCharles Brunet <charles.brunet@optelgroup.com>2023-03-17 16:27:37 -0400
committerEli Schwartz <eschwartz93@gmail.com>2023-08-31 07:52:41 -0400
commitcf5adf0c646474f0259d123fad60ca5ed38ec891 (patch)
tree85ccd32aa73eecf274a937f1fc3b6f4d484b77da /docs
parentcd30d1889f2bae34f17231b9cabe665edd57e7ba (diff)
downloadmeson-cf5adf0c646474f0259d123fad60ca5ed38ec891.zip
meson-cf5adf0c646474f0259d123fad60ca5ed38ec891.tar.gz
meson-cf5adf0c646474f0259d123fad60ca5ed38ec891.tar.bz2
add json output format to configure file
Diffstat (limited to 'docs')
-rw-r--r--docs/markdown/snippets/json_output_format.md5
-rw-r--r--docs/yaml/functions/configure_file.yaml2
2 files changed, 6 insertions, 1 deletions
diff --git a/docs/markdown/snippets/json_output_format.md b/docs/markdown/snippets/json_output_format.md
new file mode 100644
index 0000000..626840f
--- /dev/null
+++ b/docs/markdown/snippets/json_output_format.md
@@ -0,0 +1,5 @@
+## Added 'json' output_format to configure_file()
+
+When no input file is specified, [[configure_file]] can now
+generate a `json` file from given [[@cfg_data]].
+Field descriptions are not preserved in the json file.
diff --git a/docs/yaml/functions/configure_file.yaml b/docs/yaml/functions/configure_file.yaml
index df37ff5..6fb972b 100644
--- a/docs/yaml/functions/configure_file.yaml
+++ b/docs/yaml/functions/configure_file.yaml
@@ -134,7 +134,7 @@ kwargs:
The format of the output to generate when no input
was specified. It defaults to `c`, in which case preprocessor directives
will be prefixed with `#`, you can also use `nasm`, in which case the
- prefix will be `%`.
+ prefix will be `%`. *(since 1.3.0)* `json` format can also be used.
encoding:
type: str