365342 - Sunbird branch vs. trunk require version number changes

Status: VERIFIED FIXED

(Calendar :: General, defect)

Description

[Matthew (lilmatt) Willis]

Now that we are building Sunbird on branch as well as trunk, for user clarity (as well as AUS sanity) we should increment trunk's version number forward.

In the discussions for bug 364589, both mvl and I thought 0.6a1 sounds good for trunk, and leave 0.4a1 for branch.

Comment 1

[Matthew (lilmatt) Willis]

Reversing dependencies

Comment 2

[Matthew (lilmatt) Willis]

Attachment: TRUNK ONLY - Bumps version to 0.6a1

mvl for the calendar bits, morgamic for the aus piece

Comment 3

[Michiel van Leeuwen (email: mvl+moz@)]

Comment on attachment 251399 [details] [diff] [review]
TRUNK ONLY - Bumps version to 0.6a1

r=mvl

Comment 4

[Nick Thomas [:nthomas] (UTC+12)]

For this change in mozilla/webtools/aus/xml/inc/config-dist.php

     'Sunbird'     =>  array(
-        '0.4a1'   =>  'trunk',
-        '0.5'     =>  'trunk'
+        '0.4a1'   =>  '0.5',
+        '0.5'     =>  '0.5',
+        '0.6a1'   =>  'trunk'

you'll need to change the tinder-config.pl's on the branch so that the variable $update_version is also '0.5'. Or you could change the above to 'branch', since that's already in use in the tinderbox config. (This is to make sure that update requests are mapped to the right directory in the AUS data store.)

Since this parameter is really about the branch the build is from, rather than the app version, I would suggest the second option is less likely to be superseded, and therefore better.

Comment 5

[Matthew (lilmatt) Willis]

I actually had that in there first but changed it.

Ok. I'll make a new patch for the AUS bit.


The trunk version # stuff is checked in.

Comment 6

[Matthew (lilmatt) Willis]

Attachment: AUS bit updated per cf's comments

Comment 7

[Michael Morgan [:morgamic]]

Comment on attachment 251418 [details] [diff] [review]
AUS bit updated per cf's comments

Looks good -- I can commit the change on trunk.

Comment 8

[Matthew (lilmatt) Willis]

(In reply to comment #7)
morgamic:
Is the /m/webtools piece committed (and pushed to production)?

Comment 9

[Nick Thomas [:nthomas] (UTC+12)]

Yes, bug 367804 (which is getting bug 367804 into production) was FIXED today.