From 29b695d81331c40c7f8ffc7b568726b37857c4d6 Mon Sep 17 00:00:00 2001
From: gorhill <rhill@raymondhill.net>
Date: Wed, 12 Aug 2015 16:31:19 -0400
Subject: [PATCH] changes for  a beta channel on AMO

---
 platform/chromium/manifest.json | 2 +-
 platform/firefox/bootstrap.js   | 7 -------
 platform/opera/manifest.json    | 2 +-
 tools/make-firefox-meta.py      | 5 +++++
 tools/make-firefox.sh           | 2 +-
 5 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/platform/chromium/manifest.json b/platform/chromium/manifest.json
index 99bbdbb40..1a9578dd9 100644
--- a/platform/chromium/manifest.json
+++ b/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__",
diff --git a/platform/firefox/bootstrap.js b/platform/firefox/bootstrap.js
index 23ba6f063..d1adfc47b 100644
--- a/platform/firefox/bootstrap.js
+++ b/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')
         );
diff --git a/platform/opera/manifest.json b/platform/opera/manifest.json
index 39d4407f3..5fad2e551 100644
--- a/platform/opera/manifest.json
+++ b/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__",
diff --git a/tools/make-firefox-meta.py b/tools/make-firefox-meta.py
index 284fa96d3..26e595207 100644
--- a/tools/make-firefox-meta.py
+++ b/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']
diff --git a/tools/make-firefox.sh b/tools/make-firefox.sh
index e5da0e766..6be51313b 100755
--- a/tools/make-firefox.sh
+++ b/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..."