Issue 4548 - Split out Safari and add Edge release automation

releaseAutomation.py

Index: releaseAutomation.py
diff --git a/releaseAutomation.py b/releaseAutomation.py
index 8625a3e802a3589f53a563a3dd720b7a658aa15b..5dbcd662d923a762be6242bc5952ac440d82f5d8 100644
--- a/releaseAutomation.py
+++ b/releaseAutomation.py
@@ -46,6 +46,10 @@ def create_sourcearchive(repo, output):
 def run(baseDir, type, version, keyFiles, downloadsRepo):
     if type == 'gecko':
         import buildtools.packagerGecko as packager
+    elif type == 'safari':
+        import buildtools.packagerSafari as packager
+    elif type == 'edge':
+        import buildtools.packagerEdge as packager
     elif type == 'chrome':
         import buildtools.packagerChrome as packager
 
@@ -87,8 +91,7 @@ def run(baseDir, type, version, keyFiles, downloadsRepo):
         packager.createBuild(baseDir, type=type, outFile=buildPath, releaseBuild=True, keyFile=keyFile)
         downloads.append(buildPath)
     elif type == 'chrome':
-        # We actually have to create three different builds: signed and unsigned
-        # Chrome builds (the latter for Chrome Web Store), and a signed Safari build.
+        # Create both signed and unsigned Chrome builds (the latter for Chrome Web Store).
         metadata = packager.readMetadata(baseDir, type)
         buildPath = os.path.join(downloadsRepo, packager.getDefaultFileName(metadata, version, 'crx'))
         packager.createBuild(baseDir, type=type, outFile=buildPath, releaseBuild=True, keyFile=keyFiles[0])
@@ -96,12 +99,17 @@ def run(baseDir, type, version, keyFiles, downloadsRepo):
 
         buildPathUnsigned = os.path.join(baseDir, packager.getDefaultFileName(metadata, version, 'zip'))
         packager.createBuild(baseDir, type=type, outFile=buildPathUnsigned, releaseBuild=True, keyFile=None)
+    elif type == 'safari':
+        metadata = packager.readMetadata(baseDir, type)
+        buildPath = os.path.join(downloadsRepo, packager.getDefaultFileName(metadata, version, 'safariextz'))
+        packager.createBuild(baseDir, type='safari', outFile=buildPath, releaseBuild=True, keyFile=keyFiles[0])
+        downloads.append(buildPath)
+    elif type == 'edge':
+        # We only offer the Edge extension for use through the Windows Store
+        metadata = packager.readMetadata(baseDir, type)
+        buildPath = os.path.join(downloadsRepo, packager.getDefaultFileName(metadata, version, 'zip'))
+        packager.createBuild(baseDir, type=type, outFile=buildPathUnsigned, releaseBuild=True, keyFile=None)
 
-        import buildtools.packagerSafari as packagerSafari
-        metadataSafari = packagerSafari.readMetadata(baseDir, 'safari')
-        buildPathSafari = os.path.join(downloadsRepo, packagerSafari.getDefaultFileName(metadataSafari, version, 'safariextz'))
-        packagerSafari.createBuild(baseDir, type='safari', outFile=buildPathSafari, releaseBuild=True, keyFile=keyFiles[1])
-        downloads.append(buildPathSafari)
 
     # Create source archive
     archivePath = os.path.splitext(buildPath)[0] + '-source.tgz'