Issue 4548 - Split out Safari and add Edge release automation

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 406 matching lines @@
         stderr = process.communicate()[1]
         retcode = process.poll()
         if retcode:
             sys.stderr.write(stderr)
             raise subprocess.CalledProcessError(command, retcode)
     else:
         subprocess.check_call(command)
 
 
 def runReleaseAutomation(baseDir, scriptName, opts, args, type):
-    keyFiles = []
+    keyFile = None
     downloadsRepo = os.path.join(baseDir, '..', 'downloads')
     for option, value in opts:
         if option in ('-k', '--key'):
-            keyFiles.append(value)

[Wladimir Palant, 2016/10/20 10:03:08]

You should modify option parsing here - no point expecting multiple keys any
more. So it should be a keyFile variable and this statement should be simply
`keyFile = value` - same as in runBuild(). Consequently, below you should merely
check whether the key file was set and the code in releaseAutomation.py can be
simplified as well.

[kzar, 2016/10/20 12:09:36]

Done.

+            keyFile = value
         elif option in ('-d', '--downloads'):
             downloadsRepo = value
 
     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 == 'chrome' or type == 'safari') and len(keyFiles) != 1:

[Wladimir Palant, 2016/10/20 10:03:07]

Probably better to use `type in ('chrome', 'safari')` here.

[Sebastian Noack, 2016/10/20 10:25:26]

I agree, however, a set is even more appropriate here (than a tuple).

[kzar, 2016/10/20 12:09:36]

Done.

+    if type in {'chrome', 'safari'} and keyFile is None:
         print >>sys.stderr, 'Error: you must specify a key file for this release'
         usage(scriptName, type, 'release')
         return
 
     import buildtools.releaseAutomation as releaseAutomation
-    releaseAutomation.run(baseDir, type, version, keyFiles, downloadsRepo)
+    releaseAutomation.run(baseDir, type, version, keyFile, 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:
@@ skipping 53 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=('chrome',))

[Wladimir Palant, 2016/10/20 10:03:07]

This description needs to be updated, the note is outdated. Also, you need to
add 'safari' and 'edge' to types here.

[kzar, 2016/10/20 12:09:36]

Done.

+    command.addOption('File containing private key and certificates required to sign the release.', short='k', long='key', value='file', types=('chrome', 'safari', 'edge'))
     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', 'safari', 'edge')
 
 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 62 matching lines @@
                 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)