Prepared buildtools for Safari

packagerChrome.py

 # coding: utf-8
 
 # This file is part of the Adblock Plus build tools,
 # Copyright (C) 2006-2013 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 16 matching lines @@
   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)):
       result.add(file)
   return result
 
 def getPackageFiles(params):
-  result = set(('_locales', 'icons', 'jquery-ui', 'lib', 'skin', 'ui',))
+  result = set(('_locales', 'icons', 'jquery-ui', 'lib', 'skin', 'ui', 'ext'))
 
   if params['devenv']:
     result.add('qunit')
 
   baseDir = params['baseDir']
   for file in os.listdir(baseDir):
     if file.endswith('.js') or file.endswith('.html') or file.endswith('.xml'):
       result.add(file)
   return result
 
@@ skipping 104 matching lines @@
     except ValueError:
       pass
 
     # Source files of the conversion shouldn't be part of the build
     for sourceFile in sourceFiles:
       if sourceFile in files:
         del files[sourceFile]
 
     sourceFiles = map(lambda f: os.path.abspath(os.path.join(baseDir, f)), sourceFiles)
     files[file] = doRewrite(sourceFiles, args)
-
-def convertFirstRunPage(params, files):

[Felix Dahlke, 2013/10/15 16:24:38]

As I said in the other review, I think it'd be fine to just always use a
template for the first run page.

[Sebastian Noack, 2013/10/15 17:06:56]

My intention was to don't make the change on the first run page depend on the
change on the buildtools and vice versa. So the firstRun.html will just work
like before, without processing it with jinja2.

In my experience it is always a mess to require two repositories that depend on
each other, to be updated at the same time. For example the changes on the
Firefox extension, would have to update the revision of the buildtools the
subrepo reffers to, to a version that doesn't exist yet. We also would have to
update the Chrome repo at the time we merge this (don't know about IE), if we
require the first run page to be always generated.

What do you think? I think it would be better to do it in two steps, if we want
the first run page to be always generated.

[Felix Dahlke, 2013/10/15 22:46:11]

Fair enough, sure.

-  import jinja2
-
-  env = jinja2.Environment(
-    block_start_string='<!-- {%',
-    block_end_string='%} -->',
-    variable_start_string='<!-- {{',
-    variable_end_string='}} -->',
-    comment_start_string='<-- {#',
-    comment_end_string='#} -->',
-
-        trim_blocks=True,

[Felix Dahlke, 2013/10/15 16:24:38]

Seems like the indentation is off here.

[Sebastian Noack, 2013/10/15 17:06:56]

True, I'll fix that.

-        lstrip_blocks=True
-  )
-
-  files['firstRun.html'] = env.from_string(files['firstRun.html']).render(type=params['type'])
 
 def importGeckoLocales(params, files):
   import localeTools
 
   localeCodeMapping = {
     'ar': 'ar',
     'bg': 'bg',
     'ca': 'ca',
     'cs': 'cs',
     'da': 'da',
@@ skipping 100 matching lines @@
       'pt': 'pt_PT',
     }
     for chromeLocale, operaLocale in operaMapping.iteritems():
       chromeFile = '_locales/%s/messages.json' % chromeLocale
       operaFile = '_locales/%s/messages.json' % operaLocale if operaLocale != None else None
       if chromeFile in files:
         if operaFile != None:
           files[operaFile] = files[chromeFile]
         del files[chromeFile]
 
-  if params['type'] in ('opera', 'safari'):
-    # Hack: Replace "Chrome" by "Opera" or "Safari" in the locales
-    for path, data in files.iteritems():
-      if path.startswith("_locales/") and path.endswith("/messages.json"):
-        files[path] = re.sub(r"\bChrome\b", params['type'].capitalize(), data)
-
 def signBinary(zipdata, keyFile):
   import M2Crypto
   if not os.path.exists(keyFile):
     M2Crypto.RSA.gen_key(1024, 65537, callback=lambda x: None).save_key(keyFile, cipher=None)
   key = M2Crypto.EVP.load_key(keyFile)
   key.sign_init()
   key.sign_update(zipdata)
   return key.final()
 
 def getPublicKey(keyFile):
@@ skipping 35 matching lines @@
     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 'firstRun.html' in files:
-    convertFirstRunPage(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)
 
   if devenv:
     files['devenvPoller__.js'] = createPoller(params)
 
   if (metadata.has_option('general', 'backgroundScripts') and
       'lib/info.js' in re.split(r'\s+', metadata.get('general', 'backgroundScripts')) and
       'lib/info.js' not in files):
@@ skipping 32 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]