Bug 1259382 - Make add_old_configure_assignment work like set_config, accepting both @depends functions and literal values for both arguments it takes. r=ted

This commit is contained in:
Mike Hommey 2016-04-05 09:41:38 +09:00
parent 19f78b2dd2
commit 441c1e30d4

View File

@ -129,13 +129,16 @@ def extra_old_configure_args(help):
@template
@imports(_from='mozbuild.configure', _import='DependsFunction')
def add_old_configure_assignment(var, value_func):
assert isinstance(value_func, DependsFunction)
def add_old_configure_assignment(var, value):
if not isinstance(var, DependsFunction):
var = depends('--help')(lambda x: var)
if not isinstance(value, DependsFunction):
value = depends('--help')(lambda x: value)
@depends(old_configure_assignments, value_func)
@depends(old_configure_assignments, var, value)
@imports(_from='mozbuild.shellutil', _import='quote')
def add_assignment(assignments, value):
if value is None:
def add_assignment(assignments, var, value):
if var is None or value is None:
return
if value is True:
assignments.append('%s=1' % var)