481374 - Simplify / automate the addition of the pre-release suffix string (e.g. Alpha 1, Beta 2, etc.) - Port bug 468197 to TB

Status: RESOLVED FIXED

(Thunderbird :: Build Config, defect, P2)

Description

[Mark Banner (:standard8)]

Firefox did some changes to their build config in bug 468197 to simplify release changes, it also simplifies some of the logic that's happening in the background as well.

As Thunderbird does pretty much the same things, I think we should port their code. Doesn't block TB 3 as what we have will work at the moment, but wanted because it will help our processes (and less to worry about missing).

gozer - fancy taking a shot at this sometime?

Comment 1

[Philippe M. Chiasson (:gozer)]

Turns out the Make/sed approach was dropped in favor of Python in bug 481703. I'll be porting *that* over shortly.

Comment 2

[Philippe M. Chiasson (:gozer)]

Attachment: Ported over the logic WIP v1

I've ported over the logic, and I can build it just fine. Somehow, however, I can't quite get the title to ever reflect the version.

(Note, this patch includes modified version.txt version-191.txt so it's testable)

Comment 3

[Philippe M. Chiasson (:gozer)]

Attachment: Ported over the logic WIP v2

This patch actually works correctly now. Running a beta/alpha versionned build correctly adds the right label to the window title.

The only thing left, is bug 502389, so for this patch, I've just disabled the setting of window.title in mail/base/content/tabmail.xml.

Comment 4

[Philippe M. Chiasson (:gozer)]

Attachment: Ported over the logic WIP v3

v2 was missing a little bit of autoconf/make foo, fixed.

Comment 5

[Philippe M. Chiasson (:gozer)]

Hrm, now that bug 502389 is closed, this works without touching tabmail.xml, but something is off. On linux, the title I get is:

- 3.0 Beta 3Shredder

Comment 6

[Philippe M. Chiasson (:gozer)]

Attachment: Ported over the logic WIP v4

With this patch, I believe the porting over is complete. Needs testing on Win32, as I haven't tested that flavor yet. Otherwise, should be complete.

Comment 7

[Philippe M. Chiasson (:gozer)]

Attachment: Ported over the logic v5

This new patch should now be complete, including Windows installer files.

Not tested on Windows yet, however.

Comment 8

[Mark Banner (:standard8)]

Attachment: Ported over the logic v5a

Minor change - a change (MOZ_APP_VERSION -> APP_VERSION) and a few removals had been missed from the port and were messing up the installer.

My local build passed, but I've just thrown the updated patch at the try server anyway to double check.

Comment 9

[Mark Banner (:standard8)]

Attachment: Ported over the logic v5b

Minor correction to the v5a - remove the version change I didn't mean to include.

Otherwise this now works great, r=Standard8

Comment 10

[Mark Banner (:standard8)]

Checked in: http://hg.mozilla.org/comm-central/rev/5037fd3fea18

Just thinking it may be a good idea to have a litmus test or some other QA check that the "xxx alpha/beta n" string is in place on Windows & Linux when we do alpha & beta releases and not others (also on window we change the installation directory).

Comment 11

[Ludovic Hirlimann [:Usul]]

(In reply to comment #10)
> Checked in: http://hg.mozilla.org/comm-central/rev/5037fd3fea18
> 
> Just thinking it may be a good idea to have a litmus test or some other QA
> check that the "xxx alpha/beta n" string is in place on Windows & Linux when we
> do alpha & beta releases and not others (also on window we change the
> installation directory).

I think this belongs to a check list. There is no way to distinguish what you are testing in Litmus (alpha, release, etc ....)

Comment 12

[Mark Banner (:standard8)]

(In reply to comment #11)
> I think this belongs to a check list. There is no way to distinguish what you
> are testing in Litmus (alpha, release, etc ....)

Ok, I've added it to: https://wiki.mozilla.org/Releases/Thunderbird_3.0b4#QA_of_Builds