[Pkg-mozext-commits] [adblock-plus] 23/87: Issue 3760 - Removed support for Opera builds

David Prévot taffit at moszumanska.debian.org
Sat Apr 30 17:59:04 UTC 2016


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

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

commit 17b8a6d8a981eea63eec0ee67618802319f198b1
Author: Sebastian Noack <sebastian at adblockplus.org>
Date:   Tue Mar 8 13:31:39 2016 +0100

    Issue 3760 - Removed support for Opera builds
---
 build.py             | 24 ++++++++++++------------
 manifest.json.tmpl   | 13 +------------
 packagerSafari.py    |  2 +-
 releaseAutomation.py |  9 ++-------
 4 files changed, 16 insertions(+), 32 deletions(-)

diff --git a/build.py b/build.py
index dae4c04..69d732d 100644
--- a/build.py
+++ b/build.py
@@ -9,7 +9,7 @@ from getopt import getopt, GetoptError
 from StringIO import StringIO
 from zipfile import ZipFile
 
-knownTypes = ('gecko', 'chrome', 'opera', 'safari', 'generic')
+knownTypes = ('gecko', 'chrome', 'safari', 'generic')
 
 class Command(object):
   name = property(lambda self: self._name)
@@ -186,7 +186,7 @@ def runBuild(baseDir, scriptName, opts, args, type):
     packager.createBuild(baseDir, type=type, outFile=outFile, locales=locales, buildNum=buildNum,
                          releaseBuild=releaseBuild, keyFile=keyFile,
                          multicompartment=multicompartment)
-  elif type == 'chrome' or type == 'opera':
+  elif type == 'chrome':
     import buildtools.packagerChrome as packager
     packager.createBuild(baseDir, type=type, outFile=outFile, buildNum=buildNum,
                          releaseBuild=releaseBuild, keyFile=keyFile,
@@ -246,7 +246,7 @@ def readLocaleConfig(baseDir, type, metadata):
       'target_platforms': {'gecko'},
       'default_locale': packager.defaultLocale
     }
-  elif type == 'chrome' or type == 'opera':
+  elif type == 'chrome':
     import buildtools.packagerChrome as packager
     localeDir = os.path.join(baseDir, '_locales')
     localeConfig = {
@@ -459,11 +459,11 @@ with addCommand(runBuild, 'build') as command:
   command.params = '[options] [output_file]'
   command.addOption('Only include the given locales (if omitted: all locales not marked as incomplete)', short='l', long='locales', value='l1,l2,l3', types=('gecko'))
   command.addOption('Use given build number (if omitted the build number will be retrieved from Mercurial)', short='b', long='build', value='num')
-  command.addOption('File containing private key and certificates required to sign the package', short='k', long='key', value='file', types=('gecko', 'chrome', 'opera', 'safari'))
+  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', 'opera', 'safari')
+  command.supportedTypes = ('gecko', 'chrome', 'safari')
 
 with addCommand(runAutoInstall, 'autoinstall') as command:
   command.shortDescription = 'Install extension automatically'
@@ -475,31 +475,31 @@ with addCommand(runAutoInstall, 'autoinstall') as command:
 with addCommand(createDevEnv, 'devenv') as command:
   command.shortDescription = 'Set up a development environment'
   command.description = 'Will set up or update the devenv folder as an unpacked extension folder for development.'
-  command.supportedTypes = ('chrome', 'opera', 'safari')
+  command.supportedTypes = ('chrome', 'safari')
 
 with addCommand(setupTranslations, 'setuptrans') as command:
   command.shortDescription = 'Sets up translation languages'
   command.description = 'Sets up translation languages for the project on crowdin.net.'
   command.params = '[options] project-key'
-  command.supportedTypes = ('gecko', 'chrome', 'opera', 'generic')
+  command.supportedTypes = ('gecko', 'chrome', 'generic')
 
 with addCommand(updateTranslationMaster, 'translate') as command:
   command.shortDescription = 'Updates translation master files'
   command.description = 'Updates the translation master files in the project on crowdin.net.'
   command.params = '[options] project-key'
-  command.supportedTypes = ('gecko', 'chrome', 'opera', 'generic')
+  command.supportedTypes = ('gecko', 'chrome', 'generic')
 
 with addCommand(uploadTranslations, 'uploadtrans') as command:
   command.shortDescription = 'Uploads existing translations'
   command.description = 'Uploads already existing translations to the project on crowdin.net.'
   command.params = '[options] project-key'
-  command.supportedTypes = ('gecko', 'chrome', 'opera', 'generic')
+  command.supportedTypes = ('gecko', 'chrome', 'generic')
 
 with addCommand(getTranslations, 'gettranslations') as command:
   command.shortDescription = 'Downloads translation updates'
   command.description = 'Downloads updated translations from crowdin.net.'
   command.params = '[options] project-key'
-  command.supportedTypes = ('gecko', 'chrome', 'opera', 'generic')
+  command.supportedTypes = ('gecko', 'chrome', 'generic')
 
 with addCommand(showDescriptions, 'showdesc') as command:
   command.shortDescription = 'Print description strings for all locales'
@@ -521,7 +521,7 @@ with addCommand(runReleaseAutomation, 'release') as command:
     'probably don\'t want to run this!\n\n'\
     'Runs release automation: creates downloads for the new version, tags '\
     'source code repository as well as downloads and buildtools repository.'
-  command.addOption('File containing private key and certificates required to sign the release. Note that for Chrome releases this option needs to be specified twice: first a key to sign Chrome/Opera builds, then another to sign the Safari build.', short='k', long='key', value='file', types=('gecko', 'chrome'))
+  command.addOption('File containing private key and certificates required to sign the release. Note that for Chrome releases this option needs to be specified twice: first a key to sign Chrome builds, then another to sign the Safari build.', short='k', long='key', value='file', types=('gecko', 'chrome'))
   command.addOption('Directory containing downloads repository (if omitted ../downloads is assumed)', short='d', long='downloads', value='dir')
   command.params = '[options] <version>'
   command.supportedTypes = ('gecko', 'chrome')
@@ -529,7 +529,7 @@ with addCommand(runReleaseAutomation, 'release') as command:
 with addCommand(updatePSL, 'updatepsl') as command:
   command.shortDescription = 'Updates Public Suffix List'
   command.description = 'Downloads Public Suffix List (see http://publicsuffix.org/) and generates lib/publicSuffixList.js from it.'
-  command.supportedTypes = ('chrome', 'opera')
+  command.supportedTypes = ('chrome',)
 
 def getType(baseDir, scriptName, args):
   # Look for an explicit type parameter (has to be the first parameter)
diff --git a/manifest.json.tmpl b/manifest.json.tmpl
index 94c2bdc..4c8c7e0 100644
--- a/manifest.json.tmpl
+++ b/manifest.json.tmpl
@@ -11,7 +11,7 @@
   {%- endif %}
 
   "short_name": "__MSG_name__",
-  "description": "__MSG_description_{{ type }}__",
+  "description": "__MSG_description__",
   "default_locale": "en_US",
   "version": {{version|json}},
 
@@ -19,17 +19,6 @@
   "minimum_chrome_version": {{metadata.get('compat', 'chrome')|json}},
   {%- endif %}
 
-  {%- if not releaseBuild and type != "chrome" %}
-  "update_url": "https://adblockplus.org/devbuilds/
-    {{- metadata.get('general', 'basename') -}}
-    {%- if experimentalAPI -%}
-    -experimental
-    {%- endif -%}
-    /updates.xml",
-  {%- elif metadata.has_option('general', 'updateURL') %}
-  "update_url": {{metadata.get('general', 'updateURL')|json}},
-  {%- endif %}
-
   {%- if pageAction %}
   "page_action": {
     "default_icon": {{pageAction.icon|json}},
diff --git a/packagerSafari.py b/packagerSafari.py
index 02ed566..cb4ab29 100644
--- a/packagerSafari.py
+++ b/packagerSafari.py
@@ -78,7 +78,7 @@ def createManifest(params, files):
     version=params['version'],
     releaseBuild=params['releaseBuild'],
     name=catalog['name']['message'],
-    description=catalog['description_safari']['message'],
+    description=catalog['description']['message'],
     author=get_optional('general', 'author'),
     homepage=get_optional('general', 'homepage'),
     updateURL=get_optional('general', 'updateURL'),
diff --git a/releaseAutomation.py b/releaseAutomation.py
index e90af62..bffe8b6 100644
--- a/releaseAutomation.py
+++ b/releaseAutomation.py
@@ -81,8 +81,8 @@ def run(baseDir, type, version, keyFiles, downloadsRepo):
     packager.createBuild(baseDir, type=type, outFile=buildPath, releaseBuild=True, keyFile=keyFile)
     downloads.append(buildPath)
   elif type == "chrome":
-    # We actually have to create four different builds for Chrome: signed a unsigned Chrome builds
-    # (the latter for Chrome Web Store), a signed Opera build and a signed Safari build.
+    # We actually have to create three different builds: signed and unsigned
+    # Chrome builds (the latter for Chrome Web Store), and a signed Safari build.
     metadata = packager.readMetadata(baseDir, type)
     buildPath = os.path.join(downloadsRepo, packager.getDefaultFileName(metadata, version, 'crx'))
     packager.createBuild(baseDir, type=type, outFile=buildPath, releaseBuild=True, keyFile=keyFiles[0])
@@ -91,11 +91,6 @@ def run(baseDir, type, version, keyFiles, downloadsRepo):
     buildPathUnsigned = os.path.join(baseDir, packager.getDefaultFileName(metadata, version, 'zip'))
     packager.createBuild(baseDir, type=type, outFile=buildPathUnsigned, releaseBuild=True, keyFile=None)
 
-    metadataOpera = packager.readMetadata(baseDir, "opera")
-    buildPathOpera = os.path.join(downloadsRepo, packager.getDefaultFileName(metadataOpera, version, 'crx'))
-    packager.createBuild(baseDir, type="opera", outFile=buildPathOpera, releaseBuild=True, keyFile=keyFiles[0])
-    downloads.append(buildPathOpera)
-
     import buildtools.packagerSafari as packagerSafari
     metadataSafari = packagerSafari.readMetadata(baseDir, "safari")
     buildPathSafari = os.path.join(downloadsRepo, packagerSafari.getDefaultFileName(metadataSafari, version, 'safariextz'))

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



More information about the Pkg-mozext-commits mailing list