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

Put external deps into command line.

This commit is contained in:
Jussi Pakkanen 2012-12-30 00:55:35 +02:00
parent 7d56a2fe00
commit a455780ccf
2 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
interpreter.py
View File

@ -30,11 +30,12 @@ class InvalidArguments(InterpreterException):
class InterpreterObject(): class InterpreterObject():
pass pass
class Executable(InterpreterObject): class BuildTarget(InterpreterObject):
def __init__(self, name, sources): def __init__(self, name, sources):
self.name = name self.name = name
self.sources = sources self.sources = sources
self.external_deps = []
def get_basename(self): def get_basename(self):
return self.name return self.name
@ -42,6 +43,16 @@ class Executable(InterpreterObject):
def get_sources(self): def get_sources(self):
return self.sources return self.sources
def add_external_dep(self, dep):
if not isinstance(dep, environment.PkgConfigDependency):
raise InvalidArguments('Argument is not an external dependency')
self.external_deps.append(dep)
def get_external_deps(self):
return self.external_deps
class Executable(BuildTarget):
pass
class Interpreter(): class Interpreter():

12
shellgenerator.py
View File

@ -37,7 +37,7 @@ class ShellGenerator():
os.chmod(outfilename, stat.S_IREAD | stat.S_IWRITE | stat.S_IEXEC |\ os.chmod(outfilename, stat.S_IREAD | stat.S_IWRITE | stat.S_IEXEC |\
stat.S_IRGRP | stat.S_IXGRP | stat.S_IROTH | stat.S_IXOTH) stat.S_IRGRP | stat.S_IXGRP | stat.S_IROTH | stat.S_IXOTH)
def generate_single_compile(self, outfile, src): def generate_single_compile(self, target, outfile, src):
compiler = None compiler = None
for i in self.interpreter.compilers: for i in self.interpreter.compilers:
if i.can_compile(src): if i.can_compile(src):
@ -53,6 +53,8 @@ class ShellGenerator():
commands += compiler.get_debug_flags() commands += compiler.get_debug_flags()
commands += compiler.get_std_warn_flags() commands += compiler.get_std_warn_flags()
commands += compiler.get_compile_only_flags() commands += compiler.get_compile_only_flags()
for dep in target.get_external_deps():
commands += dep.get_compile_flags()
commands.append(abs_src) commands.append(abs_src)
commands += compiler.get_output_flags() commands += compiler.get_output_flags()
commands.append(abs_obj) commands.append(abs_obj)
@ -61,11 +63,13 @@ class ShellGenerator():
outfile.write(' '.join(quoted)) outfile.write(' '.join(quoted))
return abs_obj return abs_obj
def generate_exe_link(self, outfile, outname, obj_list): def generate_link(self, target, outfile, outname, obj_list):
linker = self.interpreter.compilers[0] # Fixme. linker = self.interpreter.compilers[0] # Fixme.
commands = [] commands = []
commands += linker.get_exelist() commands += linker.get_exelist()
commands += obj_list commands += obj_list
for dep in target.get_external_deps():
commands += dep.get_link_flags()
commands += linker.get_output_flags() commands += linker.get_output_flags()
commands.append(outname) commands.append(outname)
quoted = environment.shell_quote(commands) + ['\n'] quoted = environment.shell_quote(commands) + ['\n']
@ -83,8 +87,8 @@ class ShellGenerator():
outname = outname + '.' + suffix outname = outname + '.' + suffix
obj_list = [] obj_list = []
for src in e.get_sources(): for src in e.get_sources():
obj_list.append(self.generate_single_compile(outfile, src)) obj_list.append(self.generate_single_compile(e, outfile, src))
self.generate_exe_link(outfile, outname, obj_list) self.generate_link(e, outfile, outname, obj_list)
if __name__ == '__main__': if __name__ == '__main__':
code = """ code = """