1423438 - .deps/mozilla-config.h.pp has invalid content

Status: RESOLVED FIXED

(Firefox Build System :: General, defect)

Description

[Mike Hommey [:glandium]]

I noticed when, after doing some hackish modification to mozilla-central.h.in, the build would fail with an error parsing mozilla-config.h.pp.

Examples of things it contains that is invalid:

$(wildcard /home/glandium/gecko/obj-x86_64-pc-linux-gnu/config.statusd/defines/"mozilla/Char16.h")
$(wildcard /home/glandium/gecko/obj-x86_64-pc-linux-gnu/config.statusd/defines/defined(HUNSPELL_STATIC))
$(wildcard /home/glandium/gecko/obj-x86_64-pc-linux-gnu/config.statusd/defines/defined(__clang__))
$(wildcard /home/glandium/gecko/obj-x86_64-pc-linux-gnu/config.statusd/defines/!defined(__ASSEMBLER__))

etc.

Comment 1

[Michael Shal [:mshal]]

Attachment: Bug 1423438 - Fix invalid .pp content for process_define_files.py;

The process_define_files action uses the PartialConfigEnvironment to
query buildconfig values, but it should only be doing it for 'define'
and 'undef' statements. It was incorrectly also querying the
PartialConfigEnvironment with other preprocessor statements like 'if'
and 'include', which caused bogus entries to appear in the generated
dependency file.

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

Comment 2

[Mike Hommey [:glandium]]

Comment on attachment 8935492 [details]
Bug 1423438 - Fix invalid .pp content for process_define_files.py;

https://reviewboard.mozilla.org/r/206392/#review212068

::: python/mozbuild/mozbuild/action/process_define_files.py:60
(Diff revision 1)
>                              '#define %s %s' % (name, val)
>                              for name, val in config.defines['ALLDEFINES'].iteritems()))
>                          l = l[:m.start('cmd') - 1] \
>                              + defines + l[m.end('name'):]
> -                    elif name in config.defines:
> -                        if cmd == 'define' and value:
> +                    elif cmd == 'define':
> +                        if value and name in config.defines:

I /think/ those name in config.defines checks are fine, but I'm not 100% sure.

Comment 3

[Michael Shal [:mshal]]

Comment on attachment 8935492 [details]
Bug 1423438 - Fix invalid .pp content for process_define_files.py;

https://reviewboard.mozilla.org/r/206392/#review212584

::: python/mozbuild/mozbuild/action/process_define_files.py:60
(Diff revision 1)
>                              '#define %s %s' % (name, val)
>                              for name, val in config.defines['ALLDEFINES'].iteritems()))
>                          l = l[:m.start('cmd') - 1] \
>                              + defines + l[m.end('name'):]
> -                    elif name in config.defines:
> -                        if cmd == 'define' and value:
> +                    elif cmd == 'define':
> +                        if value and name in config.defines:

Those checks do add a dependency, but I'm not sure if there are any that would cause problems. If you continue to hit errors, please re-open this and I can take a look.

Comment 4

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/integration/autoland/rev/1c287e5f6b09
Fix invalid .pp content for process_define_files.py; r=glandium

Comment 5

[Andreea Pavel [:apavel]]

https://hg.mozilla.org/mozilla-central/rev/1c287e5f6b09