wrong icons parameter value in manifest.json for chrome buildtool fix.

packagerChrome.py

 # coding: utf-8
 
 # This file is part of the Adblock Plus build tools,
 # Copyright (C) 2006-2014 Eyeo GmbH
 #
 # Adblock Plus is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License version 3 as
 # published by the Free Software Foundation.
 #
 # Adblock Plus is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with Adblock Plus.  If not, see <http://www.gnu.org/licenses/>.
 
 import sys, os, re, json, struct
 from StringIO import StringIO
 
 import packager
 from packager import readMetadata, getMetadataPath, getDefaultFileName, getBuildVersion, getTemplate, Files
-from imageConversion import convertImages, getImageSize
 
 defaultLocale = 'en_US'
 
 def getIgnoredFiles(params):
   result = set(('store.description',))
 
   # Hack: ignore all lib subdirectories
   libDir = os.path.join(params['baseDir'], 'lib')
   for file in os.listdir(libDir):
     if os.path.isdir(os.path.join(libDir, file)):
@@ skipping 32 matching lines @@
     templateData['pageAction'] = {'icon': icon, 'popup': popup}
 
   if metadata.has_option('general', 'browserAction') and metadata.get('general', 'browserAction') != '':
     if re.search(r'\s+', metadata.get('general', 'browserAction')):
       icon, popup = re.split(r'\s+', metadata.get('general', 'browserAction'), 1)
     else:
       icon, popup = (metadata.get('general', 'browserAction'), None)
     templateData['browserAction'] = {'icon': icon, 'popup': popup}
 
   if metadata.has_option('general', 'icons'):
+    from PIL import Image
     icons = {}
     for icon in re.split('\s+', metadata.get('general', 'icons')):
-      iconSize = getImageSize(files[icon])

[Wladimir Palant, 2014/03/19 12:11:48]

Please use destructuring assignment here, that's easier to read:

  width, height = getImageSize(files[icon])

[saroyanm, 2014/03/19 14:54:18]

Done.

-      if(iconSize[0] != iconSize[1]):
-        print 'Warning: %s size is %ix%i, icon should be square' % (icon, iconSize[0], iconSize[1])
-      icons[iconSize[0]] = icon
+      width, height = Image.open(StringIO(files[icon])).size
+      if(width != height):
+        print 'Warning: %s size is %ix%i, icon should be square' % (icon, width, height)

[Wladimir Palant, 2014/03/19 21:23:06]

Errors and warnings should go to stderr:

  print >>sys.stderr, ...

+      icons[width] = icon
     templateData['icons'] = icons
 
   if metadata.has_option('general', 'permissions'):
     templateData['permissions'] = re.split(r'\s+', metadata.get('general', 'permissions'))
     if params['experimentalAPI']:
       templateData['permissions'].append('experimental')
 
   if metadata.has_option('general', 'backgroundScripts'):
     templateData['backgroundScripts'] = re.split(r'\s+', metadata.get('general', 'backgroundScripts'))
     if params['devenv']:
@@ skipping 249 matching lines @@
                 process=lambda path, data: processFile(path, data, params))
   
   if metadata.has_section('mapping'):
     files.readMappedFiles(metadata.items('mapping'))
   files.read(baseDir)
 
   if metadata.has_section('convert_js'):
     convertJS(params, files)
 
   if metadata.has_section('convert_img'):
+    from imageConversion import convertImages
     convertImages(params, files)
 
   if metadata.has_section('preprocess'):
     files.preprocess(
       [f for f, _ in metadata.items('preprocess')],
       {'needsExt': True}
     )
 
   if metadata.has_section('import_locales'):
     importGeckoLocales(params, files)
@@ skipping 42 matching lines @@
   def shutdown_server(server):
     time.sleep(10)
     server.shutdown()
   thread.start_new_thread(shutdown_server, (server,))
   server.serve_forever()
 
   if connections[0] == 0:
     print 'Warning: No incoming connections, extension probably not active in the browser yet'
   else:
     print 'Handled %i connection(s)' % connections[0]