gnome: Fix gtkdoc generation

install_scripts used to replace @BUILD_ROOT@ and @SOURCE_ROOT@ but it
was not documented and got removed in Meson 0.58.0. gnome.gtkdoc() was
relying on that behaviour, but it has always been broken in the case the
source or build directory contains spaces.

Fix this by changing get_include_args() to substitue paths directly
which will then get escaped correctly.

Add a unit test that builds GObject documentation which is where this
issue has been spotted.

Fixes: #8744

1 files changed, 2 insertions, 3 deletions

diff --git a/mesonbuild/modules/windows.py b/mesonbuild/modules/windows.py
index d7a8638..c4fdc19 100644
--- a/mesonbuild/modules/windows.py
+++ b/mesonbuild/modules/windows.py
@@ -19,7 +19,6 @@ import re
 from .. import mlog
 from .. import mesonlib, build
 from ..mesonlib import MachineChoice, MesonException, extract_as_list, unholder
-from . import get_include_args
 from . import ModuleReturnValue
 from . import ExtensionModule
 from ..interpreter import CustomTargetHolder
@@ -83,12 +82,12 @@ class WindowsModule(ExtensionModule):
         wrc_depends = extract_as_list(kwargs, 'depends', pop = True)
         for d in wrc_depends:
             if isinstance(d, CustomTargetHolder):
-                extra_args += get_include_args([d.outdir_include()])
+                extra_args += state.get_include_args([d.outdir_include()])
         inc_dirs = extract_as_list(kwargs, 'include_directories', pop = True)
         for incd in inc_dirs:
             if not isinstance(incd.held_object, (str, build.IncludeDirs)):
                 raise MesonException('Resource include dirs should be include_directories().')
-        extra_args += get_include_args(inc_dirs)
+        extra_args += state.get_include_args(inc_dirs)
 
         rescomp, rescomp_type = self._find_resource_compiler(state)
         if rescomp_type == ResourceCompilerType.rc: