Issue 4047 - Improved configuration of converted JS files

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
 import struct
 import sys
+import collections
 
 import packager
 from packager import readMetadata, getMetadataPath, getDefaultFileName, getBuildVersion, getTemplate, Files
 
 defaultLocale = 'en_US'
 
 
 def getIgnoredFiles(params):
     return {'store.description'}
 
@@ skipping 115 matching lines @@
 
 
 def createInfoModule(params):
     template = getTemplate('chromeInfo.js.tmpl')
     return template.render(params).encode('utf-8')
 
 
 def convertJS(params, files):
     from jshydra.abp_rewrite import rewrite_js
 
+    output_files = collections.OrderedDict()
+    args = collections.defaultdict(lambda: [])

[Vasily Kuznetsov, 2016/08/30 14:13:52]

This could be `collections.defaultdict(list)`.

[Sebastian Noack, 2016/08/30 14:23:06]

Done.

+
     for item in params['metadata'].items('convert_js'):
-        file, sources = item
-        baseDir = os.path.dirname(item.source)
+        filename, arg = re.search(r'^(.*?)(?:\[(.*)\])?$', item[0]).groups()
+        if arg is None:
+            output_files[filename] = (item[1].split(), item.source)
+        else:
+            args[filename].append('{}={}'.format(arg, item[1]))
 
-        # Make sure the file is inside an included directory
-        if '/' in file and not files.isIncluded(file):
+    for filename, (input_files, origin) in output_files.iteritems():
+        if '/' in filename and not files.isIncluded(filename):
             continue
 
-        sourceFiles = sources.split()
-        args = []
-        try:
-            argsStart = sourceFiles.index('--arg')
-            args = sourceFiles[argsStart + 1:]
-            sourceFiles = sourceFiles[0:argsStart]
-        except ValueError:
-            pass
+        base_dir = os.path.dirname(origin)
+        jshydra_args = ['--arg', ' '.join(args[filename])]
 
-        # Source files of the conversion shouldn't be part of the build
-        for sourceFile in sourceFiles:
-            if sourceFile in files:
-                del files[sourceFile]
+        for input_filename in input_files:
+            jshydra_args.append(os.path.join(base_dir, input_filename))
+            files.pop(input_filename, None)
 
-        sourceFiles = map(lambda f: os.path.abspath(os.path.join(baseDir, f)), sourceFiles)
-        files[file] = rewrite_js(['--arg', ' '.join(args)] + sourceFiles)
+        files[filename] = rewrite_js(jshydra_args)
 
 
 def toJson(data):
     return json.dumps(
         data, ensure_ascii=False, sort_keys=True,
         indent=2, separators=(',', ': ')
     ).encode('utf-8') + '\n'
 
 
 def importGeckoLocales(params, files):
@@ skipping 203 matching lines @@
         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)