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

Status: RESOLVED FIXED

(MailNews Core :: Build Config, defect)

Description

[Mike Hommey [:glandium]]

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@)

Comment 1

[Mark Banner (:standard8)]

Attachment: [checked in] Fix a few broken relativesrcdir

Comment 2

[Mark Banner (:standard8)]

Attachment: [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.

Comment 3

[Mark Banner (:standard8)]

(this also succeeded on try server https://tbpl.mozilla.org/?tree=Thunderbird-Try&rev=47ad53987ac0)

Comment 4

[Robert Kaiser]

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.

Comment 5

[Mark Banner (:standard8)]

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

https://hg.mozilla.org/comm-central/rev/d6fadf84d78e

Comment 6

[Mark Banner (:standard8)]

Attachment: [checked in] Port bug 763987 - normalise autoconf.mk.in

This ports bug 763987, which normalises autoconf.mk.in ready for the next patch.

Comment 7

[Mark Banner (:standard8)]

Attachment: [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

Comment 8

[Mike Hommey [:glandium]]

(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.

Comment 9

[Robert Kaiser]

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.

Comment 10

[Serge Gautherie (:sgautherie)]

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

Comment 11

[Serge Gautherie (:sgautherie)]

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

http://hg.mozilla.org/comm-central/rev/00c391e2f48c

Comment 12

[Serge Gautherie (:sgautherie)]

Comment on attachment 652556 [details] [diff] [review]
[checked in] Port bug 742795 - autogenerate autoconf.mk

http://hg.mozilla.org/comm-central/rev/3b75111da3ba