1
0
mirror of https://github.com/gorhill/uBlock.git synced 2024-07-08 04:49:12 +02:00

changes needed for releasing uBO/opera 1.15.24

This commit is contained in:
Raymond Hill 2018-04-09 10:04:32 -04:00
parent 98df44c373
commit e377b3e915
No known key found for this signature in database
GPG Key ID: 25E1490B761470C2
3 changed files with 18 additions and 14 deletions

View File

@ -82,5 +82,8 @@
"default_panel": "logger-ui.html", "default_panel": "logger-ui.html",
"default_title": "__MSG_statsPageName__" "default_title": "__MSG_statsPageName__"
}, },
"version": "1.14.23.17" "version": "1.14.23.17",
"web_accessible_resources": [
"/web_accessible_resources/*"
]
} }

View File

@ -10,20 +10,17 @@ 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 version number from chromium platform version = ''
chromium_manifest = {} with open(os.path.join(proj_dir, 'dist', 'version')) as f:
webext_manifest = {} version = f.read().strip()
chromium_manifest_file = os.path.join(proj_dir, 'platform', 'chromium', 'manifest.json') manifest_out = {}
with open(chromium_manifest_file) as f1: manifest_out_file = os.path.join(build_dir, 'manifest.json')
chromium_manifest = json.load(f1) with open(manifest_out_file) as f:
manifest_out = json.load(f)
webext_manifest_file = os.path.join(build_dir, 'manifest.json') manifest_out['version'] = version
with open(webext_manifest_file) as f2:
webext_manifest = json.load(f2)
webext_manifest['version'] = chromium_manifest['version'] with open(manifest_out_file, 'w') as f2:
json.dump(manifest_out, f2, indent=2, separators=(',', ': '), sort_keys=True)
with open(webext_manifest_file, 'w') as f2:
json.dump(webext_manifest, f2, indent=2, separators=(',', ': '), sort_keys=True)
f2.write('\n') f2.write('\n')

View File

@ -39,6 +39,10 @@ rm -r $DES/_locales/kk
rm -r $DES/_locales/mr rm -r $DES/_locales/mr
rm -r $DES/_locales/ta rm -r $DES/_locales/ta
echo "*** uBlock0.opera: Generating web accessible resources..."
cp -R src/web_accessible_resources $DES/
python3 tools/import-war.py $DES/
echo "*** uBlock0.opera: Generating meta..." echo "*** uBlock0.opera: Generating meta..."
python tools/make-opera-meta.py $DES/ python tools/make-opera-meta.py $DES/