1419556 - Properly quote CompileFlags in the tup backend

Status: RESOLVED FIXED

(Firefox Build System :: General, enhancement)

Description

[Michael Shal [:mshal]]

The CompileFlags need to be shell_quoted in the tup backend, otherwise for example widget/gtk fails to compile because it has -DMOZ_APP_NAME="firefox" in the command-line. It needs to be wrapped in single-quotes so the string quotes get to the preprocessor.

Comment 1

[Michael Shal [:mshal]]

Attachment: Bug 1419556 - shell_quote() the ComputedFlags in the tup backend;

Flags like -DMOZ_APP_NAME="firefox" need to be sent through the shell as
'-DMOZ_APP_NAME="firefox"', otherwise the double-quotes get eaten and
the string is invalid.

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

Comment 2

[Michael Shal [:mshal]]

Attachment: Bug 1419556 - Expand list of supported compilation dirs in the tup backend;

This combines and expands the list of directories where compilation
currently works in tup, going backwards through the alphabet. Not all of
these directories actually contain compileable code, but this makes it
obvious which top-level directories are not yet enabled. It is likely
that other directories will compile successfully as well - this is
simply a staging point.

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

Comment 3

[Chris Manchester (limited bugmail, email directly)]

Comment on attachment 8930666 [details]
Bug 1419556 - shell_quote() the ComputedFlags in the tup backend;

https://reviewboard.mozilla.org/r/201810/#review207094

Comment 4

[Chris Manchester (limited bugmail, email directly)]

Comment on attachment 8930667 [details]
Bug 1419556 - Expand list of supported compilation dirs in the tup backend;

https://reviewboard.mozilla.org/r/201812/#review207096

::: python/mozbuild/mozbuild/backend/tup.py:276
(Diff revision 1)
>          elif isinstance(obj, PerSourceFlag):
>              backend_file.per_source_flags[obj.file_name].extend(obj.flags)
>          elif isinstance(obj, ComputedFlags):
>              self._process_computed_flags(obj, backend_file)
>          elif isinstance(obj, (Sources, GeneratedSources)):
> -            if obj.relobjdir.startswith('xpcom'):
> +            if obj.relobjdir.startswith(self._supported_dirs):

Huh, I never knew startswith took a tuple, that's pretty useful!

Comment 5

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/integration/autoland/rev/37d892d33b6c
shell_quote() the ComputedFlags in the tup backend; r=chmanchester
https://hg.mozilla.org/integration/autoland/rev/425acc5494c0
Expand list of supported compilation dirs in the tup backend; r=chmanchester

Comment 6

[Andrei Ciure[:aciure]]

https://hg.mozilla.org/mozilla-central/rev/37d892d33b6c
https://hg.mozilla.org/mozilla-central/rev/425acc5494c0