1384449 - when= is failing with js_option

Status: RESOLVED FIXED

(Firefox Build System :: General, enhancement)

Description

[Sylvestre Ledru [:Sylvestre]]

Translated from French
<glandium> Sylvestre: it is js_option's fault
<glandium> Sylvestre: the when is missing here: https://dxr.mozilla.org/mozilla-central/source/build/moz.configure/init.configure#824
<glandium> we should extract it from kwargs and give it

Comment 1

[Sylvestre Ledru [:Sylvestre]]

Attachment: Bug 1384449 - Implement the support of when= for js_option

Review commit: https://reviewboard.mozilla.org/r/161342/diff/#index_header
See other reviews: https://reviewboard.mozilla.org/r/161342/

Comment 2

[Mike Hommey [:glandium]]

Comment on attachment 8890234 [details]
Bug 1384449 - Implement the support of when= for js_option

https://reviewboard.mozilla.org/r/161342/#review166654

::: build/moz.configure/init.configure:904
(Diff revision 1)
>  # This is temporary until js/src/configure and configure are merged.
>  # Use instead of option() in js/moz.configure and more generally, for
>  # options that are shared between configure and js/src/configure.
>  @template
>  def js_option(*args, **kwargs):
> +    when = kwargs['when'] if 'when' in kwargs else None

kwargs.get('when') does the same thing.

Comment 3

[Sylvestre Ledru [:Sylvestre]]

Comment on attachment 8890234 [details]
Bug 1384449 - Implement the support of when= for js_option

Review request updated; see interdiff: https://reviewboard.mozilla.org/r/161342/diff/1-2/

Comment 4

[Mike Hommey [:glandium]]

Comment on attachment 8890234 [details]
Bug 1384449 - Implement the support of when= for js_option

https://reviewboard.mozilla.org/r/161342/#review166668

::: build/moz.configure/init.configure:907
(Diff revision 2)
>  @template
>  def js_option(*args, **kwargs):
> +    when = kwargs.get('when')
>      opt = option(*args, **kwargs)
>  
> -    @depends(opt.option, build_project)
> +    @depends(opt.option, build_project, when=when)

you could also just inline everything here.

Comment 5

[Sylvestre Ledru [:Sylvestre]]

Comment on attachment 8890234 [details]
Bug 1384449 - Implement the support of when= for js_option

Review request updated; see interdiff: https://reviewboard.mozilla.org/r/161342/diff/2-3/

Comment 6

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/integration/autoland/rev/4093407bd0f0
Implement the support of when= for js_option r=glandium

Comment 7

[Wes Kocher (:KWierso) (Not reading bugmail; email directly if needed)]

https://hg.mozilla.org/mozilla-central/rev/4093407bd0f0