Index: package.json
===================================================================
--- a/package.json
+++ b/package.json
@@ -15,6 +15,6 @@
"scripts": {
"jsdoc": "jsdoc",
"build-edge": "manifoldjs -l error -p edgeextension -f edgeextension -d $EXT_FOLDER -m $SRC_FOLDER/manifest.json",
- "package-edge": "manifoldjs -l error -p edgeextension package $EXT_FOLDER/MSGname/edgeextension/manifest/"
+ "package-edge": "manifoldjs -l error -p edgeextension package $EXT_FOLDER/*/edgeextension/manifest/"
}
}
Index: packagerEdge.py
===================================================================
--- a/packagerEdge.py
+++ b/packagerEdge.py
@@ -4,7 +4,10 @@
import os
import shutil
+import json
+import re
from StringIO import StringIO
+from glob import glob
import subprocess
import tempfile
from xml.etree import ElementTree
@@ -140,15 +143,17 @@
if metadata.has_section('import_locales'):
packagerChrome.import_locales(params, files)
- # For some mysterious reasons manifoldjs fails with a server error
- # when building the development build and there is any translation
- # in az/messages.json for "name_devbuild", however, it works fine
- # if we use the more specific language code az-latn.
- az_translation = files.pop('_locales/az/messages.json', None)
- if az_translation is not None:
- files['_locales/az-latn/messages.json'] = az_translation
-
- files['manifest.json'] = packagerChrome.createManifest(params, files)
+ # The Windows Store will reject the build unless every translation of the
+ # product name has been reserved. This is hard till impossible to manage
+ # with community translations, so we don't translate the product name for
+ # Microsoft Edge. Furthermore, manifoldjs fails with a server error if the
+ # product name is tranlated into Azerbajani.
+ data = json.loads(files['_locales/{}/messages.json'.format(defaultLocale)])
+ files['manifest.json'] = re.sub(
+ r'__MSG_(name(?:_devbuild)?)__',
+ lambda m: data[m.group(1)]['message'],
+ packagerChrome.createManifest(params, files),
+ )
if devenv:
packagerChrome.add_devenv_requirements(files, metadata, params)
@@ -174,14 +179,14 @@
cmd_env['SRC_FOLDER'] = src_dir
cmd_env['EXT_FOLDER'] = ext_dir
- manifold_folder = os.path.join(ext_dir, 'MSGname', 'edgeextension')
- manifest_folder = os.path.join(manifold_folder, 'manifest')
- asset_folder = os.path.join(manifest_folder, ASSETS_DIR)
-
# prepare the extension with manifoldjs
cmd = ['npm', 'run', '--silent', 'build-edge']
subprocess.check_call(cmd, env=cmd_env, cwd=os.path.dirname(__file__))
+ manifold_folder = glob(os.path.join(ext_dir, '*', 'edgeextension'))[0]
+ manifest_folder = os.path.join(manifold_folder, 'manifest')
+ asset_folder = os.path.join(manifest_folder, ASSETS_DIR)
+
# update incomplete appxmanifest
intermediate_manifest = os.path.join(manifest_folder, MANIFEST)
update_appx_manifest(intermediate_manifest, baseDir, files, metadata,
Index: tests/expecteddata/AppxManifest_edge_development_build.xml
===================================================================
--- a/tests/expecteddata/AppxManifest_edge_development_build.xml
+++ b/tests/expecteddata/AppxManifest_edge_development_build.xml
@@ -3,7 +3,7 @@
- ms-resource:DisplayName
+ Adblock Plus development build
eyeo GmbH
Assets/logo_50.png
@@ -21,11 +21,11 @@
-
+
-
+
Index: tests/expecteddata/AppxManifest_edge_release_build.xml
===================================================================
--- a/tests/expecteddata/AppxManifest_edge_release_build.xml
+++ b/tests/expecteddata/AppxManifest_edge_release_build.xml
@@ -3,7 +3,7 @@
- ms-resource:DisplayName
+ Adblock Plus
eyeo GmbH
Assets/logo_50.png
@@ -21,11 +21,11 @@
-
+
-
+
Index: tests/expecteddata/manifest_edge_development_build.json
===================================================================
--- a/tests/expecteddata/manifest_edge_development_build.json
+++ b/tests/expecteddata/manifest_edge_development_build.json
@@ -14,7 +14,7 @@
"53": "icons/abp-53.png"
},
"default_popup": "popup.html",
- "default_title": "__MSG_name__"
+ "default_title": "Adblock Plus"
},
"content_scripts": [
{
@@ -51,7 +51,7 @@
"minimum_chrome_version": "49.0",
"minimum_edge_version": "37.14332.1000.0",
"minimum_opera_version": "36.0",
- "name": "__MSG_name_devbuild__",
+ "name": "Adblock Plus development build",
"optional_permissions": [
"webRequest"
],
@@ -62,7 +62,7 @@
"https://*/*",
"contextMenus"
],
- "short_name": "__MSG_name__",
+ "short_name": "Adblock Plus",
"storage": {
"managed_schema": "storage.json"
},
@@ -70,4 +70,4 @@
"web_accessible_resources": [
"images/*.png"
]
-}
\ No newline at end of file
+}
Index: tests/expecteddata/manifest_edge_devenv.json
===================================================================
--- a/tests/expecteddata/manifest_edge_devenv.json
+++ b/tests/expecteddata/manifest_edge_devenv.json
@@ -15,7 +15,7 @@
"53": "icons/abp-53.png"
},
"default_popup": "popup.html",
- "default_title": "__MSG_name__"
+ "default_title": "Adblock Plus"
},
"content_scripts": [
{
@@ -52,7 +52,7 @@
"minimum_chrome_version": "49.0",
"minimum_edge_version": "37.14332.1000.0",
"minimum_opera_version": "36.0",
- "name": "__MSG_name__",
+ "name": "Adblock Plus",
"optional_permissions": [
"webRequest"
],
@@ -63,7 +63,7 @@
"https://*/*",
"contextMenus"
],
- "short_name": "__MSG_name__",
+ "short_name": "Adblock Plus",
"storage": {
"managed_schema": "storage.json"
},
@@ -71,4 +71,4 @@
"web_accessible_resources": [
"images/*.png"
]
-}
\ No newline at end of file
+}
Index: tests/expecteddata/manifest_edge_release_build.json
===================================================================
--- a/tests/expecteddata/manifest_edge_release_build.json
+++ b/tests/expecteddata/manifest_edge_release_build.json
@@ -14,7 +14,7 @@
"53": "icons/abp-53.png"
},
"default_popup": "popup.html",
- "default_title": "__MSG_name__"
+ "default_title": "Adblock Plus"
},
"content_scripts": [
{
@@ -51,7 +51,7 @@
"minimum_chrome_version": "49.0",
"minimum_edge_version": "37.14332.1000.0",
"minimum_opera_version": "36.0",
- "name": "__MSG_name__",
+ "name": "Adblock Plus",
"optional_permissions": [
"webRequest"
],
@@ -62,7 +62,7 @@
"https://*/*",
"contextMenus"
],
- "short_name": "__MSG_name__",
+ "short_name": "Adblock Plus",
"storage": {
"managed_schema": "storage.json"
},
@@ -70,4 +70,4 @@
"web_accessible_resources": [
"images/*.png"
]
-}
\ No newline at end of file
+}
Index: tests/test_packagerWebExt.py
===================================================================
--- a/tests/test_packagerWebExt.py
+++ b/tests/test_packagerWebExt.py
@@ -32,7 +32,7 @@
MESSAGES_EN_US = json.dumps({
'name': {'message': 'Adblock Plus'},
- 'name_devbuild': {'message': 'devbuild-marker'},
+ 'name_devbuild': {'message': 'Adblock Plus development build'},
'description': {
'message': 'Adblock Plus is the most popular ad blocker ever, '
'and also supports websites by not blocking '