481703 - Use python to create pre release suffix

Status: RESOLVED FIXED

(Firefox Build System :: General, defect, P1)

Description

[Robert Strong (they/them - no direct email)]

Spinoff of bug 481680.

As bsmedberg stated, python or perl is more reliable / consistent when doing this on all platforms.

Comment 1

[Robert Strong (they/them - no direct email)]

Attachment: patch in progress (bitrotted)

The tests are there but they need some additional work / cleanup

Comment 3

[Mike Beltzner [:beltzner, not reading bugmail]]

Marking blocking as we'll need this for the next beta; alternative is to unblock on this and remember to file a blocking bug on manually overriding the OSX title change every time.

Comment 4

[Mike Beltzner [:beltzner, not reading bugmail]]

--> P1, as this bug will require the wider feedback of a beta release or is of sufficient complexity that we should be looking at it sooner, not later.

Comment 5

[Robert Strong (they/them - no direct email)]

Attachment: patch rev1 w/ tests

Benjamin, I went with something a little more complex in order to restrict creating the pre-release suffix to version strings that only contain 0-9, periods, and a single 'a' or a single 'b' since version strings can be of the format 1.1aa per
https://developer.mozilla.org/En/Toolkit_version_format

Comment 6

[Robert Strong (they/them - no direct email)]

Attachment: patch rev2 - removed redundant check and added a couple of tests

Comment 7

[Benjamin Smedberg]

Comment on attachment 367545 [details] [diff] [review]
patch rev2 - removed redundant check and added a couple of tests

>+++ b/config/printprereleasesuffix.py

>+def get_prerelease_suffix(version):        

I think this can be simpler and easier to read:

  def mfunc(m):
    return "%s %s %s" % (m.group('prefix'),
                         {'a': 'Alpha', 'b': 'Beta'}[m.group('c')],
                         m.group('suffix'))
  result, c = re.subn(r'^(?P<prefix>(\d+\.)*\d+)(?P<c>[ab])(?P<suffix>\d+)$',
                      mfunc, version)
  if c != 1:
    return ''
  return result

Comment 8

[Robert Strong (they/them - no direct email)]

Attachment: patch rev3 w/ review comments addressed

Comment 9

[Benjamin Smedberg]

Oh, it would be better to do := instead of = in the makefile, so that we only run the python script once.

Comment 10

[Robert Strong (they/them - no direct email)]

Attachment: patch as checked in

Comment 11

[Robert Strong (they/them - no direct email)]

pushed to mozilla-central
http://hg.mozilla.org/mozilla-central/rev/ae69c2f236cd

Comment 12

[Robert Strong (they/them - no direct email)]

Pushed to mozilla-1.9.1
http://hg.mozilla.org/releases/mozilla-1.9.1/rev/f72fc9fafde7