diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2022-10-05 16:40:48 +0200 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2022-10-28 13:06:52 +0300 |
| commit | 212af2b278f6cd58b17cabbff4883b5258601a6c (patch) | |
| tree | ae6c0952433c5f87d7650bb893806bc816c53c8a /test cases | |
| parent | 2fe3271f773cb4207967271b4a8fb8daa131e4c8 (diff) | |
| download | meson-212af2b278f6cd58b17cabbff4883b5258601a6c.zip meson-212af2b278f6cd58b17cabbff4883b5258601a6c.tar.gz meson-212af2b278f6cd58b17cabbff4883b5258601a6c.tar.bz2 | |
gnome: allow generator outputs as gdbus-codegen inputs
GeneratedLists as sources to `gnome.gdbus_codegen` worked until
version 0.60 of Meson, but broke in 0.61 because of the conversion to
typed_pos_args and typed_kwargs. Reinstate this by adding them to the
decorators and annotations.
Note that gdbus_codegen desugars to two custom_targets and therefore the
generator is invoked twice. This is not optimal, but it should not be
an issue and can be changed later.
Fixes: 53a187ba2 ("modules/gnome: use typed_pos_args for gdbus_codegen", 2021-11-01)
Fixes: ef52e6093 ("modules/gnome: use typed_kwargs for gdbus_codegen", 2021-11-08)
Diffstat (limited to 'test cases')
| -rw-r--r-- | test cases/frameworks/7 gnome/gdbus/meson.build | 8 | ||||
| -rw-r--r-- | test cases/frameworks/7 gnome/meson.build | 3 |
2 files changed, 11 insertions, 0 deletions
diff --git a/test cases/frameworks/7 gnome/gdbus/meson.build b/test cases/frameworks/7 gnome/gdbus/meson.build index d749033..fdb3896 100644 --- a/test cases/frameworks/7 gnome/gdbus/meson.build +++ b/test cases/frameworks/7 gnome/gdbus/meson.build @@ -79,6 +79,14 @@ gdbus_src_cti = gnome.gdbus_codegen( annotations : [], ) +gdbus_src_gen = gnome.gdbus_codegen( + 'generated-gdbus-generator-src', + copyfile_gen.process('data/com.example.Sample.xml'), + interface_prefix : 'com.example.', + namespace : 'Sample', + annotations : [], +) + gdbus_exe = executable('gdbus-test', 'gdbusprog.c', gdbus_src, include_directories : includes, diff --git a/test cases/frameworks/7 gnome/meson.build b/test cases/frameworks/7 gnome/meson.build index 920bc6a..5f438cb 100644 --- a/test cases/frameworks/7 gnome/meson.build +++ b/test cases/frameworks/7 gnome/meson.build @@ -1,6 +1,9 @@ project('gobject-introspection', 'c') copyfile = find_program('copyfile.py') +copyfile_gen = generator(copyfile, + output: '@BASENAME@Gen.xml', + arguments : ['@INPUT@', '@OUTPUT@']) glib = dependency('glib-2.0', required: false) if not glib.found() |