From 63572626c69fc888b6fa94d00cf1bfcb7bb3c652 Mon Sep 17 00:00:00 2001 From: Jussi Pakkanen Date: Fri, 14 Aug 2015 16:34:24 +0300 Subject: Copy permission bits from source files and fix a path issue. --- interpreter.py | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'interpreter.py') diff --git a/interpreter.py b/interpreter.py index cbc1e08a5..91ec6aaec 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 -- cgit v1.2.3