Issue 6291 - add ManifoldJS packaging for Edge

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 os
 import shutil
 from StringIO import StringIO
 import subprocess
 import tempfile
 from xml.etree import ElementTree
@@ skipping 13 matching lines @@
 
 
 def register_xml_namespaces(manifest_path):
     """Register namespaces of the given file, in order to preserve defaults."""
     with open(manifest_path, 'r') as fp:
         ns = dict([node for _, node in ElementTree.iterparse(
             fp, events=['start-ns'])])
     for prefix, uri in ns.items():
         ElementTree.register_namespace(prefix, uri)
 
+    # Make the default namespace available in an xpath expression
+    ns['_d'] = ns['']
+
     return ns
 
 
 def update_appx_manifest(manifest_path, base_dir, files, metadata,
                          release_build):
     namespaces = register_xml_namespaces(manifest_path)
 
-    def traverse(current_elem, overwrite):
-        if isinstance(overwrite, dict):
-            for key, value in overwrite.items():
-                if isinstance(key, tuple):
-                    prefix, element = key
-                    next_elem = current_elem.find(
-                        '{{{}}}{}'.format(namespaces[prefix], element))
-                    traverse(next_elem, value)
-                else:
-                    current_elem.attrib.update(overwrite)
-        else:
-            current_elem.text = overwrite
-
     v_min, v_max = metadata.get('compat', 'windows').split('/')
 
     filenames = []
-    if metadata.has_section('appx_assets'):

[Sebastian Noack, 2018/07/25 19:18:41]

This check seems redundant as we fail anyway below where we try to access
assets[...] if the appx_assets section doesn't exist.

[tlucas, 2018/08/08 09:35:55]

Done.

-        for name, path in metadata.items('appx_assets'):
-            path = os.path.join(base_dir, path)
-            icon_path = '{}/{}'.format(ASSETS_DIR, name)
 
-            files.read(path, icon_path)
-            filenames.append(icon_path)
+    for name, path in metadata.items('appx_assets'):
+        path = os.path.join(base_dir, path)
+        icon_path = '{}/{}'.format(ASSETS_DIR, name)
+
+        files.read(path, icon_path)
+        filenames.append(icon_path)
 
     assets = packagerChrome.makeIcons(files, filenames)
 
-    overwrite = {
-        ('', 'Identity'): {
-            'Name': packager.get_app_id(release_build, metadata),
-            'Publisher': metadata.get('general', 'publisher_id'),
-        },
-        ('', 'Properties'): {
-            ('', 'PublisherDisplayName'): metadata.get('general', 'author'),
-            ('', 'Logo'): assets[50],
-        },
-        ('', 'Dependencies'): {
-            ('', 'TargetDeviceFamily'): {
-                'MaxVersionTested': v_max,
-                'MinVersion': v_min,
-            },
-        },
-        ('', 'Applications'): {
-            ('', 'Application'): {
-                ('uap', 'VisualElements'): {
-                    'Square150x150Logo': assets[150],
-                    'Square44x44Logo': assets[44],
-                },
-            },
-        },
-    }
+    author = metadata.get('general', 'author')
+
+    overrides = [
+        ('_d:Identity', None, [
+            ('Name', packager.get_app_id(release_build, metadata)),
+            ('Publisher', metadata.get('general', 'publisher_id')),
+        ]),
+        ('_d:Properties/_d:PublisherDisplayName', author, []),
+        ('_d:Properties/_d:Logo', assets[50], []),
+        ('_d:Dependencies/_d:TargetDeviceFamily', None, [
+            ('MaxVersionTested', v_max),
+            ('MinVersion', v_min),
+        ]),
+        ('_d:Applications/_d:Application/uap:VisualElements', None, [
+            ('Square150x150Logo', assets[150]),
+            ('Square44x44Logo', assets[44]),
+        ]),
+    ]
 
     tree = ElementTree.parse(manifest_path)
     root = tree.getroot()
 
-    traverse(root, overwrite)
+    for xpath, text, attributes in overrides:
+        element = root.find(xpath, namespaces)
+        if text:
+            element.text = text
+        for attr, value in attributes:
+                element.set(attr, value)
 
     tree.write(manifest_path, encoding='utf-8', xml_declaration=True)
 
 
 def createBuild(baseDir, type='edge', outFile=None,  # noqa: preserve API.
                 buildNum=None, releaseBuild=False, keyFile=None,
                 devenv=False):
 
     metadata = packager.readMetadata(baseDir, type)
     version = packager.getBuildVersion(baseDir, metadata, releaseBuild,
@@ skipping 82 matching lines @@
         cmd = ['npm', 'run', '--silent', 'package-edge']
 
         subprocess.check_call(cmd, env=cmd_env, cwd=os.path.dirname(__file__))
 
         package = os.path.join(manifold_folder, 'package',
                                'edgeExtension.appx')
 
         shutil.copyfile(package, outfile)
     finally:
         shutil.rmtree(tmp_dir, ignore_errors=True)