Virtualization
/
meson
mirror of https://gitlab.com/qemu-project/meson.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

hotdoc module: use less confusing names 

Internally we pass this as extra_depends to the CustomTarget
initializer, so it makes sense to call it that rather than confusing the
topic by referring to "dependencies", a term that indicates
CFLAGS/LDFLAGS interfaces.
This commit is contained in:
Eli Schwartz 2022-11-02 14:45:58 -04:00 committed by Xavier Claessens
parent 0b7d935a84
commit 726353460a
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
mesonbuild/modules/hotdoc.py
View File

@ -61,7 +61,7 @@ class HotdocTargetBuilder:
self._extra_extension_paths = set() self._extra_extension_paths = set()
self.extra_assets = set() self.extra_assets = set()
self._dependencies = [] self.extra_depends = []
self._subprojects = [] self._subprojects = []
def process_known_arg(self, option, argname=None, value_processor=None): def process_known_arg(self, option, argname=None, value_processor=None):
@ -185,7 +185,7 @@ class HotdocTargetBuilder:
elif isinstance(dep, Dependency): elif isinstance(dep, Dependency):
cflags.update(dep.get_compile_args()) cflags.update(dep.get_compile_args())
elif isinstance(dep, (build.StaticLibrary, build.SharedLibrary)): elif isinstance(dep, (build.StaticLibrary, build.SharedLibrary)):
self._dependencies.append(dep) self.extra_depends.append(dep)
for incd in dep.get_include_dirs(): for incd in dep.get_include_dirs():
cflags.update(incd.get_incdirs()) cflags.update(incd.get_incdirs())
elif isinstance(dep, HotdocTarget): elif isinstance(dep, HotdocTarget):
@ -197,9 +197,9 @@ class HotdocTargetBuilder:
self.cmd += ['--extra-assets=' + p for p in dep.extra_assets] self.cmd += ['--extra-assets=' + p for p in dep.extra_assets]
self.add_extension_paths(dep.extra_extension_paths) self.add_extension_paths(dep.extra_extension_paths)
elif isinstance(dep, (build.CustomTarget, build.BuildTarget)): elif isinstance(dep, (build.CustomTarget, build.BuildTarget)):
self._dependencies.append(dep) self.extra_depends.append(dep)
elif isinstance(dep, build.CustomTargetIndex): elif isinstance(dep, build.CustomTargetIndex):
self._dependencies.append(dep.target) self.extra_depends.append(dep.target)
return [f.strip('-I') for f in cflags] return [f.strip('-I') for f in cflags]
@ -228,10 +228,10 @@ class HotdocTargetBuilder:
continue continue
elif isinstance(arg, (build.BuildTarget, build.CustomTarget)): elif isinstance(arg, (build.BuildTarget, build.CustomTarget)):
self._dependencies.append(arg) self.extra_depends.append(arg)
arg = self.interpreter.backend.get_target_filename_abs(arg) arg = self.interpreter.backend.get_target_filename_abs(arg)
elif isinstance(arg, build.CustomTargetIndex): elif isinstance(arg, build.CustomTargetIndex):
self._dependencies.append(arg.target) self.extra_depends.append(arg.target)
arg = self.interpreter.backend.get_target_filename_abs(arg) arg = self.interpreter.backend.get_target_filename_abs(arg)
cmd.append(arg) cmd.append(arg)
@ -329,7 +329,7 @@ class HotdocTargetBuilder:
extra_assets=self._extra_assets, extra_assets=self._extra_assets,
subprojects=self._subprojects, subprojects=self._subprojects,
command=target_cmd, command=target_cmd,
extra_depends=self._dependencies, extra_depends=self.extra_depends,
outputs=[fullname], outputs=[fullname],
sources=[], sources=[],
depfile=os.path.basename(depfile), depfile=os.path.basename(depfile),