469835 - Change version number to 3.1a1pre for Thunderbird comm-central+mozilla-central builds

Status: RESOLVED FIXED

(Thunderbird :: Build Config, defect)

Description

[Mark Banner (:standard8)]

Attachment: WIP v1

As per our discussions, we want to be able to provide nightly builds and tinderboxes for comm-central plus mozilla-central builds.

To distinguish these from comm-central plus mozilla-1.9.1 builds we want to change the version number to 3.1a1pre.

When we branch comm-central, the existing 3.0* builds will continue on the branch, and the 3.1* builds will be the new "trunk".

Attaching work in progress fix for this, hopefully this will be the final fix, but I'm still testing it.

No decisions have been made yet as to the final version number for releases of  Thunderbird after 3.0. The 3.1a1pre is just the next smallest increment post 3.0 that we can sensibly apply and allow us to distinguish the builds.

Comment 1

[Mark Banner (:standard8)]

Attachment: [checked in] The fix

I changed a couple of the comments in configure.in in this version but that's about it. Note that configure.in reads in confvars.sh which is why we can drop setting THUNDERBIRD_VERSION in that location.

I did think about improving the calendar changes somehow, but this is a one-off for a short time, so I think its ok.

Comment 2

[Philippe M. Chiasson (:gozer)]

Comment on attachment 355619 [details] [diff] [review]
[checked in] The fix

There is definitely room to clean up the duplication, but it's not a showstopper.

Comment 3

[Mark Banner (:standard8)]

Checked in: http://hg.mozilla.org/comm-central/rev/9f801d1c8b30

Comment 4

[Mark Banner (:standard8)]

Attachment: [checked in] Fix version in mozilla-central files

I've just noticed, on the ftp server (see link below) the .mar files have the wrong version, they are 3.1a1pre rather than 3.0b2pre (this is for the 1.9.1 builds). Also, if you load about: into the start page, then you get 3.1a1pre.

The problem is that confvars.sh is pulled in by the comm-central build system *and* the mozilla-central build system.

When we're in the mozilla-central build system MOZILLA_1_9_1_BRANCH is not defined for us. So its always getting version.txt rather than version-1.9.1.txt. The solution is a bit messy (but it will only be in there till we branch), but basically I've copied the configure.in logic into confvars.sh and hence we can set the version that way.

ftp://ftp.mozilla.org/pub/thunderbird/nightly/latest-comm-1.9.1/

Comment 5

[Phil Ringnalda (:philor)]

Comment on attachment 356171 [details] [diff] [review]
[checked in] Fix version in mozilla-central files

>+# Can be dropped when we branch MOZILLA_1_9_1_BRANCH

Did you mean "when we branch comm-central", or is that a convenient way to keep that string in the file, for searching purposes? r=me, either way, and yuck, can we branch now? Can we? Now?

How about now?

Comment 6

[Mark Banner (:standard8)]

(In reply to comment #5)
> (From update of attachment 356171 [details] [diff] [review])
> >+# Can be dropped when we branch MOZILLA_1_9_1_BRANCH
> 
> Did you mean "when we branch comm-central", or is that a convenient way to keep
> that string in the file, for searching purposes? 

Yep, its for searching.

> How about now?

when we get to b2 ;-)

Comment 7

[Mark Banner (:standard8)]

Comment on attachment 356171 [details] [diff] [review]
[checked in] Fix version in mozilla-central files

http://hg.mozilla.org/comm-central/rev/06c0c9b45ea2