Bug 1264817 - Traverse nspr and icu during disable compile environment builds now that we aren't using their build systems. r=glandium
This also allows us to use the in-tree icu data file for artifact builds.
MozReview-Commit-ID: 4FWd7PV4ONC
--- a/moz.build
+++ b/moz.build
@@ -47,38 +47,40 @@ if not CONFIG['JS_STANDALONE']:
DIRS += [
'build',
'probes',
]
DIRS += [
'config/external/fdlibm',
+ 'config/external/nspr',
'config/external/zlib',
'memory',
'mfbt',
'mozglue',
]
if not CONFIG['JS_STANDALONE']:
DIRS += ['xpcom/xpidl']
+if CONFIG['USE_ICU']:
+ DIRS += ['config/external/icu']
+
if CONFIG['COMPILE_ENVIRONMENT']:
- DIRS += ['config/external/nspr']
if not CONFIG['JS_STANDALONE']:
DIRS += [
'config/external',
'config/external/nss',
]
if CONFIG['BUILD_CTYPES']:
DIRS += ['config/external/ffi']
- if CONFIG['USE_ICU']:
- DIRS += ['config/external/icu']
+
DIRS += ['js/src']
else:
TEST_DIRS += ['js/src/tests']
if not CONFIG['JS_STANDALONE'] and CONFIG['MOZ_BUILD_APP']:
# Bring in the configuration for the configured application.
include('/' + CONFIG['MOZ_BUILD_APP'] + '/app.mozbuild')
--- a/python/mozbuild/mozbuild/artifacts.py
+++ b/python/mozbuild/mozbuild/artifacts.py
@@ -210,17 +210,16 @@ class LinuxArtifactJob(ArtifactJob):
'firefox/crashreporter',
'firefox/dependentlibs.list',
'firefox/firefox',
'firefox/firefox-bin',
'firefox/platform.ini',
'firefox/plugin-container',
'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:
@@ -302,17 +301,16 @@ 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',
@@ -343,17 +341,16 @@ 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')),