Allow to specify the default icon for browserActions and pageActions in multiple sizes

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,
@@ skipping 32 matching lines @@
   for file in os.listdir(baseDir):
     if file.endswith('.js') or file.endswith('.html') or file.endswith('.xml'):
       result.add(file)
   return result
 
 def processFile(path, data, params):
   # We don't change anything yet, this function currently only exists here so
   # that it can be overridden if necessary.
   return data
 
+def makeIcons(files, filenames):
+    from PIL import Image
+    icons = {}
+    for filename in filenames:
+      width, height = Image.open(StringIO(files[filename])).size
+      if(width != height):
+        print >>sys.stderr, 'Warning: %s size is %ix%i, icon should be square' % (filename, width, height)
+      icons[width] = filename
+    return icons
+
 def createManifest(params, files):
   template = getTemplate('manifest.json.tmpl')
   templateData = dict(params)
 
   baseDir = templateData['baseDir']
   metadata = templateData['metadata']
 
-  if metadata.has_option('general', 'pageAction') and metadata.get('general', 'pageAction') != '':
-    if re.search(r'\s+', metadata.get('general', 'pageAction')):
-      icon, popup = re.split(r'\s+', metadata.get('general', 'pageAction'), 1)
+  for opt in ('browserAction', 'pageAction'):
+    if not metadata.has_option('general', opt):
+      continue
+
+    icons = metadata.get('general', opt).split()
+    if not icons:
+      continue
+
+    if len(icons) == 1:
+      # ... = icon.png
+      icon, popup = icons[0], None
+    elif len(icons) == 2:
+      # ... = icon.png popup.html
+      icon, popup = icons
     else:
-      icon, popup = (metadata.get('general', 'pageAction'), None)
-    templateData['pageAction'] = {'icon': icon, 'popup': popup}
+      # ... = icon-19.png icon-38.png popup.html
+      popup = icons.pop()
+      icon = makeIcons(files, icons)
 
-  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}
+    templateData[opt] = {'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')):
-      width, height = Image.open(StringIO(files[icon])).size
-      if(width != height):
-        print >>sys.stderr, 'Warning: %s size is %ix%i, icon should be square' % (icon, width, height)
-      icons[width] = icon
-    templateData['icons'] = icons
+    templateData['icons'] = makeIcons(files, metadata.get('general', 'icons').split())
 
   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']:
       templateData['backgroundScripts'].append('devenvPoller__.js')
@@ skipping 311 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]