Issue 5060 - Move require into modules template, make info a module

packagerChrome.py

 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 import errno
 import io
 import json
 import os
 import re
 from StringIO import StringIO
@@ skipping 120 matching lines @@
     # Normalize JSON structure
     licenseComment = re.compile(r'/\*.*?\*/', re.S)
     data = json.loads(re.sub(licenseComment, '', manifest, 1))
     if '_dummy' in data:
         del data['_dummy']
     manifest = json.dumps(data, sort_keys=True, indent=2)
 
     return manifest.encode('utf-8')
 
 
-def createInfoModule(params):
-    if params['type'] == 'gecko-webext':
-        template = getTemplate('geckoInfo.js.tmpl')
-    else:
-        template = getTemplate('chromeInfo.js.tmpl')
-    return template.render(params).encode('utf-8')
-
-
 def convertJS(params, files):
     output_files = collections.OrderedDict()
     args = {}
 
+    info_module = None
+    info_template = {
+        'chrome': 'chromeInfo.js.tmpl',
+        'gecko-webext': 'geckoInfo.js.tmpl'
+    }.get(params['type'])
+    if info_template:
+        info_module = getTemplate(info_template).render(
+            basename=params['metadata'].get('general', 'basename'),
+            version=params['metadata'].get('general', 'version')
+        ).decode('utf-8')
+
     for item in params['metadata'].items('convert_js'):
         name, value = item
         filename, arg = re.search(r'^(.*?)(?:\[(.*)\])?$', name).groups()
         if arg is None:
             output_files[filename] = (value.split(), item.source)
         else:
             args.setdefault(filename, {})[arg] = value
 
     template = getTemplate('modules.js.tmpl')
 
     for filename, (input_files, origin) in output_files.iteritems():
         if '/' in filename and not files.isIncluded(filename):
             continue
 
         current_args = args.get(filename, {})
         current_args['autoload'] = [module for module in
                                     current_args.get('autoload', '').split(',')
                                     if module != '']
 
         base_dir = os.path.dirname(origin)
         modules = []
 
+        if 'module' in current_args and info_module:
+            modules.append(('info', info_module))
+
         for input_filename in input_files:
             module_name = os.path.splitext(os.path.basename(input_filename))[0]
             prefix = os.path.basename(os.path.dirname(input_filename))
             if prefix != 'lib':
                 module_name = '{}_{}'.format(prefix, module_name)
             with open(os.path.join(base_dir, input_filename), 'r') as file:
                 modules.append((module_name, file.read().decode('utf-8')))
             files.pop(input_filename, None)
 
         files[filename] = template.render(
             args=current_args,
-            modules=modules
+            modules=modules,
+            basename=params['metadata'].get('general', 'basename'),
+            version=params['metadata'].get('general', 'version')
         ).encode('utf-8')
 
 
 def toJson(data):
     return json.dumps(
         data, ensure_ascii=False, sort_keys=True,
         indent=2, separators=(',', ': ')
     ).encode('utf-8') + '\n'
 
 
@@ skipping 192 matching lines @@
     files['manifest.json'] = createManifest(params, files)
     if type == 'chrome':
         fixTranslationsForCWS(files)
 
     if devenv:
         import buildtools
         import random
         files.read(os.path.join(buildtools.__path__[0], 'chromeDevenvPoller__.js'), relpath='devenvPoller__.js')
         files['devenvVersion__'] = str(random.random())
 
-    if (metadata.has_option('general', 'backgroundScripts') and
-        'lib/info.js' in metadata.get('general', 'backgroundScripts').split() and
-        'lib/info.js' not in files):
-        files['lib/info.js'] = createInfoModule(params)
-
     if metadata.has_option('general', 'testScripts'):
         files['qunit/index.html'] = createScriptPage(params, 'testIndex.html.tmpl',
                                                      ('general', 'testScripts'))
 
     zipdata = files.zipToString()
     signature = None
     pubkey = None
     if keyFile != None:
         signature = signBinary(zipdata, keyFile)
         pubkey = getPublicKey(keyFile)
     writePackage(outFile, pubkey, signature, zipdata)