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

Apply 'Utils.to_list' on 'vala_defines' and include it in 'valadoc' tool

This commit is contained in:
Guillaume Poirier-Morency 2016-02-03 09:21:24 -05:00 committed by Thomas Nagy
parent bc80ea97ae
commit 8c8b0d8f0b
No known key found for this signature in database
GPG Key ID: 67A565EDFDF90E64
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
waflib/Tools/vala.py
View File

@ -103,7 +103,7 @@ def init_vala_task(self):
if self.vala_target_glib:
addflags('--target-glib=%s' % self.vala_target_glib)
addflags(['--define=%s' % x for x in getattr(self, 'vala_defines', [])])
addflags(['--define=%s' % x for x in Utils.to_list(getattr(self, 'vala_defines', []))])
packages_private = Utils.to_list(getattr(self, 'packages_private', []))
addflags(['--pkg=%s' % x for x in packages_private])

6
waflib/extras/valadoc.py
View File

@ -30,6 +30,7 @@ class valadoc(Task.Task):
self.private = False
self.inherit = False
self.deps = False
self.vala_defines = []
self.enable_non_null_experimental = False
self.force = False
@ -57,6 +58,9 @@ class valadoc(Task.Task):
cmd.append ('--inherit')
if getattr(self, 'deps', None):
cmd.append ('--deps')
if getattr(self, 'vala_defines', None):
for define in self.vala_defines:
cmd.append ('--define %s' % define)
if getattr(self, 'enable_non_null_experimental', None):
cmd.append ('--enable-non-null-experimental')
if getattr(self, 'force', None):
@ -119,6 +123,8 @@ def process_valadoc(self):
task.inherit = self.inherit
if getattr(self, 'deps', None):
task.deps = self.deps
if getattr(self, 'vala_defines', None):
task.vala_defines = Utils.to_list(self.vala_defines)
if getattr(self, 'enable_non_null_experimental', None):
task.enable_non_null_experimental = self.enable_non_null_experimental
if getattr(self, 'force', None):