gnome.gdbus_codegen: Fix output file list for docbook custom targetsnirbheek/fix-gtkdoc-content-files-File

We were setting it to a totally wrong name, while the output of gtkdoc
is very predictable.

Also add a test for it, and fix a bug in meson introspect found while
adding the test.

The test will only work with glib 2.56.2, so it will be skipped on the
CI. I ran it manually to verify that it works.

1 files changed, 6 insertions, 2 deletions

diff --git a/mesonbuild/modules/gnome.py b/mesonbuild/modules/gnome.py
index e553b4afa..da72a1fff 100644
--- a/mesonbuild/modules/gnome.py
+++ b/mesonbuild/modules/gnome.py
@@ -881,7 +881,7 @@ This will become a hard error in the future.''')
         if len(args) not in (1, 2):
             raise MesonException('Gdbus_codegen takes at most two arguments, name and xml file.')
         namebase = args[0]
-        xml_files = [args[1:]]
+        xml_files = args[1:]
         target_name = namebase + '-gdbus'
         cmd = [self.interpreter.find_program_impl('gdbus-codegen')]
         if 'interface_prefix' in kwargs:
@@ -938,9 +938,13 @@ This will become a hard error in the future.''')
 
                 docbook_cmd = cmd + ['--output-directory', '@OUTDIR@', '--generate-docbook', docbook, '@INPUT@']
 
+                # The docbook output is always ${docbook}-${name_of_xml_file}
                 output = namebase + '-docbook'
+                outputs = []
+                for f in xml_files:
+                    outputs.append('{}-{}'.format(docbook, f))
                 custom_kwargs = {'input': xml_files,
-                                 'output': output,
+                                 'output': outputs,
                                  'command': docbook_cmd,
                                  'build_by_default': build_by_default
                                  }