FWGS
/
waf
mirror of https://gitlab.com/ita1024/waf.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Pass the vala environment for installation (not modified so it should be fine)

This commit is contained in:
Thomas Nagy 2016-04-28 00:29:12 +02:00
parent 1eaa87413d
commit dd81cb74dc
No known key found for this signature in database
GPG Key ID: 67A565EDFDF90E64
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tests/install/wscript
View File

@ -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')

6
waflib/Tools/vala.py
View File

@ -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)