--- a/python/mozbuild/mozbuild/artifacts.py
+++ b/python/mozbuild/mozbuild/artifacts.py
@@ -210,16 +210,17 @@ class LinuxArtifactJob(ArtifactJob):
'firefox/crashreporter',
'firefox/dependentlibs.list',
'firefox/firefox',
'firefox/firefox-bin',
'firefox/platform.ini',
'firefox/firefox-webcontent',
'firefox/updater',
'firefox/**/*.so',
+ mozpath.join('firefox', buildconfig.substs.get('ICU_DATA_FILE')),
}
def process_package_artifact(self, filename, processed_filename):
added_entry = False
with JarWriter(file=processed_filename, optimize=False, compress_level=5) as writer:
with tarfile.open(filename) as reader:
for f in reader:
@@ -301,16 +302,17 @@ class MacArtifactJob(ArtifactJob):
# These get copied into dist/bin with the path, so "root/a/b/c" -> "dist/bin/a/b/c".
paths_keep_path = ('Contents/Resources', [
'browser/components/libbrowsercomps.dylib',
'dependentlibs.list',
# 'firefox',
'gmp-clearkey/0.1/libclearkey.dylib',
# 'gmp-fake/1.0/libfake.dylib',
# 'gmp-fakeopenh264/1.0/libfakeopenh264.dylib',
+ buildconfig.substs.get('ICU_DATA_FILE'),
])
with JarWriter(file=processed_filename, optimize=False, compress_level=5) as writer:
root, paths = paths_no_keep_path
finder = FileFinder(mozpath.join(source, root))
for path in paths:
for p, f in finder.find(path):
self.log(logging.INFO, 'artifact',
@@ -341,16 +343,17 @@ class MacArtifactJob(ArtifactJob):
class WinArtifactJob(ArtifactJob):
package_artifact_patterns = {
'firefox/dependentlibs.list',
'firefox/platform.ini',
'firefox/application.ini',
'firefox/**/*.dll',
'firefox/*.exe',
+ mozpath.join('firefox', buildconfig.substs.get('ICU_DATA_FILE')),
}
# These are a subset of TEST_HARNESS_BINS in testing/mochitest/Makefile.in.
test_artifact_patterns = {
('bin/BadCertServer.exe', ('bin', 'bin')),
('bin/GenerateOCSPResponse.exe', ('bin', 'bin')),
('bin/OCSPStaplingServer.exe', ('bin', 'bin')),
('bin/certutil.exe', ('bin', 'bin')),
('bin/fileid.exe', ('bin', 'bin')),