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

Harmonise held_object usage somewhat.

This commit is contained in:
Jussi Pakkanen 2014-11-07 19:00:57 +02:00
parent d73af2558a
commit 188986fac3
2 changed files with 14 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
build.py
View File

@ -236,9 +236,7 @@ class BuildTarget():
d = [d] d = [d]
newd = [] newd = []
for i in d: for i in d:
if hasattr(i, 'el'): if hasattr(i, 'held_object'):
newd.append(i.el)
elif hasattr(i, 'held_object'):
newd.append(i.held_object) newd.append(i.held_object)
else: else:
newd.append(i) newd.append(i)
@ -420,8 +418,8 @@ class BuildTarget():
def add_external_deps(self, deps): def add_external_deps(self, deps):
for dep in deps: for dep in deps:
if hasattr(dep, 'el'): if hasattr(dep, 'held_object'):
dep = dep.el dep = dep.held_object
if not isinstance(dep, dependencies.Dependency): if not isinstance(dep, dependencies.Dependency):
raise InvalidArguments('Argument is not an external dependency') raise InvalidArguments('Argument is not an external dependency')
self.external_deps.append(dep) self.external_deps.append(dep)
@ -504,8 +502,6 @@ class Generator():
exe = args[0].held_object exe = args[0].held_object
if not isinstance(exe, Executable): if not isinstance(exe, Executable):
raise InvalidArguments('First generator argument must be an executable.') raise InvalidArguments('First generator argument must be an executable.')
elif hasattr(args[0], 'ep'):
exe = args[0].ep
else: else:
raise InvalidArguments('First generator argument must be an executable object.') raise InvalidArguments('First generator argument must be an executable object.')
self.exe = exe self.exe = exe
@ -710,8 +706,6 @@ class CustomTarget:
cmd = [cmd] cmd = [cmd]
final_cmd = [] final_cmd = []
for i, c in enumerate(cmd): for i, c in enumerate(cmd):
if hasattr(c, 'ep'):
c = c.ep
if hasattr(c, 'held_object'): if hasattr(c, 'held_object'):
c = c.held_object c = c.held_object
if isinstance(c, str): if isinstance(c, str):

22
interpreter.py
View File

@ -170,47 +170,47 @@ class ConfigurationDataHolder(InterpreterObject):
class ExternalProgramHolder(InterpreterObject): class ExternalProgramHolder(InterpreterObject):
def __init__(self, ep): def __init__(self, ep):
InterpreterObject.__init__(self) InterpreterObject.__init__(self)
self.ep = ep self.held_object = ep
self.methods.update({'found': self.found_method}) self.methods.update({'found': self.found_method})
def found_method(self, args, kwargs): def found_method(self, args, kwargs):
return self.found() return self.found()
def found(self): def found(self):
return self.ep.found() return self.held_object.found()
def get_command(self): def get_command(self):
return self.ep.fullpath return self.held_object.fullpath
def get_name(self): def get_name(self):
return self.ep.name return self.held_object.name
class ExternalLibraryHolder(InterpreterObject): class ExternalLibraryHolder(InterpreterObject):
def __init__(self, el): def __init__(self, el):
InterpreterObject.__init__(self) InterpreterObject.__init__(self)
self.el = el self.held_object = el
self.methods.update({'found': self.found_method}) self.methods.update({'found': self.found_method})
def found(self): def found(self):
return self.el.found() return self.held_object.found()
def found_method(self, args, kwargs): def found_method(self, args, kwargs):
return self.found() return self.found()
def get_filename(self): def get_filename(self):
return self.el.fullpath return self.held_object.fullpath
def get_name(self): def get_name(self):
return self.el.name return self.held_object.name
def get_compile_args(self): def get_compile_args(self):
return self.el.get_compile_args() return self.held_object.get_compile_args()
def get_link_args(self): def get_link_args(self):
return self.el.get_link_args() return self.held_object.get_link_args()
def get_exe_args(self): def get_exe_args(self):
return self.el.get_exe_args() return self.held_object.get_exe_args()
class GeneratorHolder(InterpreterObject): class GeneratorHolder(InterpreterObject):
def __init__(self, interpreter, args, kwargs): def __init__(self, interpreter, args, kwargs):