Port bug 774032 (bonus only), bug 763987, bug 742795 to comm-central

RESOLVED FIXED in Thunderbird 17.0

Status

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

People

(Reporter: glandium, Assigned: standard8)

Tracking

(Blocks: 1 bug)

unspecified
Thunderbird 17.0
Bug Flags:
in-testsuite -

Firefox Tracking Flags

(Not tracked)

Details

Attachments

(4 attachments)

(Reporter)

Description

5 years ago
Bug 774032 was dealt with in bug 780357, but the bonus part was left out. There's a script in bug 774032 to do the automatic conversion, it should work on c-c.

Bug 763987 is preparation for bug 742795 (ensuring all autoconf.mk.in entries are in the form VAR = @VAR@)
Created attachment 652524 [details] [diff] [review]
[checked in] Fix a few broken relativesrcdir
Assignee: nobody → mbanner
Status: NEW → ASSIGNED
Attachment #652524 - Flags: review?(bugspam.Callek)
Created attachment 652525 [details] [diff] [review]
[checked in] Bonus Port - Use @DEPTH@ and @relativesrcdir@ in Makefile.in

This is generated from a straight re-use of the script in attachment 649020 [details] used on bug 774032.

The huge benefit of this is that we no longer need to do DEPTH adjustments if we move the makefile level in the tree, hence reducing some of the work needed for bug 648979.
Attachment #652525 - Flags: review?(bugspam.Callek)
(this also succeeded on try server https://tbpl.mozilla.org/?tree=Thunderbird-Try&rev=47ad53987ac0)

Comment 4

5 years ago
Comment on attachment 652524 [details] [diff] [review]
[checked in] Fix a few broken relativesrcdir

Snatching that review away from Callek as I happened to take a look and it's trivial.
Attachment #652524 - Flags: review?(bugspam.Callek) → review+
Comment on attachment 652524 [details] [diff] [review]
[checked in] Fix a few broken relativesrcdir

https://hg.mozilla.org/comm-central/rev/d6fadf84d78e
Attachment #652524 - Attachment description: Fix a few broken relativesrcdir → [checked in] Fix a few broken relativesrcdir
Blocks: 648979
Created attachment 652555 [details] [diff] [review]
[checked in] Port bug 763987 - normalise autoconf.mk.in

This ports bug 763987, which normalises autoconf.mk.in ready for the next patch.
Attachment #652555 - Flags: review?(bugspam.Callek)
Created attachment 652556 [details] [diff] [review]
[checked in] Port bug 742795 - autogenerate autoconf.mk

This is the final simple replacement of all the autoconf vars with a simple variable expansion, porting bug 742795.

Try server results including all the patches will appear here:

https://tbpl.mozilla.org/?tree=Thunderbird-Try&rev=14102903dd14
Attachment #652556 - Flags: review?(bugspam.Callek)
(Reporter)

Comment 8

5 years ago
(In reply to Mark Banner (:standard8) from comment #2)
> Created attachment 652525 [details] [diff] [review]
> Bonus Port - Use @DEPTH@ and @relativesrcdir@ in Makefile.in
> 
> This is generated from a straight re-use of the script in attachment 649020 [details]
> [details] used on bug 774032.
> 
> The huge benefit of this is that we no longer need to do DEPTH adjustments
> if we move the makefile level in the tree, hence reducing some of the work
> needed for bug 648979.

You may want to change the xpfe/components/autocomplete makefiles, too.

Updated

5 years ago
Attachment #652525 - Flags: review?(bugspam.Callek) → review+

Comment 9

5 years ago
Comment on attachment 652555 [details] [diff] [review]
[checked in] Port bug 763987 - normalise autoconf.mk.in

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

I didn't spot obvious errors but also didn't really compare everything in-detail with m-c, so I trust you did the right thing in general and those things are needed that way.
Attachment #652555 - Flags: review?(bugspam.Callek) → review+

Updated

5 years ago
Attachment #652556 - Flags: review?(bugspam.Callek) → review+
Attachment #652524 - Attachment description: [checked in] Fix a few broken relativesrcdir → Fix a few broken relativesrcdir [Checked in: Comment 5]
Comment on attachment 652525 [details] [diff] [review]
[checked in] Bonus Port - Use @DEPTH@ and @relativesrcdir@ in Makefile.in

http://hg.mozilla.org/comm-central/rev/6ce4c3cdaf3c
Attachment #652525 - Attachment description: Bonus Port - Use @DEPTH@ and @relativesrcdir@ in Makefile.in → Bonus Port - Use @DEPTH@ and @relativesrcdir@ in Makefile.in [Checked in: Comment 10]
Comment on attachment 652555 [details] [diff] [review]
[checked in] Port bug 763987 - normalise autoconf.mk.in

http://hg.mozilla.org/comm-central/rev/00c391e2f48c
Attachment #652555 - Attachment description: Port bug 763987 - normalise autoconf.mk.in → Port bug 763987 - normalise autoconf.mk.in [Checked in: Comment 11]
Comment on attachment 652556 [details] [diff] [review]
[checked in] Port bug 742795 - autogenerate autoconf.mk

http://hg.mozilla.org/comm-central/rev/3b75111da3ba
Attachment #652556 - Attachment description: Port bug 742795 - autogenerate autoconf.mk → Port bug 742795 - autogenerate autoconf.mk [Checked in: Comment 12]
Attachment #652524 - Attachment description: Fix a few broken relativesrcdir [Checked in: Comment 5] → [checked in] Fix a few broken relativesrcdir
Attachment #652525 - Attachment description: Bonus Port - Use @DEPTH@ and @relativesrcdir@ in Makefile.in [Checked in: Comment 10] → [checked in] Bonus Port - Use @DEPTH@ and @relativesrcdir@ in Makefile.in
Attachment #652555 - Attachment description: Port bug 763987 - normalise autoconf.mk.in [Checked in: Comment 11] → [checked in] Port bug 763987 - normalise autoconf.mk.in
Attachment #652556 - Attachment description: Port bug 742795 - autogenerate autoconf.mk [Checked in: Comment 12] → [checked in] Port bug 742795 - autogenerate autoconf.mk
Status: ASSIGNED → RESOLVED
Last Resolved: 5 years ago
Flags: in-testsuite-
Resolution: --- → FIXED
Target Milestone: --- → Thunderbird 17.0
You need to log in before you can comment on or make changes to this bug.