From fafe4c8abc4eeae6058e2d3a54d5c9e6d7e2ad2f Mon Sep 17 00:00:00 2001 From: gorhill Date: Wed, 8 Mar 2017 13:44:01 -0500 Subject: [PATCH] fix #2436 --- tools/make-opera-meta.py | 29 +++++++++++++++++++++++++++++ tools/make-opera.sh | 2 +- 2 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 tools/make-opera-meta.py diff --git a/tools/make-opera-meta.py b/tools/make-opera-meta.py new file mode 100644 index 000000000..15df315fb --- /dev/null +++ b/tools/make-opera-meta.py @@ -0,0 +1,29 @@ +#!/usr/bin/env python3 + +import os +import json +import sys + +if len(sys.argv) == 1 or not sys.argv[1]: + raise SystemExit('Build dir missing.') + +proj_dir = os.path.join(os.path.split(os.path.abspath(__file__))[0], '..') +build_dir = os.path.abspath(sys.argv[1]) + +# Import version number from chromium platform +chromium_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) + +webext_manifest_file = os.path.join(build_dir, 'manifest.json') +with open(webext_manifest_file) as f2: + webext_manifest = json.load(f2) + +webext_manifest['version'] = chromium_manifest['version'] + +with open(webext_manifest_file, 'w') as f2: + json.dump(webext_manifest, f2, indent=2, separators=(',', ': '), sort_keys=True) + f2.write('\n') diff --git a/tools/make-opera.sh b/tools/make-opera.sh index 918f681e1..d12887ce8 100755 --- a/tools/make-opera.sh +++ b/tools/make-opera.sh @@ -27,7 +27,7 @@ cp platform/opera/manifest.json $DES/ cp LICENSE.txt $DES/ echo "*** uBlock0.opera: Generating meta..." -python tools/make-webext-meta.py $DES/ +python tools/make-opera-meta.py $DES/ rm -r $DES/_locales/cv rm -r $DES/_locales/hi