1582976 - Use version_display.txt in SeaMonkey

Status: RESOLVED FIXED

(SeaMonkey :: Build Config, enhancement)

Description

[Frank-Rainer Grahl (:frg)]

We are using only version.txt currently which makes it impossible to add version specific information whithout altering the ua.

Comment 1

[Frank-Rainer Grahl (:frg)]

Attachment: 1582976-versiondisplay.patch

Let me know what you think about it.

Comment 2

[Ian Neal]

Comment on attachment 9094408 [details] [diff] [review]
1582976-versiondisplay.patch

Review of attachment 9094408 [details] [diff] [review]:
-----------------------------------------------------------------

Seems okay to me

Comment 3

[Frank-Rainer Grahl (:frg)]

Attachment: 1582976-versiondisplay-cc.patch

Patch for comm-central.

Check for version_display.txt is already in suite/moz.configure.

Comment 4

[Frank-Rainer Grahl (:frg)]

Attachment: 1582976-versiondisplay-257.patch

2.57 version

Comment 5

[Frank-Rainer Grahl (:frg)]

Attachment: 1582976-versiondisplay-2531.patch

2.53.1 version

Comment 6

[Ian Neal]

Comment on attachment 9097200 [details] [diff] [review]
1582976-versiondisplay-cc.patch

r=me

Comment 7

[Ian Neal]

Comment on attachment 9097201 [details] [diff] [review]
1582976-versiondisplay-257.patch

r/a=me

Comment 8

[Ian Neal]

Comment on attachment 9097202 [details] [diff] [review]
1582976-versiondisplay-2531.patch

[Triage Comment]
r/a=me

Comment 9

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/comm-central/rev/8cb2fc11db8b
Use version_display.txt in SeaMonkey about page. r=IanN

Comment 10

[Frank-Rainer Grahl (:frg)]

https://hg.mozilla.org/releases/comm-esr60/rev/1562bf096151922a86b717c6883c3ab7fa2efee6

Comment 11

[Frank-Rainer Grahl (:frg)]

Patrick,

could you add the new suite/config/version_display.txt to the procedure for merge day changes. Same procedure as for TB I think.
If you need it in the comm-beta and comm-release tree now let me know and I will push the change to all of them.

Comment 12

[Patrick Cloke [:clokep]]

(In reply to Frank-Rainer Grahl (:frg) from comment #11)

Patrick,

could you add the new suite/config/version_display.txt to the procedure for merge day changes. Same procedure as for TB I think.
If you need it in the comm-beta and comm-release tree now let me know and I will push the change to all of them.

Done: https://hg.mozilla.org/users/bugzilla_standard8.plus.com/drivertools/rev/dd8da8b3f9078b145816a23a75e609ae174bd908

This follows the same guidelines as Thunderbird, so for example during the next merge:

• c-c -> c-b: version goes from 2.68a1 to 2.68; version_display goes from 2.68a1 to 2.68b1
• c-b -> c-r: version_display goes from 2.68b1 to 2.68
• c-c version bump: version goes from 2.68a1 to 2.69a1; version_display gets overwritten to 2.69a1

Hope that makes sense! It is easy to tweak in the future if necessary!

Comment 13

[Frank-Rainer Grahl (:frg)]

Comment on attachment 9097200 [details] [diff] [review]
1582976-versiondisplay-cc.patch

Thanks Patrick this is fine. Pushed to beta and release so it does not break. Seems only to be needed on beta but better safe than sorry.

https://hg.mozilla.org/releases/comm-release/rev/f9f5981ef6cea7d98757624c384d8bf08b1fb227
https://hg.mozilla.org/releases/comm-beta/rev/a737934eee3752699321b3b010a61ceefd4f0b6d

Comment 14

[Patrick Cloke [:clokep]]

I just wanted to note that we went through merges today with these changes. I verified the best that I could that nothing crazy happened, but please let me know if something unwanted happened (or if something was missing)!

Some commits of note:

• https://hg.mozilla.org/comm-central/rev/cb809601c228d5e2d19da3195d92de6cbbcb3990
• https://hg.mozilla.org/releases/comm-beta/rev/67169a45614459f525f9e2ed1e97583f6a639ba7 (note that this has a bunch of other changes in it for mail, e.g. the changes to preferences and mozconfigs, we can do the same for suite if you'd like)
• https://hg.mozilla.org/releases/comm-release/rev/9bb7406580cddeb1bfde288ce6921dd7019f6315 (this had nothing for suite in it, weirdly, I think this was due to the way previous manual fixes were done, I think this will be "fine" next merge)

Comment 15

[Frank-Rainer Grahl (:frg)]

The new comm-beta files are fine. Maybe because the previous version_display.txt in beta missed the b1. Thanks for checking it and no big deal. Will monitor it the next time.