[Pkg-mozext-commits] [adblock-plus] 24/87: Issue 382 - Removed support for experimental Chrome builds

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository adblock-plus.

commit 2548f2f5598567515aaf306d9a28c69e931cb018
Author: Sebastian Noack <sebastian at adblockplus.org>
Date:   Tue Mar 8 14:45:35 2016 +0100

    Issue 382 - Removed support for experimental Chrome builds
---
 build.py          | 7 +------
 packagerChrome.py | 5 +----
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/build.py b/build.py
index 69d732d..3540320 100644
--- a/build.py
+++ b/build.py
@@ -165,7 +165,6 @@ def runBuild(baseDir, scriptName, opts, args, type):
   multicompartment = False
   releaseBuild = False
   keyFile = None
-  experimentalAPI = False
   for option, value in opts:
     if option in ('-l', '--locales'):
       locales = value.split(',')
@@ -177,8 +176,6 @@ def runBuild(baseDir, scriptName, opts, args, type):
       multicompartment = True
     elif option in ('-r', '--release'):
       releaseBuild = True
-    elif option == '--experimental':
-      experimentalAPI = True
   outFile = args[0] if len(args) > 0 else None
 
   if type == 'gecko':
@@ -189,8 +186,7 @@ def runBuild(baseDir, scriptName, opts, args, type):
   elif type == 'chrome':
     import buildtools.packagerChrome as packager
     packager.createBuild(baseDir, type=type, outFile=outFile, buildNum=buildNum,
-                         releaseBuild=releaseBuild, keyFile=keyFile,
-                         experimentalAPI=experimentalAPI)
+                         releaseBuild=releaseBuild, keyFile=keyFile)
   elif type == 'safari':
     import buildtools.packagerSafari as packager
     packager.createBuild(baseDir, type=type, outFile=outFile, buildNum=buildNum,
@@ -462,7 +458,6 @@ with addCommand(runBuild, 'build') as command:
   command.addOption('File containing private key and certificates required to sign the package', short='k', long='key', value='file', types=('gecko', 'chrome', 'safari'))
   command.addOption('Create a build for leak testing', short='m', long='multi-compartment', types=('gecko'))
   command.addOption('Create a release build', short='r', long='release')
-  command.addOption('Enable use of experimental APIs', long='experimental')
   command.supportedTypes = ('gecko', 'chrome', 'safari')
 
 with addCommand(runAutoInstall, 'autoinstall') as command:
diff --git a/packagerChrome.py b/packagerChrome.py
index 1b9ddf5..93a7e31 100644
--- a/packagerChrome.py
+++ b/packagerChrome.py
@@ -91,8 +91,6 @@ def createManifest(params, files):
 
   if metadata.has_option('general', 'permissions'):
     templateData['permissions'] = metadata.get('general', 'permissions').split()
-    if params['experimentalAPI']:
-      templateData['permissions'].append('experimental')
 
   if metadata.has_option('general', 'optionalPermissions'):
     templateData['optionalPermissions'] = metadata.get(
@@ -309,7 +307,7 @@ def writePackage(outputFile, pubkey, signature, zipdata):
     file.write(signature)
   file.write(zipdata)
 
-def createBuild(baseDir, type='chrome', outFile=None, buildNum=None, releaseBuild=False, keyFile=None, experimentalAPI=False, devenv=False):
+def createBuild(baseDir, type='chrome', outFile=None, buildNum=None, releaseBuild=False, keyFile=None, devenv=False):
   metadata = readMetadata(baseDir, type)
   version = getBuildVersion(baseDir, metadata, releaseBuild, buildNum)
 
@@ -321,7 +319,6 @@ def createBuild(baseDir, type='chrome', outFile=None, buildNum=None, releaseBuil
     'baseDir': baseDir,
     'releaseBuild': releaseBuild,
     'version': version,
-    'experimentalAPI': experimentalAPI,
     'devenv': devenv,
     'metadata': metadata,
   }

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mozext/adblock-plus.git