Closed Bug 1158774 Opened 10 years ago Closed 9 years ago

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

Categories

(MailNews Core :: Build Config, defect)

Product:
MailNews Core
Component:
Build Config
Type:
defect
Priority:
Not set
Severity:
normal

Tracking

(firefox40 affected)

Status:
RESOLVED FIXED
Milestone:
Thunderbird 40.0
Tracking Flags:
Tracking Status
firefox40 --- affected

People

(Reporter: iannbugzilla, Assigned: iannbugzilla)

References

Details

Attachments

(6 files, 1 obsolete file)

Suite port [Checked in: Comment 12]
3.09 KB, patch
neil
: review+
Details | Diff | Splinter Review
Mail port [Checked in: Comment 10]
1.24 KB, patch
jcranmer
: review+
Details | Diff | Splinter Review
Chatzilla Port [Checked in: Comment 8]
4.39 KB, patch
Gijs
: review+
Details | Diff | Splinter Review
DOMi port [Checked in: Comment 9]
1.81 KB, patch
philip.chee
: review+
Details | Diff | Splinter Review
Remove app-config.mk [Checked in: Comment 22]
1.31 KB, patch
rkent
: review+
Fallen
: feedback+
Details | Diff | Splinter Review
Calendar port using export [Checked in: Comment 20]
8.03 KB, patch
Fallen
: review+
Details | Diff | Splinter Review
Bug 1155776 moved USE_EXTENSION_MANIFEST from Makefile.in to moz.build, this should be ported to fix any build issues.
Attachment #8597974 - Flags: review?(neil)
Attachment #8597975 - Flags: review?(Pidgeot18)
Attachment #8597975 - Flags: review?(Pidgeot18) → review+
Additional changes are due to a mixed line ending in one of the files.
Attachment #8598038 - Flags: review?(gijskruitbosch+bugs)
Attachment #8598040 - Flags: review?(philip.chee)
Attachment #8598038 - Flags: review?(gijskruitbosch+bugs) → review+
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+
Attachment #8597974 - Flags: review?(neil) → review+
Attached patch Calendar port (obsolete) — — Splinter Review
Attachment #8598129 - Flags: review?(philipp)
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)
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]
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]
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 on attachment 8597974 [details] [diff] [review] Suite port [Checked in: Comment 12] a=me for check-in on CLOSED TREE
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+
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)
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?
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+
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 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+
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]
Status: ASSIGNED → RESOLVED
Closed: 9 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.

Attachment

General

Creator:
Created:
Updated:
Size: