From 5a50f4ecfa3896ab43817163f5c4f5d54b806e14 Mon Sep 17 00:00:00 2001
From: gorhill <rhill@raymondhill.net>
Date: Wed, 19 Oct 2016 19:07:59 -0400
Subject: [PATCH] use chromium manifest as the official one on which others are
 based

---
 tools/make-opera.sh       |  3 +++
 tools/make-webext-meta.py | 29 +++++++++++++++++++++++++++++
 tools/make-webext.sh      |  3 +++
 3 files changed, 35 insertions(+)
 create mode 100755 tools/make-webext-meta.py

diff --git a/tools/make-opera.sh b/tools/make-opera.sh
index c7fde4611..918f681e1 100755
--- a/tools/make-opera.sh
+++ b/tools/make-opera.sh
@@ -26,6 +26,9 @@ cp -R platform/chromium/img $DES/
 cp platform/opera/manifest.json $DES/
 cp LICENSE.txt $DES/
 
+echo "*** uBlock0.opera: Generating meta..."
+python tools/make-webext-meta.py $DES/
+
 rm -r $DES/_locales/cv
 rm -r $DES/_locales/hi
 rm -r $DES/_locales/mr
diff --git a/tools/make-webext-meta.py b/tools/make-webext-meta.py
new file mode 100755
index 000000000..15df315fb
--- /dev/null
+++ b/tools/make-webext-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-webext.sh b/tools/make-webext.sh
index cdb896747..8304b721b 100755
--- a/tools/make-webext.sh
+++ b/tools/make-webext.sh
@@ -26,6 +26,9 @@ cp platform/webext/polyfill.js   $DES/js/
 cp platform/webext/manifest.json $DES/
 cp LICENSE.txt                   $DES/
 
+echo "*** uBlock0.webext: Generating meta..."
+python tools/make-webext-meta.py $DES/
+
 if [ "$1" = all ]; then
     echo "*** uBlock0.webext: Creating package..."
     pushd $(dirname $DES/) > /dev/null