[Pkg-mozext-commits] [adblock-plus] 243/464: Dropped support for extensions with an inner JAR file

[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 2b5b99ac2cbf3d7e2037cac911d629fe04f73327
Author: Wladimir Palant <trev at adblockplus.org>
Date:   Thu Jun 14 16:49:45 2012 +0200

    Dropped support for extensions with an inner JAR file
---
 packager.py | 35 ++++++-----------------------------
 1 file changed, 6 insertions(+), 29 deletions(-)

diff --git a/packager.py b/packager.py
index d5d3f10..d6acdc6 100644
--- a/packager.py
+++ b/packager.py
@@ -187,10 +187,7 @@ def fixupLocales(baseDir, files, params):
 
   for locale in params['locales']:
     for file in reference.iterkeys():
-      if params['noJar']:
-        path = 'chrome/locale/%s/%s' % (locale, file)
-      else:
-        path = 'locale/%s/%s' % (locale, file)
+      path = 'chrome/locale/%s/%s' % (locale, file)
       if path in files:
         data = localeTools.parseString(files[path].decode('utf-8'), path)
         for key, value in reference[file].iteritems():
@@ -199,22 +196,6 @@ def fixupLocales(baseDir, files, params):
       else:
         files[path] = reference[file]['_origData'].encode('utf-8')
 
-def createChromeJar(baseDir, params, files=None):
-  if not files:
-    files = {}
-  for name, path in getChromeSubdirs(baseDir, params['locales']).iteritems():
-    if os.path.isdir(path):
-      readFile(files, params, path, name)
-  if not params['limitMetadata']:
-    fixupLocales(baseDir, files, params)
-
-  data = StringIO()
-  jar = ZipFile(data, 'w', ZIP_STORED)
-  for name, value in files.iteritems():
-    jar.writestr(name, value)
-  jar.close()
-  return data.getvalue()
-
 def readXPIFiles(baseDir, params, files):
   for path in getXPIFiles(baseDir):
     if os.path.exists(path):
@@ -359,18 +340,14 @@ def createBuild(baseDir, outFile=None, locales=None, buildNum=None, releaseBuild
     'version': version.encode('utf-8'),
     'metadata': metadata,
     'limitMetadata': limitMetadata,
-    'noJar': metadata.has_option('general', 'nojar'),
   }
   files = {}
   files['install.rdf'] = createManifest(baseDir, params)
-  if params['noJar']:
-    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)
-  else:
-    files['chrome/%s.jar' % metadata.get('general', 'baseName')] = createChromeJar(baseDir, params)
+  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)
   readXPIFiles(baseDir, params, files)
   if metadata.has_option('general', 'restartless') and 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