Issue 4028 - Add support for Edge extensions to buildtools

build.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 os
 import sys
 import re
 import subprocess
 import shutil
 import buildtools
@@ skipping 160 matching lines @@
             'name': command.name,
             'params': command.params,
             'description': description,
             'options': '\n'.join(options)
         }
 
 
 def runBuild(baseDir, scriptName, opts, args, type):
     kwargs = {}
     for option, value in opts:
-        if option in ('-l', '--locales') and type == 'gecko':
+        if option in {'-l', '--locales'} and type == 'gecko':
             kwargs['locales'] = value.split(',')
-        elif option in ('-b', '--build'):
+        elif option in {'-b', '--build'}:
             kwargs['buildNum'] = value
-            if type != 'gecko' and not re.search(r'^\d+$', kwargs['buildNum']):

[Sebastian Noack, 2016/07/01 15:56:03]

I know it has been like that before, but while changing this line feel free to
get rid of the unnecessary regexp:

  kwargs['buildNum'].isdigit()

[Vasily Kuznetsov, 2016/07/01 19:51:28]

Done

+            if type != 'gecko' and not kwargs['buildNum'].isdigit():
                 raise TypeError('Build number must be numerical')
-        elif option in ('-k', '--key'):
+        elif option in {'-k', '--key'}:
             kwargs['keyFile'] = value
-        elif option in ('-m', '--multi-compartment') and type == 'gecko':
+        elif option in {'-m', '--multi-compartment'} and type == 'gecko':
             kwargs['multicompartment'] = True
-        elif option in ('-r', '--release'):
+        elif option in {'-r', '--release'}:
             kwargs['releaseBuild'] = True
     if len(args) > 0:
         kwargs['outFile'] = args[0]
 
     if type == 'gecko':
         import buildtools.packagerGecko as packager
     elif type == 'chrome':
         import buildtools.packagerChrome as packager
     elif type == 'safari':
         import buildtools.packagerSafari as packager
@@ skipping 233 matching lines @@
     if len(args) == 0:
         print 'No version number specified for the release'
         usage(scriptName, type, 'release')
         return
     version = args[0]
     if re.search(r'[^\d\.]', version):
         print 'Wrong version number format'
         usage(scriptName, type, 'release')
         return
 
-    if type == 'gecko' and len(keyFiles) == 0:
-        print >>sys.stderr, 'Warning: no key file specified, creating an unsigned release build\n'
-    elif type == 'gecko' and len(keyFiles) > 1:
-        print >>sys.stderr, 'Error: too many key files, only one required'
-        usage(scriptName, type, 'release')
-        return
-    elif type == 'chrome' and len(keyFiles) != 2:
+    if type == 'chrome' and len(keyFiles) != 2:
         print >>sys.stderr, 'Error: wrong number of key files specified, two keys (Chrome and Safari) required for the release'
         usage(scriptName, type, 'release')
         return
 
     import buildtools.releaseAutomation as releaseAutomation
     releaseAutomation.run(baseDir, type, version, keyFiles, downloadsRepo)
 
 
 def updatePSL(baseDir, scriptName, opts, args, type):
     import buildtools.publicSuffixListUpdater as publicSuffixListUpdater
     publicSuffixListUpdater.updatePSL(baseDir)
 
 with addCommand(lambda baseDir, scriptName, opts, args, type: usage(scriptName, type), ('help', '-h', '--help')) as command:
     command.shortDescription = 'Show this message'
 
 with addCommand(runBuild, 'build') as command:
     command.shortDescription = 'Create a build'
     command.description = 'Creates an extension build with given file name. If output_file is missing a default name will be chosen.'
     command.params = '[options] [output_file]'
     command.addOption('Only include the given locales (if omitted: all locales not marked as incomplete)', short='l', long='locales', value='l1,l2,l3', types=('gecko'))
     command.addOption('Use given build number (if omitted the build number will be retrieved from Mercurial)', short='b', long='build', value='num')
-    command.addOption('File containing private key and certificates required to sign the package', short='k', long='key', value='file', types=('gecko', 'chrome', 'safari'))
+    command.addOption('File containing private key and certificates required to sign the package', short='k', long='key', value='file', types=('chrome', 'safari'))
     command.addOption('Create a build for leak testing', short='m', long='multi-compartment', types=('gecko'))
     command.addOption('Create a release build', short='r', long='release')
     command.supportedTypes = ('gecko', 'chrome', 'safari', 'edge')
 
 with addCommand(runAutoInstall, 'autoinstall') as command:
     command.shortDescription = 'Install extension automatically'
     command.description = 'Will automatically install the extension in a browser running Extension Auto-Installer. If host parameter is omitted assumes that the browser runs on localhost.'
     command.params = '[<host>:]<port>'
     command.addOption('Create a build for leak testing', short='m', long='multi-compartment')
     command.supportedTypes = ('gecko')
@@ skipping 37 matching lines @@
 with addCommand(generateDocs, 'docs') as command:
     command.shortDescription = 'Generate documentation (requires node.js)'
     command.description = 'Generate documentation files and write them into the specified directory. This operation requires JsDoc 3 to be installed.'
     command.addOption('Suppress JsDoc output', short='q', long='quiet')
     command.params = '[options] <directory>'
     command.supportedTypes = ('gecko', 'chrome')
 
 with addCommand(runReleaseAutomation, 'release') as command:
     command.shortDescription = 'Run release automation'
     command.description = 'Note: If you are not the project owner then you '        "probably don't want to run this!\n\n"        'Runs release automation: creates downloads for the new version, tags '        'source code repository as well as downloads and buildtools repository.'
-    command.addOption('File containing private key and certificates required to sign the release. Note that for Chrome releases this option needs to be specified twice: first a key to sign Chrome builds, then another to sign the Safari build.', short='k', long='key', value='file', types=('gecko', 'chrome'))
+    command.addOption('File containing private key and certificates required to sign the release. Note that for Chrome releases this option needs to be specified twice: first a key to sign Chrome builds, then another to sign the Safari build.', short='k', long='key', value='file', types=('chrome',))
     command.addOption('Directory containing downloads repository (if omitted ../downloads is assumed)', short='d', long='downloads', value='dir')
     command.params = '[options] <version>'
     command.supportedTypes = ('gecko', 'chrome')
 
 with addCommand(updatePSL, 'updatepsl') as command:
     command.shortDescription = 'Updates Public Suffix List'
     command.description = 'Downloads Public Suffix List (see http://publicsuffix.org/) and generates lib/publicSuffixList.js from it.'
     command.supportedTypes = ('chrome',)
 
 
@@ skipping 47 matching lines @@
 No command given, assuming "build". For a list of commands run:
 
   %s help
 ''' % scriptName
 
     command = args[0]
     if command in commands:
         if commands[command].isSupported(type):
             try:
                 opts, args = commands[command].parseArgs(type, args[1:])
-            except GetoptError, e:
+            except GetoptError as e:
                 print str(e)
                 usage(scriptName, type, command)
                 sys.exit(2)
             for option, value in opts:
                 if option in ('-h', '--help'):
                     usage(scriptName, type, command)
                     sys.exit()
             commands[command](baseDir, scriptName, opts, args, type)
         else:
             print 'Command %s is not supported for this application type' % command
             usage(scriptName, type)
     else:
         print 'Command %s is unrecognized' % command
         usage(scriptName, type)