Issue 5752 - Removing safari support

build.py

 # This Source Code Form is subject to the terms of the Mozilla Public

[tlucas, 2017/10/04 12:04:11]

Note: All changes are the result of rebasing

 # 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
 from getopt import getopt, GetoptError
 from StringIO import StringIO
 from zipfile import ZipFile
 
-knownTypes = ('gecko-webext', 'chrome', 'safari', 'generic', 'edge')
+knownTypes = ('gecko-webext', 'chrome', 'generic', 'edge')
 
 
 class Command(object):
     name = property(lambda self: self._name)
     shortDescription = property(
         lambda self: self._shortDescription,
         lambda self, value: self.__dict__.update({'_shortDescription': value})
     )
     description = property(
         lambda self: self._description,
@@ skipping 158 matching lines @@
                 raise TypeError('Build number must be numerical')
         elif option in {'-k', '--key'}:
             kwargs['keyFile'] = value
         elif option in {'-r', '--release'}:
             kwargs['releaseBuild'] = True
     if len(args) > 0:
         kwargs['outFile'] = args[0]
 
     if type in {'chrome', 'gecko-webext'}:
         import buildtools.packagerChrome as packager
-    elif type == 'safari':
-        import buildtools.packagerSafari as packager
     elif type == 'edge':
         import buildtools.packagerEdge as packager
 
     packager.createBuild(baseDir, type=type, **kwargs)
 
 
 def createDevEnv(baseDir, scriptName, opts, args, type):
-    if type == 'safari':
-        import buildtools.packagerSafari as packager
-    else:
-        import buildtools.packagerChrome as packager
+    import buildtools.packagerChrome as packager
 
     file = StringIO()
     packager.createBuild(baseDir, type=type, outFile=file, devenv=True, releaseBuild=True)
 
     from buildtools.packager import getDevEnvPath
     devenv_dir = getDevEnvPath(baseDir, type)
 
     shutil.rmtree(devenv_dir, ignore_errors=True)
 
     file.seek(0)
@@ skipping 147 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 in {'chrome', 'safari'} and keyFile is None:
+    if type == 'chrome' 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, 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:
     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('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=('chrome', 'safari'))
+    command.addOption('File containing private key and certificates required to sign the package', short='k', long='key', value='file', types=('chrome'))

[Vasily Kuznetsov, 2017/10/05 20:45:18]

Here `types` was a tuple and now became a string. If this is intended, you don't
need the parentheses, otherwise you need a comma before the closing parentheses.

[tlucas, 2017/10/06 09:21:54]

Done.

     command.addOption('Create a release build', short='r', long='release')
-    command.supportedTypes = ('gecko-webext', 'chrome', 'safari', 'edge')
+    command.supportedTypes = ('gecko-webext', 'chrome', 'edge')
 
 with addCommand(createDevEnv, 'devenv') as command:
     command.shortDescription = 'Set up a development environment'
     command.description = 'Will set up or update the devenv folder as an unpacked extension folder for development.'
-    command.supportedTypes = ('gecko-webext', 'chrome', 'safari')
+    command.supportedTypes = ('gecko-webext', 'chrome')
 
 with addCommand(setupTranslations, 'setuptrans') as command:
     command.shortDescription = 'Sets up translation languages'
     command.description = 'Sets up translation languages for the project on crowdin.net.'
     command.params = '[options] project-key'
     command.supportedTypes = ('chrome', 'generic')
 
 with addCommand(updateTranslationMaster, 'translate') as command:
     command.shortDescription = 'Updates translation master files'
     command.description = 'Updates the translation master files in the project on crowdin.net.'
@@ skipping 16 matching lines @@
     command.shortDescription = 'Generate documentation (requires node.js)'
     command.description = ('Generate documentation files and write them into '
                            'the specified directory.')
     command.addOption('Suppress JsDoc output', short='q', long='quiet')
     command.params = '[options] <directory>'
     command.supportedTypes = ('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.', short='k', long='key', value='file', types=('chrome', 'safari', 'edge'))
+    command.addOption('File containing private key and certificates required to sign the release.', short='k', long='key', value='file', types=('chrome', 'edge'))
     command.addOption('Directory containing downloads repository (if omitted ../downloads is assumed)', short='d', long='downloads', value='dir')
     command.params = '[options] <version>'
-    command.supportedTypes = ('chrome', 'safari', 'edge')
+    command.supportedTypes = ('chrome', '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',)
 
 
 def getType(baseDir, scriptName, args):
     # Look for an explicit type parameter (has to be the first parameter)
     if len(args) >= 2 and args[0] == '-t':
@@ skipping 59 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)