aboutsummaryrefslogtreecommitdiff
path: root/interpreter.py
diff options
context:
space:
mode:
authorJussi Pakkanen <jpakkane@gmail.com>2015-07-30 02:01:47 +0300
committerJussi Pakkanen <jpakkane@gmail.com>2015-08-02 13:49:11 +0300
commit83cc5ce4c594306f0d37106dfaa829daa6c084a5 (patch)
tree3d96bc3e7b870e50e4140fc49766057d26438578 /interpreter.py
parent8b52dec6d9c078082fd2896779c24de9578fe382 (diff)
downloadmeson-83cc5ce4c594306f0d37106dfaa829daa6c084a5.zip
meson-83cc5ce4c594306f0d37106dfaa829daa6c084a5.tar.gz
meson-83cc5ce4c594306f0d37106dfaa829daa6c084a5.tar.bz2
Allow more than one install script and make gtkdoc method return one.
Diffstat (limited to 'interpreter.py')
-rw-r--r--interpreter.py8
1 files changed, 5 insertions, 3 deletions
diff --git a/interpreter.py b/interpreter.py
index 0db5963..a54133a 100644
--- a/interpreter.py
+++ b/interpreter.py
@@ -721,10 +721,10 @@ class MesonMain(InterpreterObject):
'current_build_dir' : self.current_build_dir_method,
'source_root' : self.source_root_method,
'build_root' : self.build_root_method,
- 'set_install_script' : self.set_install_script_method,
+ 'add_install_script' : self.add_install_script_method,
})
- def set_install_script_method(self, args, kwargs):
+ def add_install_script_method(self, args, kwargs):
if len(args) != 1:
raise InterpreterException('Set_install_script takes exactly one argument.')
check_stringlist(args)
@@ -733,7 +733,7 @@ class MesonMain(InterpreterObject):
self.interpreter.subdir, scriptbase)
if not os.path.isfile(scriptfile):
raise InterpreterException('Can not find install script %s.' % scriptbase)
- self.build.install_script = scriptfile
+ self.build.install_scripts.append(build.InstallScript([scriptfile]))
def current_source_dir_method(self, args, kwargs):
src = self.interpreter.environment.source_dir
@@ -912,6 +912,8 @@ class Interpreter():
if v.name in self.build.targets:
raise InterpreterException('Tried to create target %s which already exists.' % v.name)
self.build.targets[v.name] = v
+ elif isinstance(v, build.InstallScript):
+ self.build.install_scripts.append(v)
else:
print(v)
raise InterpreterException('Module returned a value of unknown type.')