512490 - Remove REQUIRES from comm-central

Status: RESOLVED FIXED

(MailNews Core :: Build Config, defect)

Description

[Serge Gautherie (:sgautherie)]

Like bug 398573 comment 9.

It looks like this could be done already, but it can/could wait for c-c to branch first.

KaiRo, could you check and confirm the bug?
(Iirc, I'm thinking about some /mailnews/* build oddities, but don't think there are related, are they?)

Banjamin, if confirmed, could you "automatically" generate the patch for c-c too?

Comment 1

[Serge Gautherie (:sgautherie)]

s/Banjamin/Benjamin/

Comment 2

[Benjamin Smedberg]

Attachment: The script

Here's the script I used to automatically remove REQUIRES lines:

export PYTHONPATH=/mozilla-central/build/pymake
cd /comm-central
find . -name Makefile.in | xargs python remove-requires.py > remove-requires.patch

Comment 3

[Serge Gautherie (:sgautherie)]

Attachment: (Av1) Automatic Makefile.in + manual autoconf.mk.in

(Untested, but trivial.)

Comment 4

[Robert Kaiser]

Serge, please test this with a 1.9.1-based tree, I don't want to review something I don't know will work there, esp. as we're nearing the next round of betas for both products.

Comment 5

[Serge Gautherie (:sgautherie)]

(In reply to comment #4)

Sure, I just (wrongly) took Benjamin's confirmation of this bug as a ready to do...

I tried to build with m-1.9.1:
1- 1st failure made me file bug 512696.
2- then build failed in /mailnews/base/*.

Then I tried with m-c:
3- fails in /mailnews/base/* too.

Maybe c-c needs more of bug 496236 before doing this?

Comment 6

[Serge Gautherie (:sgautherie)]

(In reply to comment #5)
> Maybe c-c needs more of bug 496236 before doing this?

I'll try again after bug 488175 port lands.

Comment 7

[Justin Wood (:Callek)]

Attachment: Bv1 - Updated. Automatic Removes + autoconf.mk

This should do it; and should be safe to take now.

Comment 8

[Robert Kaiser]

Comment on attachment 450824 [details] [diff] [review]
Bv1 - Updated. Automatic Removes + autoconf.mk

I cannot test a successful build because static builds are broken, but as my breakage is the known one, I guess your patch is OK :)

Comment 9

[Mark Banner (:standard8)]

Comment on attachment 450824 [details] [diff] [review]
Bv1 - Updated. Automatic Removes + autoconf.mk

These files will all have empty if*def statements with this patch:

mail/components/build/Makefile.in
mailnews/base/build/Makefile.in
mailnews/build/Makefile.in
mailnews/compose/src/Makefile.in
mailnews/import/build/Makefile.in
mailnews/mime/src/Makefile.in

These files could do with extra blank lines removing after REQUIRES has been removed from ifdefs:

mailnews/addrbook/src/Makefile.in
mailnews/base/src/Makefile.in (2 places)
mailnews/build/Makefile.in

Comment 10

[Justin Wood (:Callek)]

Attachment: Cv2 - Clean some more stuff too [Checked in: Comment 12]

Porting KaiRo's r+. Requesting additional r from Mark.

Comment 11

[Mark Banner (:standard8)]

Comment on attachment 451204 [details] [diff] [review]
Cv2 - Clean some more stuff too
[Checked in: Comment 12]

That's better, thanks.

Comment 12

[Justin Wood (:Callek)]

Well accidentally pushed tonight, but o well; it had reviews:
http://hg.mozilla.org/comm-central/rev/eacc929ccc27