809798 - Don't use BOTH_MANIFESTS

Status: RESOLVED FIXED

(Firefox Build System :: General, defect)

Description

[Mike Hommey [:glandium]]

Using BOTH_MANIFESTS=1, we end up with:
- chrome.manifest, containing all manifest entries, *and* a "manifest chrome/ab-CD.manifest" entry.
- chrome/ab-CD.manifest containing all manifest entries.

What we currently do in langpacks is including chrome.manifest and skip chrome/ab-CD.manifest, and we leave the spurious "manifest chrome/ab-CD.manifest" entry, which adds a useless file lookup at runtime.

*Not* using BOTH_MANIFESTS=1, we'd end up with:
- chrome.manifest, containing a "manifest chrome/ab-CD.manifest" entry.
- chrome/ab-CD.manifest containing all manifest entries.

which is just as fine, provided chrome/ab-CD.manifest is included in langpacks.

Switching to not using BOTH_MANIFESTS=1 also makes life easier in bug 780561.

Comment 1

[Mike Hommey [:glandium]]

Attachment: Don't use BOTH_MANIFESTS

Comment 2

[Mike Hommey [:glandium]]

Attachment: Don't use BOTH_MANIFESTS (for c-c)

Comment 3

[Axel Hecht [:Pike]]

Comment on attachment 679610 [details] [diff] [review]
Don't use BOTH_MANIFESTS

Review of attachment 679610 [details] [diff] [review]:
-----------------------------------------------------------------

Makes sense, r=me.

I was contemplating on whether we should remove BOTH_MANIFESTS support, but we need to support both manifests for test extensions at least, so there's little code removal, and we still have tests for it outside of code, so things will likely continue to work, if anyone wanted both.

This is gonna introduce a minor merge conflict with bug 796051, but that's trivial and shouldn't hold us back in either bug.

Comment 4

[Mark Banner (:standard8)]

Comment on attachment 679611 [details] [diff] [review]
Don't use BOTH_MANIFESTS (for c-c)

Looks fine to me.

Comment 5

[Mike Hommey [:glandium]]

https://hg.mozilla.org/integration/mozilla-inbound/rev/2b31de644046

Comment 6

[Ed Morley [:emorley]]

https://hg.mozilla.org/mozilla-central/rev/2b31de644046

Comment 7

[Mike Hommey [:glandium]]

https://hg.mozilla.org/comm-central/rev/32b8cd90f6bf