aboutsummaryrefslogtreecommitdiff
path: root/interpreter.py
diff options
context:
space:
mode:
authorJussi Pakkanen <jpakkane@gmail.com>2015-03-27 23:41:28 +0200
committerJussi Pakkanen <jpakkane@gmail.com>2015-03-27 23:41:28 +0200
commit2e93295c2e2ed52abd036687d8a6a947b94f213a (patch)
tree6b4d5394c16c7ea52e438a08a94a6d08d1851291 /interpreter.py
parent00ecf811e67d7ed5372fbddbf19366b6ee61d10b (diff)
downloadmeson-2e93295c2e2ed52abd036687d8a6a947b94f213a.zip
meson-2e93295c2e2ed52abd036687d8a6a947b94f213a.tar.gz
meson-2e93295c2e2ed52abd036687d8a6a947b94f213a.tar.bz2
Generate configure files immediately when they are declared. Closes #88.
Diffstat (limited to 'interpreter.py')
-rw-r--r--interpreter.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/interpreter.py b/interpreter.py
index 319aead..ee8eca7 100644
--- a/interpreter.py
+++ b/interpreter.py
@@ -1412,8 +1412,10 @@ class Interpreter():
conffile = os.path.join(self.subdir, inputfile)
self.build_def_files.append(conffile)
- c = ConfigureFileHolder(self.subdir, inputfile, output, conf.held_object)
- self.build.configure_files.append(c.held_object)
+ os.makedirs(os.path.join(self.environment.build_dir, self.subdir), exist_ok=True)
+ ifile_abs = os.path.join(self.environment.source_dir, self.subdir, inputfile)
+ ofile_abs = os.path.join(self.environment.build_dir, self.subdir, output)
+ mesonlib.do_conf_file(ifile_abs, ofile_abs, conf.held_object)
conf.mark_used()
elif 'command' in kwargs:
res = self.func_run_command(node, kwargs['command'], {})