diff options
author | Jussi Pakkanen <jpakkane@gmail.com> | 2015-08-14 16:34:24 +0300 |
---|---|---|
committer | Jussi Pakkanen <jpakkane@gmail.com> | 2015-08-14 16:34:24 +0300 |
commit | 63572626c69fc888b6fa94d00cf1bfcb7bb3c652 (patch) | |
tree | 2fea6b9e743a6f1a315c9e5a871567cdf8344749 /interpreter.py | |
parent | a5abcf1fe2a033efd5c79b5220b658aa7d844197 (diff) | |
download | meson-63572626c69fc888b6fa94d00cf1bfcb7bb3c652.zip meson-63572626c69fc888b6fa94d00cf1bfcb7bb3c652.tar.gz meson-63572626c69fc888b6fa94d00cf1bfcb7bb3c652.tar.bz2 |
Copy permission bits from source files and fix a path issue.
Diffstat (limited to 'interpreter.py')
-rw-r--r-- | interpreter.py | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/interpreter.py b/interpreter.py index cbc1e08..91ec6aa 100644 --- a/interpreter.py +++ b/interpreter.py @@ -1595,12 +1595,7 @@ class Interpreter(): raise InterpreterException('Configure_file must have either "configuration" or "command".') if isinstance(kwargs.get('install_dir', None), str): self.build.data.append(Data(False, self.subdir, [output], kwargs)) - # FIXME, HORROR, this is a massive hack to get this working. The correct - # solution is to finally do the refactoring where source files are no - # longer strings but actual objects. This is a major undertaking - # and will only be done after the next release. - outputfile = os.path.join(self.environment.build_dir, self.subdir, output) - return outputfile + return mesonlib.File.from_built_file(self.subdir, output) @stringArgs @noKwargs |