diff options
| author | Dylan Baker <dylan@pnwbakers.com> | 2021-12-07 09:25:29 -0800 |
|---|---|---|
| committer | Eli Schwartz <eschwartz93@gmail.com> | 2021-12-07 16:12:23 -0500 |
| commit | 2a1c0358f4fbace72ee3f076425f10f8f3cd5136 (patch) | |
| tree | a98c24d9e64fe892b9118434affdbc9c081b6bc8 | |
| parent | e97f5a01c9c360b7dc5051bb2f39b2ba1664c3d7 (diff) | |
| download | meson-2a1c0358f4fbace72ee3f076425f10f8f3cd5136.zip meson-2a1c0358f4fbace72ee3f076425f10f8f3cd5136.tar.gz meson-2a1c0358f4fbace72ee3f076425f10f8f3cd5136.tar.bz2 | |
gnome/genmarshal: Add missing kwargs to permittedKwargs
There are thee arguments that are passed directly to CustomTarget which
are not in the permittedKwargs: depends, depend_files, and build_always.
The first two are obviously generically useful, as they allow creating
correct ordering. The latter, not so much. Since it was an error to pass
it, we'll just delete it.
| -rw-r--r-- | docs/markdown/Gnome-module.md | 19 | ||||
| -rw-r--r-- | mesonbuild/modules/gnome.py | 2 |
2 files changed, 13 insertions, 8 deletions
diff --git a/docs/markdown/Gnome-module.md b/docs/markdown/Gnome-module.md index 9091fd5..4f08c6d 100644 --- a/docs/markdown/Gnome-module.md +++ b/docs/markdown/Gnome-module.md @@ -120,18 +120,22 @@ typelib_target]` Generates a marshal file using the `glib-genmarshal` tool. The first argument is the basename of the output files. -* `extra_args`: (*Added 0.42.0*) additional command line arguments to - pass +* `depends` [](BuildTarget | CustomTarget | CustomTargetIndex): + passed directly to CustomTarget (*since 0.61.0*) +* `depend_files` [](str | File): Passed directly to CustomTarget (*since 0.61.0*) +* `extra_args`: (*Added 0.42.0*) additional command line arguments to pass +* `install_dir`: directory to install header to * `install_header`: if true, install the generated header * `install_dir`: directory to install header to -* `nostdinc`: if true, don't include the standard marshallers from - glib -* `internal`: if true, mark generated sources as internal to - `glib-genmarshal` (*Requires GLib 2.54*) +* `install_header`: if true, install the generated header +* `internal`: if true, mark generated sources as internal to `glib-genmarshal` + (*Requires GLib 2.54*) +* `nostdinc`: if true, don't include the standard marshallers from glib * `prefix`: the prefix to use for symbols * `skip_source`: if true, skip source location comments -* `stdinc`: if true, include the standard marshallers from glib +* `sources` []str *required*: List of string sources to consume * `sources`: the list of sources to use as inputs +* `stdinc`: if true, include the standard marshallers from glib * `valist_marshallers`: if true, generate va_list marshallers *Added 0.35.0* @@ -158,6 +162,7 @@ template with only minor tweaks, in which case the Note that if you `#include` the generated header in any of the sources for a build target, you must add the generated header to the build target's list of sources to codify the dependency. This is true for + all generated sources, not just `mkenums`. * `c_template`: template to use for generating the source diff --git a/mesonbuild/modules/gnome.py b/mesonbuild/modules/gnome.py index 62e3277..e17a50d 100644 --- a/mesonbuild/modules/gnome.py +++ b/mesonbuild/modules/gnome.py @@ -1692,7 +1692,7 @@ class GnomeModule(ExtensionModule): @permittedKwargs({'sources', 'prefix', 'install_header', 'install_dir', 'stdinc', 'nostdinc', 'internal', 'skip_source', 'valist_marshallers', - 'extra_args'}) + 'extra_args', 'depends', 'depend_files'}) @typed_pos_args('gnome.genmarshal', str) def genmarshal(self, state: 'ModuleState', args: T.Tuple[str], kwargs) -> ModuleReturnValue: output = args[0] |