From 34c28dc92cb4f28e32e633297e4b8a737228aae5 Mon Sep 17 00:00:00 2001
From: Daniel Mensinger <daniel@mensinger-ka.de>
Date: Thu, 17 Jun 2021 00:26:50 +0200
Subject: holders: remove unholder
---
mesonbuild/modules/hotdoc.py | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
(limited to 'mesonbuild/modules/hotdoc.py')
diff --git a/mesonbuild/modules/hotdoc.py b/mesonbuild/modules/hotdoc.py
index 90635e6..26026fb 100644
--- a/mesonbuild/modules/hotdoc.py
+++ b/mesonbuild/modules/hotdoc.py
@@ -105,7 +105,6 @@ class HotdocTargetBuilder:
self.cmd.extend([option, value])
def check_extra_arg_type(self, arg, value):
- value = getattr(value, 'held_object', value)
if isinstance(value, list):
for v in value:
self.check_extra_arg_type(arg, v)
@@ -188,7 +187,6 @@ class HotdocTargetBuilder:
def process_dependencies(self, deps):
cflags = set()
for dep in mesonlib.listify(ensure_list(deps)):
- dep = getattr(dep, "held_object", dep)
if isinstance(dep, InternalDependency):
inc_args = self.state.get_include_args(dep.include_directories)
cflags.update([self.replace_dirs_in_string(x)
@@ -232,7 +230,6 @@ class HotdocTargetBuilder:
def flatten_config_command(self):
cmd = []
for arg in mesonlib.listify(self.cmd, flatten=True):
- arg = getattr(arg, 'held_object', arg)
if isinstance(arg, mesonlib.File):
arg = arg.absolute_path(self.state.environment.get_source_dir(),
self.state.environment.get_build_dir())
@@ -371,7 +368,7 @@ class HotdocTargetHolder(CustomTargetHolder):
def config_path_method(self, *args, **kwargs):
conf = self.held_object.hotdoc_conf.absolute_path(self.interpreter.environment.source_dir,
self.interpreter.environment.build_dir)
- return self.interpreter.holderify(conf)
+ return conf
class HotdocTarget(build.CustomTarget):
@@ -422,7 +419,7 @@ class HotDocModule(ExtensionModule):
project_name = args[0]
builder = HotdocTargetBuilder(project_name, state, self.hotdoc, self.interpreter, kwargs)
target, install_script = builder.make_targets()
- targets = [HotdocTargetHolder(target, self.interpreter)]
+ targets = [target]
if install_script:
targets.append(install_script)
@@ -430,4 +427,6 @@ class HotDocModule(ExtensionModule):
def initialize(interpreter):
- return HotDocModule(interpreter)
+ mod = HotDocModule(interpreter)
+ mod.interpreter.append_holder_map(HotdocTarget, HotdocTargetHolder)
+ return mod
--
cgit v1.1