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

Kill RawFile dead!

This commit is contained in:
Jussi Pakkanen 2017-04-30 20:02:01 +03:00
parent a6775233c7
commit 33b79dcf25
2 changed files with 32 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mesonbuild/backend/backends.py
View File

@ -313,7 +313,9 @@ class Backend:
# anyone both enables unity builds and has a file called foo-unity.cpp. # anyone both enables unity builds and has a file called foo-unity.cpp.
osrc = self.get_unity_source_filename(extobj.target, osrc = self.get_unity_source_filename(extobj.target,
comp.get_default_suffix()) comp.get_default_suffix())
osrc = os.path.join(self.get_target_private_dir(extobj.target), osrc)
objname = self.object_filename_from_source(extobj.target, osrc, True) objname = self.object_filename_from_source(extobj.target, osrc, True)
objname = objname.replace('/', '_').replace('\\', '_')
objpath = os.path.join(proj_dir_to_build_root, targetdir, objname) objpath = os.path.join(proj_dir_to_build_root, targetdir, objname)
return [objpath] return [objpath]
for osrc in extobj.srclist: for osrc in extobj.srclist:

74
mesonbuild/backend/ninjabackend.py
View File

@ -40,25 +40,6 @@ else:
def ninja_quote(text): def ninja_quote(text):
return text.replace(' ', '$ ').replace(':', '$:') return text.replace(' ', '$ ').replace(':', '$:')
class RawFilename:
"""
Used when a filename is already relative to the root build directory, so
that we know not to add the target's private build directory to it.
"""
def __init__(self, fname):
self.fname = fname
def __str__(self):
return self.fname
def __repr__(self):
return '<RawFilename: {0}>'.format(self.fname)
def split(self, c):
return self.fname.split(c)
def startswith(self, s):
return self.fname.startswith(s)
class NinjaBuildElement: class NinjaBuildElement:
def __init__(self, all_outputs, outfilenames, rule, infilenames): def __init__(self, all_outputs, outfilenames, rule, infilenames):
@ -376,7 +357,8 @@ int dummy;
# same time, also deal with generated sources that need to be compiled. # same time, also deal with generated sources that need to be compiled.
generated_source_files = [] generated_source_files = []
for rel_src, gensrc in generated_sources.items(): for rel_src, gensrc in generated_sources.items():
raw_src = RawFilename(rel_src) dirpart, fnamepart = os.path.split(rel_src)
raw_src = File(True, dirpart, fnamepart)
if self.environment.is_source(rel_src) and not self.environment.is_header(rel_src): if self.environment.is_source(rel_src) and not self.environment.is_header(rel_src):
if is_unity and self.get_target_source_can_unity(target, rel_src): if is_unity and self.get_target_source_can_unity(target, rel_src):
unity_deps.append(raw_src) unity_deps.append(raw_src)
@ -409,7 +391,8 @@ int dummy;
# necessary. This needs to be separate for at least Vala # necessary. This needs to be separate for at least Vala
vala_generated_source_files = [] vala_generated_source_files = []
for src in vala_generated_sources: for src in vala_generated_sources:
raw_src = RawFilename(src) dirpart, fnamepart = os.path.split(src)
raw_src = File(True, dirpart, fnamepart)
if is_unity: if is_unity:
unity_src.append(os.path.join(self.environment.get_build_dir(), src)) unity_src.append(os.path.join(self.environment.get_build_dir(), src))
header_deps.append(raw_src) header_deps.append(raw_src)
@ -1846,8 +1829,11 @@ rule FORTRAN_DEP_HACK
# Compiler args for compiling this target # Compiler args for compiling this target
commands += compilers.get_base_compile_args(self.environment.coredata.base_options, commands += compilers.get_base_compile_args(self.environment.coredata.base_options,
compiler) compiler)
if isinstance(src, (RawFilename, File)): if isinstance(src, File):
src_filename = src.fname if src.is_built:
src_filename = os.path.join(src.subdir, src.fname)
else:
src_filename = src.fname
elif os.path.isabs(src): elif os.path.isabs(src):
src_filename = os.path.basename(src) src_filename = os.path.basename(src)
else: else:
@ -1856,7 +1842,7 @@ rule FORTRAN_DEP_HACK
rel_obj = os.path.join(self.get_target_private_dir(target), obj_basename) rel_obj = os.path.join(self.get_target_private_dir(target), obj_basename)
rel_obj += '.' + self.environment.get_object_suffix() rel_obj += '.' + self.environment.get_object_suffix()
commands += self.get_compile_debugfile_args(compiler, target, rel_obj) commands += self.get_compile_debugfile_args(compiler, target, rel_obj)
if isinstance(src, RawFilename): if isinstance(src, File) and src.is_built:
rel_src = src.fname rel_src = src.fname
elif isinstance(src, File): elif isinstance(src, File):
rel_src = src.rel_to_builddir(self.build_to_src) rel_src = src.rel_to_builddir(self.build_to_src)
@ -1978,13 +1964,7 @@ rule FORTRAN_DEP_HACK
""" """
if isinstance(src, str) and src.endswith('.h'): if isinstance(src, str) and src.endswith('.h'):
raise AssertionError('BUG: sources should not contain headers {!r}'.format(src)) raise AssertionError('BUG: sources should not contain headers {!r}'.format(src))
if isinstance(src, RawFilename) and src.fname.endswith('.h'):
raise AssertionError('BUG: sources should not contain headers {!r}'.format(src.fname))
if isinstance(src, str) and src.endswith('.h'):
raise AssertionError('BUG: sources should not contain headers {!r}'.format(src))
if isinstance(src, RawFilename) and src.fname.endswith('.h'):
raise AssertionError('BUG: sources should not contain headers {!r}'.format(src.fname))
compiler = get_compiler_for_source(target.compilers.values(), src) compiler = get_compiler_for_source(target.compilers.values(), src)
key = (target, compiler, is_generated) key = (target, compiler, is_generated)
if key in self.target_arg_cache: if key in self.target_arg_cache:
@ -1994,14 +1974,12 @@ rule FORTRAN_DEP_HACK
self.target_arg_cache[key] = commands self.target_arg_cache[key] = commands
commands = CompilerArgs(commands.compiler, commands) commands = CompilerArgs(commands.compiler, commands)
# FIXME: This file handling is atrocious and broken. We need to if isinstance(src, mesonlib.File) and src.is_built:
# replace it with File objects used consistently everywhere. rel_src = os.path.join(src.subdir, src.fname)
if isinstance(src, RawFilename): if os.path.isabs(rel_src):
rel_src = src.fname assert(rel_src.startswith(self.environment.get_build_dir()))
if os.path.isabs(src.fname): rel_src = rel_src[len(self.environment.get_build_dir())+1:]
abs_src = src.fname abs_src = os.path.join(self.environment.get_build_dir(), rel_src)
else:
abs_src = os.path.join(self.environment.get_build_dir(), src.fname)
elif isinstance(src, mesonlib.File): elif isinstance(src, mesonlib.File):
rel_src = src.rel_to_builddir(self.build_to_src) rel_src = src.rel_to_builddir(self.build_to_src)
abs_src = src.absolute_path(self.environment.get_source_dir(), abs_src = src.absolute_path(self.environment.get_source_dir(),
@ -2014,8 +1992,14 @@ rule FORTRAN_DEP_HACK
else: else:
raise InvalidArguments('Invalid source type: {!r}'.format(src)) raise InvalidArguments('Invalid source type: {!r}'.format(src))
abs_src = os.path.join(self.environment.get_build_dir(), rel_src) abs_src = os.path.join(self.environment.get_build_dir(), rel_src)
if isinstance(src, (RawFilename, File)): if isinstance(src, File):
src_filename = src.fname if src.is_built:
src_filename = os.path.join(src.subdir, src.fname)
if os.path.isabs(src_filename):
assert(src_filename.startswith(self.environment.get_build_dir()))
src_filename = src_filename[len(self.environment.get_build_dir())+1:]
else:
src_filename = src.fname
elif os.path.isabs(src): elif os.path.isabs(src):
src_filename = os.path.basename(src) src_filename = os.path.basename(src)
else: else:
@ -2068,16 +2052,16 @@ rule FORTRAN_DEP_HACK
element = NinjaBuildElement(self.all_outputs, rel_obj, compiler_name, rel_src) element = NinjaBuildElement(self.all_outputs, rel_obj, compiler_name, rel_src)
for d in header_deps: for d in header_deps:
if isinstance(d, RawFilename): if isinstance(d, File):
d = d.fname d = d.rel_to_builddir(self.build_to_src)
elif not self.has_dir_part(d): elif not self.has_dir_part(d):
d = os.path.join(self.get_target_private_dir(target), d) d = os.path.join(self.get_target_private_dir(target), d)
element.add_dep(d) element.add_dep(d)
for d in extra_deps: for d in extra_deps:
element.add_dep(d) element.add_dep(d)
for d in order_deps: for d in order_deps:
if isinstance(d, RawFilename): if isinstance(d, File):
d = d.fname d = d.rel_to_builddir(self.build_to_src)
elif not self.has_dir_part(d): elif not self.has_dir_part(d):
d = os.path.join(self.get_target_private_dir(target), d) d = os.path.join(self.get_target_private_dir(target), d)
element.add_orderdep(d) element.add_orderdep(d)
@ -2094,6 +2078,8 @@ rule FORTRAN_DEP_HACK
def has_dir_part(self, fname): def has_dir_part(self, fname):
# FIXME FIXME: The usage of this is a terrible and unreliable hack # FIXME FIXME: The usage of this is a terrible and unreliable hack
if isinstance(fname, File):
return fname.subdir != ''
return '/' in fname or '\\' in fname return '/' in fname or '\\' in fname
# Fortran is a bit weird (again). When you link against a library, just compiling a source file # Fortran is a bit weird (again). When you link against a library, just compiling a source file