From dd81cb74dcf1723c44a31da4c1b5a9bd39eb85bd Mon Sep 17 00:00:00 2001 From: Thomas Nagy Date: Thu, 28 Apr 2016 00:29:12 +0200 Subject: [PATCH] Pass the vala environment for installation (not modified so it should be fine) --- tests/install/wscript | 6 +++--- waflib/Tools/vala.py | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/tests/install/wscript b/tests/install/wscript index 74e4cf2a..d12390d9 100644 --- a/tests/install/wscript +++ b/tests/install/wscript @@ -7,7 +7,7 @@ def configure(conf): pass -from waflib import TaskGen, Build +from waflib import TaskGen, Build, Utils @TaskGen.feature('ruler') @TaskGen.before('process_rule') def stuff(self): @@ -22,9 +22,9 @@ def stuff(self): self.source = tg.install_task.outputs # tg is a task object def build(bld): - bld.install_as('${PREFIX}/bin/foo', 'wscript', chmod = 0555) + bld.install_as('${PREFIX}/bin/foo', 'wscript', chmod=Utils.O755) bld.symlink_as('${PREFIX}/bin/bar', 'foo') - tsk = bld.install_files('${PREFIX}/bin', 'wscript', chmod = 0555, name='cheese') + tsk = bld.install_files('${PREFIX}/bin', 'wscript', chmod=Utils.O755, name='cheese') bld(rule='ls -l ${SRC}', always=True, bring_in='cheese', features='ruler') diff --git a/waflib/Tools/vala.py b/waflib/Tools/vala.py index f1188fa7..329467e8 100644 --- a/waflib/Tools/vala.py +++ b/waflib/Tools/vala.py @@ -186,19 +186,19 @@ def init_vala_task(self): try: self.install_vheader.source = headers_list except AttributeError: - self.install_vheader = self.bld.install_files(valatask.header_path, headers_list, self.env) + self.install_vheader = self.bld.install_files(valatask.header_path, headers_list, env=self.env) vapi_list = [o for o in valatask.outputs if (o.suffix() in (".vapi", ".deps"))] try: self.install_vapi.source = vapi_list except AttributeError: - self.install_vapi = self.bld.install_files(valatask.vapi_path, vapi_list, self.env) + self.install_vapi = self.bld.install_files(valatask.vapi_path, vapi_list, env=self.env) gir_list = [o for o in valatask.outputs if o.suffix() == '.gir'] try: self.install_gir.source = gir_list except AttributeError: - self.install_gir = self.bld.install_files(getattr(self, 'gir_path', '${DATAROOTDIR}/gir-1.0'), gir_list, self.env) + self.install_gir = self.bld.install_files(getattr(self, 'gir_path', '${DATAROOTDIR}/gir-1.0'), gir_list, env=self.env) if hasattr(self, 'vala_resources'): nodes = self.to_nodes(self.vala_resources)