650227 - Adapt comm-central build configuration for building Miramar builds off of comm-central and mozilla-aurora

Status: RESOLVED FIXED

(MailNews Core :: Build Config, defect)

Description

[Mark Banner (:standard8)]

I want to get Miramar builds moved onto the version of gecko that we're actually going to be shipping from.

I believe that with some build config changes we can do this without affecting SeaMonkey builds (and we can remove the gecko 2.0 specific stuff once SeaMonkey branches).

I'll be doing a patch for this in a bit.

Comment 1

[Mark Banner (:standard8)]

Attachment: The fix

This fixes it for Thunderbird only, but SeaMonkey can pick it up when ready (if needed).

I'll take the review of whoever gets there first as I'm hoping to land this today if possible.

Comment 2

[Mark Banner (:standard8)]

Checked in: http://hg.mozilla.org/comm-central/rev/109f6f7db7fb

Comment 3

[Serge Gautherie (:sgautherie)]

Comment on attachment 526220 [details] [diff] [review]
The fix

> ifdef MOZILLA_2_0_BRANCH
> THUNDERBIRD_VERSION := $(shell cat $(topsrcdir)/mail/config/version-20.txt)

Nit: you should remove this obsoleted lone too. (3 times)

> SEAMONKEY_VERSION := $(shell cat $(topsrcdir)/suite/config/version-20.txt)
>+elif defined(MOZILLA_5_0_BRANCH)
>+THUNDERBIRD_VERSION := $(shell cat $(topsrcdir)/mail/config/version-50.txt)

Comment 4

[Mark Banner (:standard8)]

(In reply to comment #3)
> Comment on attachment 526220 [details] [diff] [review]
> The fix
> 
> > ifdef MOZILLA_2_0_BRANCH
> > THUNDERBIRD_VERSION := $(shell cat $(topsrcdir)/mail/config/version-20.txt)
> 
> Nit: you should remove this obsoleted lone too. (3 times)

No point. It doesn't hurt anything and we can just do it all in one block when we remove MOZILLA_2_0_BRANCH.

Comment 5

[Stefan Sitter [:ssitter]]

This seem to have regressed Lightning Bug 651196.