mirror of https://gitlab.com/ita1024/waf.git
Apply 'Utils.to_list' on 'vala_defines' and include it in 'valadoc' tool
This commit is contained in:
parent
bc80ea97ae
commit
8c8b0d8f0b
|
@ -103,7 +103,7 @@ def init_vala_task(self):
|
||||||
if self.vala_target_glib:
|
if self.vala_target_glib:
|
||||||
addflags('--target-glib=%s' % 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', []))
|
packages_private = Utils.to_list(getattr(self, 'packages_private', []))
|
||||||
addflags(['--pkg=%s' % x for x in packages_private])
|
addflags(['--pkg=%s' % x for x in packages_private])
|
||||||
|
|
|
@ -30,6 +30,7 @@ class valadoc(Task.Task):
|
||||||
self.private = False
|
self.private = False
|
||||||
self.inherit = False
|
self.inherit = False
|
||||||
self.deps = False
|
self.deps = False
|
||||||
|
self.vala_defines = []
|
||||||
self.enable_non_null_experimental = False
|
self.enable_non_null_experimental = False
|
||||||
self.force = False
|
self.force = False
|
||||||
|
|
||||||
|
@ -57,6 +58,9 @@ class valadoc(Task.Task):
|
||||||
cmd.append ('--inherit')
|
cmd.append ('--inherit')
|
||||||
if getattr(self, 'deps', None):
|
if getattr(self, 'deps', None):
|
||||||
cmd.append ('--deps')
|
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):
|
if getattr(self, 'enable_non_null_experimental', None):
|
||||||
cmd.append ('--enable-non-null-experimental')
|
cmd.append ('--enable-non-null-experimental')
|
||||||
if getattr(self, 'force', None):
|
if getattr(self, 'force', None):
|
||||||
|
@ -119,6 +123,8 @@ def process_valadoc(self):
|
||||||
task.inherit = self.inherit
|
task.inherit = self.inherit
|
||||||
if getattr(self, 'deps', None):
|
if getattr(self, 'deps', None):
|
||||||
task.deps = self.deps
|
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):
|
if getattr(self, 'enable_non_null_experimental', None):
|
||||||
task.enable_non_null_experimental = self.enable_non_null_experimental
|
task.enable_non_null_experimental = self.enable_non_null_experimental
|
||||||
if getattr(self, 'force', None):
|
if getattr(self, 'force', None):
|
||||||
|
|
Loading…
Reference in New Issue