Define MOZILLA_1_9_1_BRANCH based on milestone.txt, to ifdef for different mozilla-centrals

RESOLVED FIXED in Thunderbird 3.0b2

Status

RESOLVED FIXED
10 years ago
10 years ago

People

(Reporter: philor, Assigned: standard8)

Tracking

Trunk
Thunderbird 3.0b2
Bug Flags:
blocking-thunderbird3 +
in-testsuite -

Firefox Tracking Flags

(Not tracked)

Details

Attachments

(1 attachment)

(Reporter)

Description

10 years ago
We need to be able to ifdef based on whether we're building on a 1.9.1 Gecko or a 1.9.2/mozilla-central one, so we can do things differently for 1.9.1 and mozilla-central between now and when comm-central branches. Unfortunately, we can't just copy bug 324370's fix for MOZILLA_1_8_BRANCH, since there's only one comm-central configure.in.

Getting at the whole of milestone.txt is easy, MOZILLA_VERSION in configure.in already gets it, but we need some way of saying |if MOZILLA_VERSION.startswith('1.9.1')|
Flags: blocking-thunderbird3+
(Assignee)

Updated

10 years ago
Assignee: nobody → bugzilla
(Assignee)

Comment 1

10 years ago
Created attachment 351358 [details] [diff] [review]
The fix

This detects the 1.9.1 branch and sets the define accordingly. We'll need to sort out about TB/SM/SB versions at some stage, but we can do that in a different bug.
Attachment #351358 - Flags: review?(kairo)

Comment 2

10 years ago
Comment on attachment 351358 [details] [diff] [review]
The fix

I don't fully understand the changequote() stuff and this echo/sed thingy isn't too beautiful, but probably the best we can do in configure.
Attachment #351358 - Flags: review?(kairo) → review+

Comment 3

10 years ago
Comment on attachment 351358 [details] [diff] [review]
The fix

definately right...

changequote there is an autoconf thing that ensures the regex won't do silly things in the future (also note how its changed back to [ and ] after the regex)

and is probably the best we got, as we have to parse MOZILLA_VERSION well
Attachment #351358 - Flags: review+
(Assignee)

Comment 4

10 years ago
Checked in with dodgy checkin comment: http://hg.mozilla.org/comm-central/rev/ac75a8511ec8
Target Milestone: --- → Thunderbird 3.0b2
(Assignee)

Updated

10 years ago
Status: NEW → RESOLVED
Last Resolved: 10 years ago
Flags: in-testsuite-
Resolution: --- → FIXED
(In reply to comment #4)
> Checked in with dodgy checkin comment:
> http://hg.mozilla.org/comm-central/rev/ac75a8511ec8

That was a mistake, I hope?
(Assignee)

Comment 6

10 years ago
(In reply to comment #5)
> (In reply to comment #4)
> > Checked in with dodgy checkin comment:
> > http://hg.mozilla.org/comm-central/rev/ac75a8511ec8
> 
> That was a mistake, I hope?

Yes I managed to push forgetting to set the comment.
You need to log in before you can comment on or make changes to this bug.