Issue 3498 - Improve file mapping / skipping logic

packagerChrome.py

 # coding: utf-8
 
 # 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 sys
 import os
 import re
 import json
@@ skipping 308 matching lines @@
   params = {
     'type': type,
     'baseDir': baseDir,
     'releaseBuild': releaseBuild,
     'version': version,
     'experimentalAPI': experimentalAPI,
     'devenv': devenv,
     'metadata': metadata,
   }
 
-  if metadata.has_option('general', 'skippedPackageFiles'):
-    skip = re.split(r'\s+', metadata.get('general', 'skippedPackageFiles'))
-  else:
-    skip = []

[Wladimir Palant, 2016/01/12 12:16:33]

Please don't introduce a new option for that.

  skip = metadata.options('mapping') if metadata.has_section('mapping') else []

Note that the same logic has to be added to the other packagers as well.

[kzar, 2016/01/12 13:09:47]

Ah, much better idea, Done.

-
+  mapped = metadata.items('mapping') if metadata.has_section('mapping') else []
   files = Files(getPackageFiles(params), getIgnoredFiles(params),
                 process=lambda path, data: processFile(path, data, params))
-  files.read(baseDir, skip=skip)

[Wladimir Palant, 2016/01/12 12:16:33]

Things become inconsistent if you move this up, other packagers read mapped
files first. While I'm not sure why we did it like this, the order should be
changed everywhere or nowhere. I'm leaning towards nowhere, there doesn't seem
to be a good reason for it.

[kzar, 2016/01/12 13:09:47]

Yes I agree and it no longer matters now that we automatically skip mapped files
anyway.

-
-  if metadata.has_section('mapping'):
-    files.readMappedFiles(metadata.items('mapping'))
+
+  files.readMappedFiles(mapped)
+  files.read(baseDir, skip=[opt for opt, _ in mapped])
 
   if metadata.has_section('convert_js'):
     convertJS(params, files)
 
   if metadata.has_section('convert_img'):
     from imageConversion import convertImages
     convertImages(params, files)
 
   if metadata.has_section('preprocess'):
     files.preprocess(
@@ skipping 23 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)