diff options
| author | gorhill <rhill@raymondhill.net> | 2015-08-12 16:31:19 -0400 |
|---|---|---|
| committer | gorhill <rhill@raymondhill.net> | 2015-08-12 16:31:19 -0400 |
| commit | 29b695d81331c40c7f8ffc7b568726b37857c4d6 (patch) | |
| tree | c645bbec966e5877ea2d23bd8759c11fe3a83ff3 | |
| parent | 5bdf14329c679c3f2695e9e1f930d7b1e1fbb6e8 (diff) | |
| download | uBlock-29b695d81331c40c7f8ffc7b568726b37857c4d6.zip uBlock-29b695d81331c40c7f8ffc7b568726b37857c4d6.tar.gz uBlock-29b695d81331c40c7f8ffc7b568726b37857c4d6.tar.bz2 | |
changes for a beta channel on AMO
| -rw-r--r-- | platform/chromium/manifest.json | 2 | ||||
| -rw-r--r-- | platform/firefox/bootstrap.js | 7 | ||||
| -rw-r--r-- | platform/opera/manifest.json | 2 | ||||
| -rw-r--r-- | tools/make-firefox-meta.py | 5 | ||||
| -rwxr-xr-x | 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 99bbdbb..1a9578d 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 23ba6f0..d1adfc4 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 39d4407..5fad2e5 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 284fa96..26e5952 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 e5da0e7..6be5131 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..." |