aboutsummaryrefslogtreecommitdiff
path: root/docs/yaml/functions
diff options
context:
space:
mode:
authorXavier Claessens <xavier.claessens@collabora.com>2022-02-23 16:56:27 -0500
committerXavier Claessens <xclaesse@gmail.com>2022-02-28 09:03:27 -0500
commit6acfe48f32110671a0adf80ad3497a35105b265d (patch)
tree5fd822233653e9670e2aea820b59be1932aa2075 /docs/yaml/functions
parentac4f8d0088e7be5fc37f4611a7fadb2361c945f2 (diff)
downloadmeson-6acfe48f32110671a0adf80ad3497a35105b265d.zip
meson-6acfe48f32110671a0adf80ad3497a35105b265d.tar.gz
meson-6acfe48f32110671a0adf80ad3497a35105b265d.tar.bz2
Allow setting method/separator in environment() and meson.add_devenv()
Diffstat (limited to 'docs/yaml/functions')
-rw-r--r--docs/yaml/functions/environment.yaml23
1 files changed, 22 insertions, 1 deletions
diff --git a/docs/yaml/functions/environment.yaml b/docs/yaml/functions/environment.yaml
index 99c8a45..5fb81e3 100644
--- a/docs/yaml/functions/environment.yaml
+++ b/docs/yaml/functions/environment.yaml
@@ -5,8 +5,29 @@ description: Returns an empty [[@env]] object.
optargs:
env:
- type: dict[str]
+ type: str | list[str] | dict[str] | dict[list[str]]
since: 0.52.0
description: |
If provided, each key/value pair is added into the [[@env]] object
as if [[env.set]] method was called for each of them.
+ Since *0.62.0* list of strings is allowed in dictionnary values. In that
+ case values are joined using the separator.
+
+kwargs:
+ separator:
+ type: str
+ since: 0.62.0
+ description: |
+ The separator to use for the initial values defined in
+ the first positional argument. If not explicitly specified, the default
+ path separator for the host operating system will be used, i.e. ';' for
+ Windows and ':' for UNIX/POSIX systems.
+
+ method:
+ type: str
+ since: 0.62.0
+ description: |
+ Must be one of 'set', 'prepend', or 'append'
+ (defaults to 'set'). Controls if initial values defined in the first
+ positional argument are prepended, appended or repace the current value
+ of the environment variable.