Bug 1371871 - Do not install unnecessary files in an artifact build. draft
authorChris Manchester <cmanchester@mozilla.com>
Wed, 21 Jun 2017 16:20:18 -0700
changeset 598645 a5d66ebbe3692096b04535886aafaadb4619eb50
parent 598644 cbce12ec8e2232811a0500a531d8a50ca6d08c4b
child 598646 3af24b6905885eda186f3c0b155bc560a5fdb2e9
push id65269
push userbmo:cmanchester@mozilla.com
push dateWed, 21 Jun 2017 23:20:46 +0000
bugs1371871
milestone56.0a1
Bug 1371871 - Do not install unnecessary files in an artifact build. This prevents us from redundantly installing httpd.js and httpd.manifest from the test package during an artifact build, which interferes with the Tup backend's handling of these files as symlinks. MozReview-Commit-ID: LuMurUc1P36
python/mozbuild/mozbuild/artifacts.py
--- a/python/mozbuild/mozbuild/artifacts.py
+++ b/python/mozbuild/mozbuild/artifacts.py
@@ -133,17 +133,17 @@ class ArtifactJob(object):
         ('bin/fileid', ('bin', 'bin')),
         ('bin/geckodriver', ('bin', 'bin')),
         ('bin/pk12util', ('bin', 'bin')),
         ('bin/screentopng', ('bin', 'bin')),
         ('bin/ssltunnel', ('bin', 'bin')),
         ('bin/xpcshell', ('bin', 'bin')),
         ('bin/plugins/gmp-*/*/*', ('bin/plugins', 'bin')),
         ('bin/plugins/*', ('bin/plugins', 'plugins')),
-        ('bin/components/*', ('bin/components', 'bin/components')),
+        ('bin/components/*.xpt', ('bin/components', 'bin/components')),
     }
 
     # We can tell our input is a test archive by this suffix, which happens to
     # be the same across platforms.
     _test_archive_suffix = '.common.tests.zip'
 
     def __init__(self, package_re, tests_re, log=None, download_symbols=False, substs=None):
         self._package_re = re.compile(package_re)