Issue 5996 - Release consistent versions across WebExtensions

packagerChrome.py

 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 import errno
 import glob
 import io
 import json
 import os
 import re
 import struct
 import subprocess
 import sys
 import random
 import posixpath
 
 from packager import (readMetadata, getDefaultFileName, getBuildVersion,
-                      getTemplate, Files)
+                      getTemplate, get_extension, Files)
 
 defaultLocale = 'en_US'
 
 
 def getIgnoredFiles(params):
     return {'store.description'}
 
 
 def getPackageFiles(params):
     result = {'_locales', 'icons', 'jquery-ui', 'lib', 'skin', 'ui', 'ext'}
@@ skipping 319 matching lines @@
         files['qunit/index.html'] = createScriptPage(
             params, 'testIndex.html.tmpl', ('general', 'testScripts')
         )
 
 
 def createBuild(baseDir, type='chrome', outFile=None, buildNum=None, releaseBuild=False, keyFile=None, devenv=False):
     metadata = readMetadata(baseDir, type)
     version = getBuildVersion(baseDir, metadata, releaseBuild, buildNum)
 
     if outFile == None:
-        if type == 'gecko':
-            file_extension = 'xpi'
-        else:
-            file_extension = 'crx' if keyFile else 'zip'
+        file_extension = get_extension(type, keyFile is not None)
         outFile = getDefaultFileName(metadata, version, file_extension)
 
     params = {
         'type': type,
         'baseDir': baseDir,
         'releaseBuild': releaseBuild,
         'version': version,
         'devenv': devenv,
         'metadata': metadata,
     }
@@ skipping 25 matching lines @@
     if devenv:
         add_devenv_requirements(files, metadata, params)
 
     zipdata = files.zipToString()
     signature = None
     pubkey = None
     if keyFile != None:
         signature = signBinary(zipdata, keyFile)
         pubkey = getPublicKey(keyFile)
     writePackage(outFile, pubkey, signature, zipdata)