1423809 - Support localized generated files in the Tup backend

Status: RESOLVED FIXED

(Firefox Build System :: General, enhancement)

Description

[Chris Manchester (limited bugmail, email directly)]

They're currently processed as generated files, but fail due to missing the locale-specific arguments provided by the backend.

Comment 1

[(not currently active) Ted Mielczarek]

Oh, bummer! I expected `LOCALIZED_FILES` to work without extra handling, but I didn't think through `LOCALIZED_GENERATED_FILES` that well. If there's anything we can uplift into the emitter or whatever to make this easier that'd be fine!

Comment 2

[Michael Shal [:mshal]]

Attachment: Bug 1423809 - Support localized generated files in the tup backend;

These files fail to build in the tup backend because the --locale
argument is missing and scripts like generate_update_locale.py require a
locale. Since the tup backend currently only supports en-US, we can just
hardcode this argument for now.

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

Comment 3

[Michael Shal [:mshal]]

Attachment: Bug 1423809 - Fixup dist/bin/Tupfile generation;

Bug 1416891 introduced a line in moz.build that uses
LOCALIZED_FILES['..'], which ended up created a BackendTupfile object
for 'dist/bin/browser/../Tupfile' separate from the BackendTupfile
object for 'dist/bin/Tupfile'. Since both objects write to the same
file, the one with a '..' in the path ended up clobbering the original
one.

This patch makes two small changes, either of which would be sufficient
to fix the problem. First, we only get the backend file in
_process_final_target_files() when we actually use it (the
LOCALIZED_FILES in this case goes through the else case). Second, we now
call normpath in _get_backend_file() to ensure things like '..' are
resolved so that any future cases of 'Tupfile' and 'foo/../Tupfile'
end up pointing to the same object.

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

Comment 4

[Nick Alexander :nalexander [he/him]]

Comment on attachment 8935889 [details]
Bug 1423809 - Support localized generated files in the tup backend;

https://reviewboard.mozilla.org/r/206754/#review212566

::: python/mozbuild/mozbuild/backend/tup.py:334
(Diff revision 1)
>              'toolkit/library', # libxul.so
>          )
>          if obj.script and obj.method and obj.relobjdir not in skip_directories:
>              backend_file.export_shell()
>              cmd = self._py_action('file_generate')
> +            if obj.localized:

Consider filing follow-up to track fixing this.  Blocking "Tup, full support" meta ticket or whatever.

Comment 5

[Nick Alexander :nalexander [he/him]]

Comment on attachment 8935890 [details]
Bug 1423809 - Fixup dist/bin/Tupfile generation;

https://reviewboard.mozilla.org/r/206756/#review212568

lgtm.

Comment 6

[Michael Shal [:mshal]]

Comment on attachment 8935889 [details]
Bug 1423809 - Support localized generated files in the tup backend;

https://reviewboard.mozilla.org/r/206754/#review212984

::: python/mozbuild/mozbuild/backend/tup.py:334
(Diff revision 1)
>              'toolkit/library', # libxul.so
>          )
>          if obj.script and obj.method and obj.relobjdir not in skip_directories:
>              backend_file.export_shell()
>              cmd = self._py_action('file_generate')
> +            if obj.localized:

Filed bug 1424896

Comment 7

[Mozilla Autoland]

We're sorry, Autoland could not rebase your commits for you automatically. Please manually rebase your commits and try again.

hg error in cmd: hg rebase -s d450ca431b2c -d fba9ddd36edd: rebasing 438980:d450ca431b2c "Bug 1423809 - Support localized generated files in the tup backend; r=nalexander"
merging python/mozbuild/mozbuild/backend/tup.py
rebasing 438981:23f0d611667d "Bug 1423809 - Fixup dist/bin/Tupfile generation; r=nalexander" (tip)
merging python/mozbuild/mozbuild/backend/tup.py
warning: conflicts while merging python/mozbuild/mozbuild/backend/tup.py! (edit, then use 'hg resolve --mark')
unresolved conflicts (see hg resolve, then hg rebase --continue)

Comment 8

[Michael Shal [:mshal]]

Comment on attachment 8935889 [details]
Bug 1423809 - Support localized generated files in the tup backend;

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

Comment 9

[Michael Shal [:mshal]]

Comment on attachment 8935890 [details]
Bug 1423809 - Fixup dist/bin/Tupfile generation;

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

Comment 10

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/integration/autoland/rev/8fc2ba9a2dcb
Support localized generated files in the tup backend; r=nalexander
https://hg.mozilla.org/integration/autoland/rev/22c25f65c0b8
Fixup dist/bin/Tupfile generation; r=nalexander

Comment 11

[Cosmin Sabou [:CosminS]]

https://hg.mozilla.org/mozilla-central/rev/8fc2ba9a2dcb
https://hg.mozilla.org/mozilla-central/rev/22c25f65c0b8