mirror of
https://github.com/gorhill/uMatrix.git
synced 2024-04-27 17:12:15 +12:00
add changes needed for self-hosted signed beta version
This commit is contained in:
parent
08a0cdc218
commit
702fbba914
2
.gitignore
vendored
2
.gitignore
vendored
|
@ -1 +1 @@
|
||||||
dist/
|
dist/build/
|
||||||
|
|
14
dist/firefox/updates.json
vendored
Normal file
14
dist/firefox/updates.json
vendored
Normal file
|
@ -0,0 +1,14 @@
|
||||||
|
{
|
||||||
|
"addons": {
|
||||||
|
"uMatrix@raymondhill.net": {
|
||||||
|
"updates": [
|
||||||
|
{
|
||||||
|
"version": "1.3.3b8",
|
||||||
|
"applications": { "gecko": { "strict_min_version": "56" } },
|
||||||
|
"update_info_url": "https://github.com/gorhill/uMatrix/releases/tag/1.3.3b8",
|
||||||
|
"update_link": "https://github.com/gorhill/uMatrix/releases/download/1.3.3b8/uBlock0.webext.signed.xpi"
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
1
dist/version
vendored
Normal file
1
dist/version
vendored
Normal file
|
@ -0,0 +1 @@
|
||||||
|
1.3.3.8
|
14
platform/webext/updates.template.json
Normal file
14
platform/webext/updates.template.json
Normal file
|
@ -0,0 +1,14 @@
|
||||||
|
{
|
||||||
|
"addons": {
|
||||||
|
"uMatrix@raymondhill.net": {
|
||||||
|
"updates": [
|
||||||
|
{
|
||||||
|
"version": "$version",
|
||||||
|
"applications": { "gecko": { "strict_min_version": "56" } },
|
||||||
|
"update_info_url": "https://github.com/gorhill/uMatrix/releases/tag/$version",
|
||||||
|
"update_link": "https://github.com/gorhill/uMatrix/releases/download/$version/uMatrix.webext.signed.xpi"
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
|
@ -9,24 +9,27 @@ if len(sys.argv) == 1 or not sys.argv[1]:
|
||||||
raise SystemExit('Build dir missing.')
|
raise SystemExit('Build dir missing.')
|
||||||
|
|
||||||
proj_dir = os.path.join(os.path.split(os.path.abspath(__file__))[0], '..')
|
proj_dir = os.path.join(os.path.split(os.path.abspath(__file__))[0], '..')
|
||||||
|
build_dir = os.path.abspath(sys.argv[1])
|
||||||
|
|
||||||
manifest_in = {}
|
version = ''
|
||||||
manifest_in_file = os.path.join(proj_dir, 'platform', 'chromium', 'manifest.json')
|
with open(os.path.join(proj_dir, 'dist', 'version')) as f:
|
||||||
with open(manifest_in_file) as f1:
|
version = f.read().strip()
|
||||||
manifest_in = json.load(f1)
|
|
||||||
|
manifest_out = {}
|
||||||
|
manifest_out_file = os.path.join(build_dir, 'manifest.json')
|
||||||
|
with open(manifest_out_file) as f:
|
||||||
|
manifest_out = json.load(f)
|
||||||
|
|
||||||
|
manifest_out['version'] = version
|
||||||
|
|
||||||
# Development build? If so, modify name accordingly.
|
# Development build? If so, modify name accordingly.
|
||||||
match = re.search('^\d+\.\d+\.\d+\.\d+$', manifest_in['version'])
|
match = re.search('^\d+\.\d+\.\d+\.\d+$', version)
|
||||||
if match:
|
if match:
|
||||||
build_dir = os.path.abspath(sys.argv[1])
|
|
||||||
dev_build = ' dev build'
|
dev_build = ' dev build'
|
||||||
manifest_out = {}
|
|
||||||
manifest_out_file = os.path.join(build_dir, 'manifest.json')
|
|
||||||
with open(manifest_out_file) as f2:
|
|
||||||
manifest_out = json.load(f2)
|
|
||||||
manifest_out['name'] += dev_build
|
manifest_out['name'] += dev_build
|
||||||
manifest_out['short_name'] += dev_build
|
manifest_out['short_name'] += dev_build
|
||||||
manifest_out['browser_action']['default_title'] += dev_build
|
manifest_out['browser_action']['default_title'] += dev_build
|
||||||
with open(manifest_out_file, 'w') as f2:
|
|
||||||
json.dump(manifest_out, f2, indent=2, separators=(',', ': '), sort_keys=True)
|
with open(manifest_out_file, 'w') as f:
|
||||||
f2.write('\n')
|
json.dump(manifest_out, f, indent=2, separators=(',', ': '), sort_keys=True)
|
||||||
|
f.write('\n')
|
||||||
|
|
|
@ -11,20 +11,16 @@ if len(sys.argv) == 1 or not sys.argv[1]:
|
||||||
proj_dir = os.path.join(os.path.split(os.path.abspath(__file__))[0], '..')
|
proj_dir = os.path.join(os.path.split(os.path.abspath(__file__))[0], '..')
|
||||||
build_dir = os.path.abspath(sys.argv[1])
|
build_dir = os.path.abspath(sys.argv[1])
|
||||||
|
|
||||||
# Import data from chromium platform
|
version = ''
|
||||||
chromium_manifest = {}
|
with open(os.path.join(proj_dir, 'dist', 'version')) as f:
|
||||||
|
version = f.read().strip()
|
||||||
|
|
||||||
webext_manifest = {}
|
webext_manifest = {}
|
||||||
|
|
||||||
chromium_manifest_file = os.path.join(proj_dir, 'platform', 'chromium', 'manifest.json')
|
|
||||||
with open(chromium_manifest_file) as f1:
|
|
||||||
chromium_manifest = json.load(f1)
|
|
||||||
|
|
||||||
# WebExtension
|
|
||||||
webext_manifest_file = os.path.join(build_dir, 'manifest.json')
|
webext_manifest_file = os.path.join(build_dir, 'manifest.json')
|
||||||
with open(webext_manifest_file) as f2:
|
with open(webext_manifest_file) as f:
|
||||||
webext_manifest = json.load(f2)
|
webext_manifest = json.load(f)
|
||||||
|
|
||||||
match = re.search('^(\d+\.\d+\.\d+)(\.\d+)$', chromium_manifest['version'])
|
match = re.search('^(\d+\.\d+\.\d+)(\.\d+)$', version)
|
||||||
if match:
|
if match:
|
||||||
buildtype = int(match.group(2)[1:])
|
buildtype = int(match.group(2)[1:])
|
||||||
if buildtype < 100:
|
if buildtype < 100:
|
||||||
|
@ -33,7 +29,7 @@ if match:
|
||||||
builttype = 'rc' + str(buildtype - 100)
|
builttype = 'rc' + str(buildtype - 100)
|
||||||
webext_manifest['version'] = match.group(1) + builttype
|
webext_manifest['version'] = match.group(1) + builttype
|
||||||
else:
|
else:
|
||||||
webext_manifest['version'] = chromium_manifest['version']
|
webext_manifest['version'] = version
|
||||||
|
|
||||||
with open(webext_manifest_file, 'w') as f2:
|
with open(webext_manifest_file, 'w') as f2:
|
||||||
json.dump(webext_manifest, f2, indent=2, separators=(',', ': '), sort_keys=True)
|
json.dump(webext_manifest, f2, indent=2, separators=(',', ': '), sort_keys=True)
|
||||||
|
|
Loading…
Reference in a new issue