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 36 matching lines @@
 
     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 = (
-        ('_d:Identity', [
+    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', metadata.get('general',
-                                                               'author')),
-        ('_d:Properties/_d:Logo', assets[50]),
-        ('_d:Dependencies/_d:TargetDeviceFamily', [
+        ('_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', [
+        ('_d:Applications/_d:Application/uap:VisualElements', None, [
             ('Square150x150Logo', assets[150]),
             ('Square44x44Logo', assets[44]),
         ]),
-    )

[Sebastian Noack, 2018/08/08 19:19:04]

I didn't notice before that sometimes you update the text content instead of the
attributes. In that case I'd like to suggest a more homogeneous data structure:

  overrides = [
      (xpath, text_or_None, attributes),
      ...
  ]

This makes the logic below slightly simpler and cleaner since you can get rid of
the type check, but also it is more flexible (e.g. in case we have to update
both the text content and attributes for some element in the future).

Also note that the outer container should be a list (instead of a tuple), and
that I used "overrides" (instead of "overwrite"), which seems to be more
appropriate: https://stackoverflow.com/questions/8651562/overwrite-or-override

[tlucas, 2018/08/08 22:10:07]

Done.

+    ]
 
     tree = ElementTree.parse(manifest_path)
     root = tree.getroot()
 
-    for xpath, attributes in overwrite:
+    for xpath, text, attributes in overrides:
         element = root.find(xpath, namespaces)
-        if isinstance(attributes, list):
-            for attr, value in attributes:
+        if text:
+            element.text = text
+        for attr, value in attributes:
                 element.set(attr, value)
-        else:
-            element.text = attributes
 
     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)