1319345 - Change how application.ini and application.ini.h are generated

Status: RESOLVED FIXED

(Firefox Build System :: General, defect)

Comment 1

[Mike Hommey [:glandium]]

Attachment: Bug 1319345 - Add flags to GENERATED_FILES.

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

Comment 2

[Mike Hommey [:glandium]]

Attachment: Bug 1319345 - Change how application.ini and application.ini.h are generated.

The current way they are generated makes it so that it's not trivial for
the backends to figure that one depends on the other. While we should
eventually make things such that using FINAL_TARGET_PP_FILES works for
that, it's currently simpler to just use GENERATED_FILES.

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

Comment 3

[Michael Shal [:mshal]]

Comment on attachment 8813050 [details]
Bug 1319345 - Add flags to GENERATED_FILES.

https://reviewboard.mozilla.org/r/94570/#review95026

Comment 4

[Michael Shal [:mshal]]

Comment on attachment 8813051 [details]
Bug 1319345 - Change how application.ini and application.ini.h are generated.

https://reviewboard.mozilla.org/r/94572/#review95028

::: build/moz.build:30
(Diff revision 1)
> +}
> +
>  for var in ('GRE_MILESTONE', 'MOZ_APP_VERSION', 'MOZ_APP_BASENAME',
>              'MOZ_APP_VENDOR', 'MOZ_APP_ID', 'MAR_CHANNEL_ID',
> -            'ACCEPTED_MAR_CHANNEL_IDS', 'MOZ_APP_REMOTINGNAME'):
> -    DEFINES[var] = CONFIG[var]
> +            'MOZ_APP_REMOTINGNAME'):
> +    appini_defines[var] = CONFIG[var]

Since appini_defines are now only used by the application.ini generation, they can be moved inside the if CONFIG['MOZ_APP_BASENAME'] block.

Comment 5

[Mike Hommey [:glandium]]

Comment on attachment 8813051 [details]
Bug 1319345 - Change how application.ini and application.ini.h are generated.

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

Comment 6

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/integration/autoland/rev/861e47bdfa2b
Add flags to GENERATED_FILES. r=mshal
https://hg.mozilla.org/integration/autoland/rev/d4006c73e308
Change how application.ini and application.ini.h are generated. r=mshal

Comment 7

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/integration/autoland/rev/20c0572d2e46
application.ini fixup for artifact build bustage; r=gps

Comment 8

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

https://hg.mozilla.org/mozilla-central/rev/861e47bdfa2b
https://hg.mozilla.org/mozilla-central/rev/d4006c73e308
https://hg.mozilla.org/mozilla-central/rev/20c0572d2e46