Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code

Side by Side Diff: packagerEdge.py

Issue 29368690: [buildtools] Issue 4578 - Make uap3:AppExtension.Id configurable for Microsoft Edge builds (Closed)
Patch Set: Created Dec. 16, 2016, 10:22 a.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | templates/edge/AppxManifest.xml.tmpl » ('j') | tests/AppManifest.xml.expect » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # This Source Code Form is subject to the terms of the Mozilla Public 1 # This Source Code Form is subject to the terms of the Mozilla Public
2 # License, v. 2.0. If a copy of the MPL was not distributed with this 2 # License, v. 2.0. If a copy of the MPL was not distributed with this
3 # file, You can obtain one at http://mozilla.org/MPL/2.0/. 3 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
4 4
5 import base64 5 import base64
6 import hashlib 6 import hashlib
7 import json 7 import json
8 import mimetypes 8 import mimetypes
9 import os 9 import os
10 import zipfile 10 import zipfile
(...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after
77 77
78 78
79 def create_appx_manifest(params, files, release_build=False): 79 def create_appx_manifest(params, files, release_build=False):
80 """Create AppxManifest.xml.""" 80 """Create AppxManifest.xml."""
81 params = dict(params) 81 params = dict(params)
82 metadata = params['metadata'] 82 metadata = params['metadata']
83 w = params['windows_version'] = {} 83 w = params['windows_version'] = {}
84 w['min'], w['max'] = metadata.get('compat', 'windows').split('/') 84 w['min'], w['max'] = metadata.get('compat', 'windows').split('/')
85 params.update(metadata.items('general')) 85 params.update(metadata.items('general'))
86 params['version'] = pad_version(params['version']) 86 params['version'] = pad_version(params['version'])
87 params['app_extension_id'] = '1.0' if release_build else 'EdgeExtension'
Wladimir Palant 2016/12/16 10:39:25 Given that this logic isn't something that is inhe
Sebastian Noack 2016/12/16 11:20:11 I already had the same thought. But on the other h
Sebastian Noack 2016/12/19 17:19:52 Yes, it is permanent for Adblock Plus for Microsof
Wladimir Palant 2017/01/05 12:20:49 I don't really see what this discussion is about.
Sebastian Noack 2017/01/05 12:27:57 Thanks for getting back to us. As I said above, I
wspee 2017/01/06 16:18:10 I have made it configure able similar to how you s
Sebastian Noack 2017/01/07 10:18:46 I think it makes sense to use 'EdgeExtension' as d
wspee 2017/01/09 13:32:27 Done.
87 88
88 translation = load_translation(files, defaultLocale) 89 translation = load_translation(files, defaultLocale)
89 name_key = 'name' if release_build else 'name_devbuild' 90 name_key = 'name' if release_build else 'name_devbuild'
90 params['display_name'] = translation[name_key]['message'] 91 params['display_name'] = translation[name_key]['message']
91 params['description'] = translation['description']['message'] 92 params['description'] = translation['description']['message']
92 93
93 for size in ['44', '50', '150']: 94 for size in ['44', '50', '150']:
94 path = '{}/logo_{}.png'.format(ASSETS_DIR, size) 95 path = '{}/logo_{}.png'.format(ASSETS_DIR, size)
95 if path not in files: 96 if path not in files:
96 raise KeyError(path + ' is not found in files') 97 raise KeyError(path + ' is not found in files')
(...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after
176 if metadata.has_section('appx_assets'): 177 if metadata.has_section('appx_assets'):
177 for name, path in metadata.items('appx_assets'): 178 for name, path in metadata.items('appx_assets'):
178 path = os.path.join(baseDir, path) 179 path = os.path.join(baseDir, path)
179 files.read(path, '{}/{}'.format(ASSETS_DIR, name)) 180 files.read(path, '{}/{}'.format(ASSETS_DIR, name))
180 181
181 files[MANIFEST] = create_appx_manifest(params, files, releaseBuild) 182 files[MANIFEST] = create_appx_manifest(params, files, releaseBuild)
182 files[BLOCKMAP] = create_appx_blockmap(files) 183 files[BLOCKMAP] = create_appx_blockmap(files)
183 files[CONTENT_TYPES] = create_content_types_map(files.keys() + [BLOCKMAP]) 184 files[CONTENT_TYPES] = create_content_types_map(files.keys() + [BLOCKMAP])
184 185
185 files.zip(outfile, compression=zipfile.ZIP_STORED) 186 files.zip(outfile, compression=zipfile.ZIP_STORED)
OLDNEW
« no previous file with comments | « no previous file | templates/edge/AppxManifest.xml.tmpl » ('j') | tests/AppManifest.xml.expect » ('J')

Powered by Google App Engine
This is Rietveld