wuggy/Dactyloidae
wuggy/Dactyloidae
1
0
Fork 0
mirror of https://repo.dactyloidae.xyz/Dactyloidae/UXP.git synced 2026-10-31 11:37:30 +09:00
Code Issues Projects Releases Packages Wiki Activity

Move the MOZ_DISABLE_PRECOMPILED_STARTUPCACHE check.

Browse source
This commit is contained in:
wolfbeast 2018-06-01 23:14:53 +02:00 • committed by Roy Tam
commit 7350bb0399
1 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

22
toolkit/mozapps/installer/packager.py
View file

@ -156,16 +156,15 @@ def precompile_cache(registry, source_path, gre_path, app_path):
extra_env['TSAN_OPTIONS'] = 'report_bugs=0' extra_env['TSAN_OPTIONS'] = 'report_bugs=0'
if buildconfig.substs.get('MOZ_ASAN'): if buildconfig.substs.get('MOZ_ASAN'):
extra_env['ASAN_OPTIONS'] = 'detect_leaks=0' extra_env['ASAN_OPTIONS'] = 'detect_leaks=0'
if buildconfig.substs.get('MOZ_DISABLE_PRECOMPILED_STARTUPCACHE') != '1': if launcher.launch(['xpcshell', '-g', gre_path, '-a', app_path,
if launcher.launch(['xpcshell', '-g', gre_path, '-a', app_path, '-f', os.path.join(os.path.dirname(__file__),
'-f', os.path.join(os.path.dirname(__file__), 'precompile_cache.js'),
'precompile_cache.js'), '-e', 'precompile_startupcache("resource://%s/");'
'-e', 'precompile_startupcache("resource://%s/");' % resource],
% resource], extra_linker_path=gre_path,
extra_linker_path=gre_path, extra_env=extra_env):
extra_env=extra_env): errors.fatal('Error while running startup cache precompilation')
errors.fatal('Error while running startup cache precompilation') return
return
from mozpack.mozjar import JarReader from mozpack.mozjar import JarReader
jar = JarReader(cache) jar = JarReader(cache)
resource = '/resource/%s/' % resource resource = '/resource/%s/' % resource
@ -392,7 +391,8 @@ def main():
# Fill startup cache # Fill startup cache
if isinstance(formatter, OmniJarFormatter) and launcher.can_launch() \ if isinstance(formatter, OmniJarFormatter) and launcher.can_launch() \
and buildconfig.substs['MOZ_DISABLE_STARTUPCACHE'] != '1': and buildconfig.substs['MOZ_DISABLE_STARTUPCACHE'] != '1' \
and buildconfig.substs['MOZ_DISABLE_PRECOMPILED_STARTUPCACHE'] != '1':
gre_path = None gre_path = None
def get_bases(): def get_bases():
for b in sink.packager.get_bases(addons=False): for b in sink.packager.get_bases(addons=False):