changes for a beta channel on AMO

platform/chromium/manifest.json

@@ -2,7 +2,7 @@
     "manifest_version": 2,
 
     "name": "uBlock Origin",
-    "version": "1.0.0.2",
+    "version": "1.1.0.0",
 
     "default_locale": "en",
     "description": "__MSG_extShortDesc__",

platform/firefox/bootstrap.js

@@ -72,13 +72,6 @@ function startup(data, reason) {
             return;
         }
 
-        // https://github.com/gorhill/uBlock/issues/262
-        // To remove whatever suffix AMO adds to the version number.
-        var matches = version.match(/(?:\d+\.)+\d+/);
-        if ( matches !== null ) {
-            version = matches[0];
-        }
-
         bgProcess = hiddenDoc.documentElement.appendChild(
             hiddenDoc.createElementNS('http://www.w3.org/1999/xhtml', 'iframe')
         );

platform/opera/manifest.json

@@ -2,7 +2,7 @@
     "manifest_version": 2,
 
     "name": "uBlock Origin",
-    "version": "1.0.0.2",
+    "version": "1.1.0.0",
 
     "default_locale": "en",
     "description": "__MSG_extShortDesc__",

tools/make-firefox-meta.py

@@ -73,6 +73,11 @@ chromium_manifest = pj(proj_dir, 'platform', 'chromium', 'manifest.json')
 with open(chromium_manifest, encoding='utf-8') as m:
     manifest = json.load(m)
 
+# https://developer.mozilla.org/en-US/Add-ons/AMO/Policy/Maintenance#How_do_I_submit_a_Beta_add-on.3F
+# "To create a beta channel [...] '(a|alpha|b|beta|pre|rc)\d*$' "
+if sys.argv[2]:
+    manifest['version'] += '-' + sys.argv[2]
+
 manifest['homepage'] = 'https://github.com/gorhill/uBlock'
 manifest['description'] = descriptions['en']
 del descriptions['en']

tools/make-firefox.sh

@@ -28,7 +28,7 @@ cp platform/firefox/*.xul $DES/
 cp LICENSE.txt $DES/
 
 echo "*** uBlock0.firefox: Generating meta..."
-python tools/make-firefox-meta.py $DES/
+python tools/make-firefox-meta.py $DES/ "$2"
 
 if [ "$1" = all ]; then
     echo "*** uBlock0.firefox: Creating package..."