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 141 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):
-  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,
-    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]