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

Delta Between Two Patch Sets: templates/manifest.json.tmpl

Issue 29696596: Issue 6383 - introduce switchable app_id (Closed) Base URL: https://hg.adblockplus.org/buildtools/rev/097b8d9c43a8
Left Patch Set: Created Feb. 13, 2018, 3:51 p.m.
Right Patch Set: Created Feb. 14, 2018, 10:49 a.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
Left: Side by side diff | Download
Right: Side by side diff | Download
« no previous file with change/comment | « packagerEdge.py ('k') | tests/expecteddata/manifest_gecko_development_build.json » ('j') | no next file with change/comment »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
LEFTRIGHT
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 { 5 {
6 "manifest_version": 2, 6 "manifest_version": 2,
7 {%- if releaseBuild %} 7 {%- if releaseBuild %}
8 "name": "__MSG_name__", 8 "name": "__MSG_name__",
9 {%- else %} 9 {%- else %}
10 "name": "__MSG_name_devbuild__", 10 "name": "__MSG_name_devbuild__",
(...skipping 15 matching lines...) Expand all
26 26
27 {%- if metadata.has_section('compat') and metadata.has_option('compat', 'edge' ) %} 27 {%- if metadata.has_section('compat') and metadata.has_option('compat', 'edge' ) %}
28 "minimum_edge_version": {{metadata.get('compat', 'edge')|json}}, 28 "minimum_edge_version": {{metadata.get('compat', 'edge')|json}},
29 {%- endif %} 29 {%- endif %}
30 30
31 {%- if type == 'gecko' %} 31 {%- if type == 'gecko' %}
32 "applications": 32 "applications":
33 { 33 {
34 "gecko": 34 "gecko":
35 { 35 {
36 {%- set extension_id = 'beta_id' if not releaseBuild and not devenv and me tadata.has_option('general', 'beta_id') else 'id' %} 36 "id": {{app_id|json}}
Sebastian Noack 2018/02/13 16:11:52 We have similar logic already for the Edge builds.
tlucas 2018/02/14 10:51:48 Good point - Done.
37 "id": {{metadata.get('general', extension_id)|json}} 37
38 {%- if metadata.has_section('compat') and metadata.has_option('compat', 'g ecko') %} 38 {%- if metadata.has_section('compat') and metadata.has_option('compat', 'g ecko') %}
39 , 39 ,
40 "strict_min_version": {{metadata.get('compat', 'gecko')|json}} 40 "strict_min_version": {{metadata.get('compat', 'gecko')|json}}
41 {%- endif %} 41 {%- endif %}
42 42
43 {%- set updateURLSetting = 'updateURL' if releaseBuild else 'devbuildUpdat eURL' %} 43 {%- set updateURLSetting = 'updateURL' if releaseBuild else 'devbuildUpdat eURL' %}
44 {%- if metadata.has_option('general', updateURLSetting) %} 44 {%- if metadata.has_option('general', updateURLSetting) %}
45 , 45 ,
46 "update_url": {{metadata.get('general', updateURLSetting)|json}} 46 "update_url": {{metadata.get('general', updateURLSetting)|json}}
47 {%- endif %} 47 {%- endif %}
(...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after
116 "managed_schema": {{metadata.get('general', 'managedStorageSchema')|json}} 116 "managed_schema": {{metadata.get('general', 'managedStorageSchema')|json}}
117 }, 117 },
118 {%- endif %} 118 {%- endif %}
119 119
120 {%- if metadata.has_option('general', 'contentSecurityPolicy') %} 120 {%- if metadata.has_option('general', 'contentSecurityPolicy') %}
121 "content_security_policy": {{metadata.get('general', 'contentSecurityPolicy')| json}}, 121 "content_security_policy": {{metadata.get('general', 'contentSecurityPolicy')| json}},
122 {%- endif %} 122 {%- endif %}
123 123
124 "_dummy": false 124 "_dummy": false
125 } 125 }
LEFTRIGHT

Powered by Google App Engine
This is Rietveld