[Pkg-mozext-commits] [adblock-plus] 350/464: Removed leftovers of Babelzilla integration

[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 ba8e8aa77008ee236ea5a339dd787154d933516e
Author: Wladimir Palant <trev at adblockplus.org>
Date:   Thu Jan 10 08:44:39 2013 +0100

    Removed leftovers of Babelzilla integration
---
 build.py         |  3 +--
 install.rdf.tmpl |  2 --
 packagerGecko.py | 15 +++------------
 3 files changed, 4 insertions(+), 16 deletions(-)

diff --git a/build.py b/build.py
index 6a72547..d0937dd 100644
--- a/build.py
+++ b/build.py
@@ -170,7 +170,6 @@ def runBuild(baseDir, scriptName, opts, args, type):
   multicompartment = False
   releaseBuild = False
   keyFile = None
-  limitMetadata = False
   experimentalAPI = False
   for option, value in opts:
     if option in ('-l', '--locales'):
@@ -191,7 +190,7 @@ def runBuild(baseDir, scriptName, opts, args, type):
     import buildtools.packagerGecko as packager
     packager.createBuild(baseDir, outFile=outFile, locales=locales, buildNum=buildNum,
                          releaseBuild=releaseBuild, keyFile=keyFile,
-                         limitMetadata=limitMetadata, multicompartment=multicompartment)
+                         multicompartment=multicompartment)
   elif type == 'chrome':
     import buildtools.packagerChrome as packager
     packager.createBuild(baseDir, outFile=outFile, buildNum=buildNum,
diff --git a/install.rdf.tmpl b/install.rdf.tmpl
index a9dc943..2901fb0 100644
--- a/install.rdf.tmpl
+++ b/install.rdf.tmpl
@@ -62,7 +62,6 @@
     <em:optionsType>{{metadata.get('general', 'optionsType')}}</em:optionsType>
     {%- endif %}
 
-    {%- if not limitMetadata %}
     {%- for localeCode in localeMetadata.keys()|sort %}
     {%- set locale = localeMetadata[localeCode] %}
     <em:localized>
@@ -100,7 +99,6 @@
       </Description>
     </em:localized>
     {%- endfor %}
-    {%- endif %}
 
     {%- for appName in metadata.options('compat')|sort %}
     {%- if appName in KNOWN_APPS %}
diff --git a/packagerGecko.py b/packagerGecko.py
index 4efa016..ba7d982 100644
--- a/packagerGecko.py
+++ b/packagerGecko.py
@@ -63,9 +63,7 @@ def getXPIFiles(baseDir):
       yield os.path.join(baseDir, file)
 
 def getIgnoredFiles(params):
-  result = ['.incomplete']
-  if not params['limitMetadata']:
-    result.append('meta.properties')
+  result = ['.incomplete', 'meta.properties']
   if params['releaseBuild']:
     result.append('timeline.js')
   return result
@@ -323,7 +321,7 @@ def writeXPI(files, outFile):
     zip.writestr(name, files[name])
   zip.close()
 
-def createBuild(baseDir, outFile=None, locales=None, buildNum=None, releaseBuild=False, keyFile=None, limitMetadata=False, multicompartment=False):
+def createBuild(baseDir, outFile=None, locales=None, buildNum=None, releaseBuild=False, keyFile=None, multicompartment=False):
   if locales == None:
     locales = getLocales(baseDir)
   elif locales == 'all':
@@ -332,11 +330,6 @@ def createBuild(baseDir, outFile=None, locales=None, buildNum=None, releaseBuild
   metadata = readMetadata(baseDir)
   version = getBuildVersion(baseDir, metadata, releaseBuild, buildNum)
 
-  if limitMetadata:
-    for option in metadata.options('compat'):
-      if not option in ('firefox', 'thunderbird', 'seamonkey'):
-        metadata.remove_option('compat', option)
-
   if outFile == None:
     outFile = getDefaultFileName(baseDir, metadata, version, 'xpi')
 
@@ -347,7 +340,6 @@ def createBuild(baseDir, outFile=None, locales=None, buildNum=None, releaseBuild
     'releaseBuild': releaseBuild,
     'version': version.encode('utf-8'),
     'metadata': metadata,
-    'limitMetadata': limitMetadata,
     'contributors': contributors,
     'multicompartment': multicompartment,
   }
@@ -356,8 +348,7 @@ def createBuild(baseDir, outFile=None, locales=None, buildNum=None, releaseBuild
   for name, path in getChromeSubdirs(baseDir, params['locales']).iteritems():
     if os.path.isdir(path):
       readFile(files, params, path, 'chrome/%s' % name)
-  if not params['limitMetadata']:
-    fixupLocales(baseDir, files, params)
+  fixupLocales(baseDir, files, params)
   readXPIFiles(baseDir, params, files)
   if not 'bootstrap.js' in files:
     addMissingFiles(baseDir, params, files)

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