1287924 - Find a better solution for conditionally including moz.configure files

Status: RESOLVED FIXED

(Firefox Build System :: General, defect)

Description

[Chris Manchester (limited bugmail, email directly)]

Currently we have quite a few moz.configure files being conditionally included by the root moz.configure, based on whether we're building with --disable-compile-environment. We should templatize this to avoid duplication or find another way to handle the proliferation.

Comment 1

[Mike Hommey [:glandium]]

Following a recent pattern, we could have a include_when() template.

Comment 2

[Chris Manchester (limited bugmail, email directly)]

Attachment: Bug 1287924 - Add a template for conditionally including moz.configure files.

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

Comment 3

[Mike Hommey [:glandium]]

Comment on attachment 8774541 [details]
Bug 1287924 - Add a template for conditionally including moz.configure files.

https://reviewboard.mozilla.org/r/66978/#review63936

You could also change android_ndk_include

::: moz.configure:97
(Diff revision 1)
>  
>  add_old_configure_assignment('MOZ_DEBUG',
>                               depends('--enable-debug')(lambda v: bool(v)))
>  
> -@depends('--disable-compile-environment', '--help')
> -def toolchain_include(compile_env, help):
> +include_when('build/moz.configure/toolchain.configure',
> +             '--enable-compile-environment')

An explicit when= might make it a little clearer.

Comment 4

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/integration/mozilla-inbound/rev/83db605b772e
Add a template for conditionally including moz.configure files. r=glandium

Comment 5

[Carsten Book [:Tomcat]]

https://hg.mozilla.org/mozilla-central/rev/83db605b772e