Issue 5752 - Removing safari support

releaseAutomation.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/.
 
 from __future__ import print_function
 
 import os
 import re
 import codecs
 import subprocess
 import tarfile
 import json
 
 from packager import readMetadata, getDefaultFileName
 

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

Note: Result of rebasing

 
 def get_dependencies(prefix, repos):
     from ensure_dependencies import read_deps, safe_join
     repo = repos[prefix]
     deps = read_deps(repo)
     if deps:
         for subpath in deps:
             if subpath.startswith('_'):
                 continue
             depprefix = prefix + subpath + '/'
@@ skipping 85 matching lines @@
     if repo_has_outgoing():
         return continue_with_outgoing()
     return True
 
 
 def run(baseDir, type, version, keyFile, downloadsRepo):
     if not can_safely_release(baseDir, downloadsRepo):
         print('Aborting release.')
         return 1
 
-    if type == 'safari':
-        import buildtools.packagerSafari as packager
-    elif type == 'edge':
+    if type == 'edge':
         import buildtools.packagerEdge as packager
     elif type == 'chrome':
         import buildtools.packagerChrome as packager
 
     # Replace version number in metadata file "manually", ConfigParser will mess
     # up the order of lines.
     metadata = readMetadata(baseDir, type)
     with open(metadata.option_source('general', 'version'), 'r+b') as file:
         rawMetadata = file.read()
         rawMetadata = re.sub(
@@ skipping 10 matching lines @@
 
     with open(os.path.join(locales_base, 'chrome', 'locale',
                            packager.defaultLocale.replace('_', '-'),
                            'meta.json'),
               'r') as fp:
         extensionName = json.load(fp)['name']
 
     # Now commit the change and tag it
     subprocess.check_call(['hg', 'commit', '-R', baseDir, '-m', 'Releasing %s %s' % (extensionName, version)])
     tag_name = version
-    if type in {'safari', 'edge'}:
+    if type == 'edge':
         tag_name = '{}-{}'.format(tag_name, type)
     subprocess.check_call(['hg', 'tag', '-R', baseDir, '-f', tag_name])
 
     # Create a release build
     downloads = []
     if type == 'chrome':
         # Create both signed and unsigned Chrome builds (the latter for Chrome Web Store).
         buildPath = os.path.join(downloadsRepo, getDefaultFileName(metadata, version, 'crx'))
         packager.createBuild(baseDir, type=type, outFile=buildPath, releaseBuild=True, keyFile=keyFile)
         downloads.append(buildPath)
 
         buildPathUnsigned = os.path.join(baseDir, getDefaultFileName(metadata, version, 'zip'))
         packager.createBuild(baseDir, type=type, outFile=buildPathUnsigned, releaseBuild=True, keyFile=None)
-    elif type == 'safari':
-        buildPath = os.path.join(downloadsRepo, getDefaultFileName(metadata, version, 'safariextz'))
-        packager.createBuild(baseDir, type='safari', outFile=buildPath, releaseBuild=True, keyFile=keyFile)
-        downloads.append(buildPath)
     elif type == 'edge':
         # We only offer the Edge extension for use through the Windows Store
         buildPath = os.path.join(downloadsRepo, getDefaultFileName(metadata, version, 'appx'))
         packager.createBuild(baseDir, type=type, outFile=buildPath, releaseBuild=True)
         downloads.append(buildPath)
 
     # Create source archive
     archivePath = os.path.splitext(buildPath)[0] + '-source.tgz'
     create_sourcearchive(baseDir, archivePath)
     downloads.append(archivePath)
 
     # Now add the downloads and commit
     subprocess.check_call(['hg', 'add', '-R', downloadsRepo] + downloads)
     subprocess.check_call(['hg', 'commit', '-R', downloadsRepo, '-m', 'Releasing %s %s' % (extensionName, version)])
 
     # Push all changes
     subprocess.check_call(['hg', 'push', '-R', baseDir])
     subprocess.check_call(['hg', 'push', '-R', downloadsRepo])