The default bug view has changed. See this FAQ.

Port |Bug 1155776 - move USE_EXTENSION_MANIFEST to moz.build| to comm-central

RESOLVED FIXED in Thunderbird 40.0

Status

MailNews Core
Build Config
RESOLVED FIXED
2 years ago
2 years ago

People

(Reporter: Ian Neal, Assigned: Ian Neal)

Tracking

Trunk
Thunderbird 40.0

Firefox Tracking Flags

(firefox40 affected)

Details

Attachments

(6 attachments, 1 obsolete attachment)

(Assignee)

Description

2 years ago
Bug 1155776 moved USE_EXTENSION_MANIFEST from Makefile.in to moz.build, this should be ported to fix any build issues.
(Assignee)

Comment 1

2 years ago
Created attachment 8597974 [details] [diff] [review]
Suite port [Checked in: Comment 12]
Attachment #8597974 - Flags: review?(neil)
(Assignee)

Comment 2

2 years ago
Created attachment 8597975 [details] [diff] [review]
Mail port [Checked in: Comment 10]
Attachment #8597975 - Flags: review?(Pidgeot18)
Attachment #8597975 - Flags: review?(Pidgeot18) → review+
(Assignee)

Comment 3

2 years ago
Created attachment 8598038 [details] [diff] [review]
Chatzilla Port [Checked in: Comment 8]

Additional changes are due to a mixed line ending in one of the files.
Attachment #8598038 - Flags: review?(gijskruitbosch+bugs)
(Assignee)

Comment 4

2 years ago
Created attachment 8598040 [details] [diff] [review]
DOMi port [Checked in: Comment 9]
Attachment #8598040 - Flags: review?(philip.chee)

Updated

2 years ago
Attachment #8598038 - Flags: review?(gijskruitbosch+bugs) → review+

Comment 5

2 years ago
Comment on attachment 8598040 [details] [diff] [review]
DOMi port [Checked in: Comment 9]

> diff --git a/moz.build b/moz.build
> .... 
>  JAR_MANIFESTS += ['jar.mn']
>  
> +USE_EXTENSION_MANIFEST = True
> +

r=me if you group |USE_EXTENSION_MANIFEST = True| with |NO_JS_MANIFEST = True| from:

https://bugzilla.mozilla.org/attachment.cgi?id=8597948&action=diff#a/moz.build_sec2
Attachment #8598040 - Flags: review?(philip.chee) → review+

Updated

2 years ago
Attachment #8597974 - Flags: review?(neil) → review+
(Assignee)

Comment 6

2 years ago
Created attachment 8598129 [details] [diff] [review]
Calendar port
Attachment #8598129 - Flags: review?(philipp)
(Assignee)

Comment 7

2 years ago
Created attachment 8598131 [details] [diff] [review]
Remove app-config.mk [Checked in: Comment 22]

Test of app-config.mk removal pushed to try:
https://treeherder.mozilla.org/#/jobs?repo=try-comm-central&revision=b951e389e0c3
Attachment #8598131 - Flags: review?(Pidgeot18)
Attachment #8598131 - Flags: feedback?(philipp)
(Assignee)

Comment 8

2 years ago
Comment on attachment 8598038 [details] [diff] [review]
Chatzilla Port [Checked in: Comment 8]

http://hg.mozilla.org/chatzilla/rev/ff0f7ad429c2
Attachment #8598038 - Attachment description: Chatzilla Port → Chatzilla Port [Checked in: Comment 8]
(Assignee)

Comment 9

2 years ago
Comment on attachment 8598040 [details] [diff] [review]
DOMi port [Checked in: Comment 9]

http://hg.mozilla.org/dom-inspector/rev/35e42668e631
Attachment #8598040 - Attachment description: DOMi port → DOMi port [Checked in: Comment 9]
(Assignee)

Comment 10

2 years ago
Comment on attachment 8597975 [details] [diff] [review]
Mail port [Checked in: Comment 10]

https://hg.mozilla.org/comm-central/rev/87bbec6dfdd3
Attachment #8597975 - Attachment description: Mail port → Mail port [Checked in: Comment 10]

Comment 11

2 years ago
Comment on attachment 8597974 [details] [diff] [review]
Suite port [Checked in: Comment 12]

a=me for check-in on CLOSED TREE
(Assignee)

Comment 12

2 years ago
Comment on attachment 8597974 [details] [diff] [review]
Suite port [Checked in: Comment 12]

https://hg.mozilla.org/comm-central/rev/cd75599ee28a
Attachment #8597974 - Attachment description: Suite port → Suite port [Checked in: Comment 12]
Comment on attachment 8598131 [details] [diff] [review]
Remove app-config.mk [Checked in: Comment 22]

Ok, it seems app-config.mk is not included anyway. in config.mk there is a line:


-include $(topsrcdir)/$(MOZ_BUILD_APP)/app-config.mk

But $(MOZ_BUILD_APP) is ../mail, so it looks in comm-central/../mail/app-config.mk, doesn't find it and ignores it.

That said, I think we can remove this until we find a situation where it fails. Most directories I've seen have XPI_NAME=lightning set in the generated backend.mk.
Attachment #8598131 - Flags: feedback?(philipp) → feedback+
Comment on attachment 8598129 [details] [diff] [review]
Calendar port

Would it work to just export('USE_EXTENSION_MANIFEST') in the one or other directory? If not, r=philipp
Attachment #8598129 - Flags: review?(philipp) → review+
(Assignee)

Comment 15

2 years ago
Test with export:
https://treeherder.mozilla.org/#/jobs?repo=try-comm-central&revision=aa2b2a819ef9
(Assignee)

Comment 16

2 years ago
Using the following patch - https://hg.mozilla.org/try-comm-central/rev/d1e396581f0f
Looking at the extensions directory within linux, I am not sure it is correct
https://ftp-ssl.mozilla.org/pub/mozilla.org/thunderbird/try-builds/iann_cvs@blueyonder.co.uk-aa2b2a819ef9
What do you think? I chose the moz.builds by looking where other exports are done.
Flags: needinfo?(philipp)
(Assignee)

Comment 17

2 years ago
Push to try without any exports:
https://treeherder.mozilla.org/#/jobs?repo=try-comm-central&revision=3b1b9134783f
(Assignee)

Comment 18

2 years ago
Having compared it against what was generated with no exports:
https://ftp-ssl.mozilla.org/pub/mozilla.org/thunderbird/try-builds/iann_cvs@blueyonder.co.uk-3b1b9134783f
As far as I can see it looks the same. Can you spot any differences?
(Assignee)

Comment 19

2 years ago
Created attachment 8602722 [details] [diff] [review]
Calendar port using export [Checked in: Comment 20]

This appears to do all the correct things.
Attachment #8598129 - Attachment is obsolete: true
Flags: needinfo?(philipp)
Attachment #8602722 - Flags: review?(philipp)
Attachment #8602722 - Flags: review?(philipp) → review+
(Assignee)

Comment 20

2 years ago
Comment on attachment 8602722 [details] [diff] [review]
Calendar port using export [Checked in: Comment 20]

https://hg.mozilla.org/comm-central/rev/f445e60214cc
Attachment #8602722 - Attachment description: Calendar port using export → Calendar port using export [Checked in: Comment 20]

Comment 21

2 years ago
Comment on attachment 8598131 [details] [diff] [review]
Remove app-config.mk [Checked in: Comment 22]

Since this concerns Calendar only, and Fallen is happy with it, I think the mail people should be happy with it. Let me steal this review so you can finally get this finished.
Attachment #8598131 - Flags: review?(Pidgeot18) → review+
(Assignee)

Comment 22

2 years ago
Comment on attachment 8598131 [details] [diff] [review]
Remove app-config.mk [Checked in: Comment 22]

https://hg.mozilla.org/comm-central/rev/bdb1708f8b8c
Attachment #8598131 - Attachment description: Remove app-config.mk → Remove app-config.mk [Checked in: Comment 22]
(Assignee)

Updated

2 years ago
Status: ASSIGNED → RESOLVED
Last Resolved: 2 years ago
Resolution: --- → FIXED
Target Milestone: --- → Thunderbird 40.0
You need to log in before you can comment on or make changes to this bug.