diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2015-04-26 01:56:02 +0300 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2015-04-26 01:56:02 +0300 |
| commit | 5bebe6ce147c54118fc198ee941704f04cfe13b3 (patch) | |
| tree | 60f33b42ff65f7b08262eb9e74a8a9db18367f41 | |
| parent | 8cecf20404143eebf752379d97f7488afe2fd2a6 (diff) | |
| download | meson-5bebe6ce147c54118fc198ee941704f04cfe13b3.zip meson-5bebe6ce147c54118fc198ee941704f04cfe13b3.tar.gz meson-5bebe6ce147c54118fc198ee941704f04cfe13b3.tar.bz2 | |
A few more eradications of plain strings.
| -rw-r--r-- | backends.py | 3 | ||||
| -rw-r--r-- | interpreter.py | 2 | ||||
| -rw-r--r-- | ninjabackend.py | 4 |
3 files changed, 4 insertions, 5 deletions
diff --git a/backends.py b/backends.py index 3c6827f..def52db 100644 --- a/backends.py +++ b/backends.py @@ -165,10 +165,9 @@ class Backend(): targetdir = self.get_target_private_dir(extobj.target) suffix = '.' + self.environment.get_object_suffix() for osrc in extobj.srclist: + osrc = osrc.fname if not self.source_suffix_in_objs: osrc = '.'.join(osrc.split('.')[:-1]) - if hasattr(osrc, 'fname'): # FIXME allow only strings. - osrc = osrc.fname objname = os.path.join(proj_dir_to_build_root, targetdir, os.path.basename(osrc) + suffix) result.append(objname) diff --git a/interpreter.py b/interpreter.py index 09d4467..6de2d54 100644 --- a/interpreter.py +++ b/interpreter.py @@ -1490,7 +1490,7 @@ class Interpreter(): if isinstance(s, File) or isinstance(s, GeneratedListHolder) or \ isinstance(s, CustomTargetHolder): pass - elif isinstance(s, str): # FIXME do not allow plain strings. + elif isinstance(s, str): s = File.from_source_file(self.environment.source_dir, self.subdir, s) else: raise RuntimeError("Unreachable code") diff --git a/ninjabackend.py b/ninjabackend.py index 1d4549e..33ed6d9 100644 --- a/ninjabackend.py +++ b/ninjabackend.py @@ -1107,10 +1107,10 @@ rule FORTRAN_DEP_HACK rel_src = os.path.join(self.get_target_private_dir(target), src) abs_src = os.path.join(self.environment.get_source_dir(), rel_src) else: - if isinstance(src, File): # FIXME, accept only Files. + if isinstance(src, File): rel_src = src.rel_to_builddir(self.build_to_src) else: - rel_src = os.path.join(self.build_to_src, target.get_source_subdir(), src) + raise build.InvaliArguments('Invalid source type.') abs_src = os.path.join(self.environment.get_build_dir(), rel_src) if isinstance(src, RawFilename): src_filename = src.fname |