Issue 4548 - Split out Safari and add Edge release automation

packagerEdge.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 base64
 import hashlib
 import json
 import mimetypes
 import os
 import zipfile
 
 import packager
 import packagerChrome
+from packager import (readMetadata, getDefaultFileName)

[Wladimir Palant, 2016/10/22 20:12:51]

Why did you add this? I don't see these functions being called directly, only as
packager.foo (packager module already being imported above).

[kzar, 2016/10/25 07:50:51]

This change was required for `./build.py -t edge release ...` to work. See these
lines approx 58 and 105 and in releaseAutomation.py:

metadata = packager.readMetadata(baseDir, type)

buildPath = os.path.join(downloadsRepo, packager.getDefaultFileName(metadata,
version, 'appx'))

[Wladimir Palant, 2016/10/25 10:21:37]

1) Please add a comment explaining that releaseAutomation expects these
functions even though this file doesn't need them.

2) Nit: The parentheses are unnecessary.

[kzar, 2016/10/25 10:36:37]

Done.

 
 # Files and directories expected inside of the .APPX archive.
 MANIFEST = 'AppxManifest.xml'
 CONTENT_TYPES = '[Content_Types].xml'
 BLOCKMAP = 'AppxBlockMap.xml'
 EXTENSION_DIR = 'Extension'
 ASSETS_DIR = 'Assets'
 
 # Size of uncompressed block in the APPX block map.
 BLOCKSIZE = 64 * 1024
@@ skipping 62 matching lines @@
     params['version'] = pad_version(params['version'])
 
     translation = load_translation(files, defaultLocale)
     name_key = 'name' if release_build else 'name_devbuild'
     params['display_name'] = translation[name_key]['message']
     params['description'] = translation['description']['message']
 
     for size in ['44', '50', '150']:
         path = '{}/logo_{}.png'.format(ASSETS_DIR, size)
         if path not in files:
-            raise KeyError(path + 'is not found in files')
+            raise KeyError(path + ' is not found in files')
         params['logo_' + size] = path.replace('/', '\\')
 
     template = _get_template_for(MANIFEST)
     return template.render(params).encode('utf-8')
 
 
 def move_files_to_extension(files):
     """Move all files into `Extension` folder for APPX packaging."""
     # We sort the files to ensure that 'Extension/xyz' is moved before 'xyz'.
     # If 'xyz' is moved first, it would overwrite 'Extension/xyz' and its
@@ skipping 67 matching lines @@
     if metadata.has_section('appx_assets'):
         for name, path in metadata.items('appx_assets'):
             path = os.path.join(baseDir, path)
             files.read(path, '{}/{}'.format(ASSETS_DIR, name))
 
     files[MANIFEST] = create_appx_manifest(params, files, releaseBuild)
     files[BLOCKMAP] = create_appx_blockmap(files)
     files[CONTENT_TYPES] = create_content_types_map(files.keys() + [BLOCKMAP])
 
     files.zip(outfile, compression=zipfile.ZIP_STORED)