Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-25 22:01:30 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1053085 part 2 - Move config environment fiddling out of MozbuildSandbox initialization. r=gps

Browse Source
This commit is contained in:
Mike Hommey 2014-08-15 13:52:17 +09:00
parent f59aeb3693
commit ba323eb329
3 changed files with 30 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
python/mozbuild/mozbuild/frontend/reader.py
View File

@ -113,12 +113,13 @@ class MozbuildSandbox(Sandbox):
We expose a few useful functions and expose the set of variables defining
Mozilla's build system.
"""
def __init__(self, config, path, metadata={}):
def __init__(self, config, reldir, metadata={}):
"""Create an empty mozbuild Sandbox.
config is a ConfigStatus instance (the output of configure). path is
the path of the main mozbuild file that is being executed. It is used
to compute encountered relative paths.
config is a ConfigStatus instance (the output of configure). reldir is
the path of the directory containing the main mozbuild file that is
being executed, relative to the topsrcdir. It is used to compute
encountered relative paths.
"""
Sandbox.__init__(self, allowed_variables=VARIABLES)
@ -126,29 +127,9 @@ class MozbuildSandbox(Sandbox):
self.metadata = dict(metadata)
topobjdir = config.topobjdir
if not mozpath.basedir(path, [config.topsrcdir]):
external = config.external_source_dir
if external and mozpath.basedir(path, [external]):
config = ConfigEnvironment.from_config_status(
mozpath.join(topobjdir, 'config.status'))
config.topsrcdir = external
config.external_source_dir = None
topsrcdir = config.topsrcdir
relpath = mozpath.relpath(path, topsrcdir)
reldir = mozpath.dirname(relpath)
if mozpath.dirname(relpath) == 'js/src' and \
not config.substs.get('JS_STANDALONE'):
config = ConfigEnvironment.from_config_status(
mozpath.join(topobjdir, reldir, 'config.status'))
config.topobjdir = topobjdir
config.external_source_dir = None
self.config = config
topobjdir = config.topobjdir
topsrcdir = config.topsrcdir
with self._globals.allow_all_writes() as d:
d['TOPSRCDIR'] = topsrcdir
@ -776,7 +757,28 @@ class BuildReader(object):
self._read_files.add(path)
time_start = time.time()
sandbox = MozbuildSandbox(config, path, metadata=metadata)
topobjdir = config.topobjdir
if not mozpath.basedir(path, [config.topsrcdir]):
external = config.external_source_dir
if external and mozpath.basedir(path, [external]):
config = ConfigEnvironment.from_config_status(
mozpath.join(topobjdir, 'config.status'))
config.topsrcdir = external
config.external_source_dir = None
relpath = mozpath.relpath(path, config.topsrcdir)
reldir = mozpath.dirname(relpath)
if mozpath.dirname(relpath) == 'js/src' and \
not config.substs.get('JS_STANDALONE'):
config = ConfigEnvironment.from_config_status(
mozpath.join(topobjdir, reldir, 'config.status'))
config.topobjdir = topobjdir
config.external_source_dir = None
sandbox = MozbuildSandbox(config, reldir, metadata=metadata)
sandbox.exec_file(path, filesystem_absolute=filesystem_absolute)
sandbox.execution_time = time.time() - time_start

5
python/mozbuild/mozbuild/test/common.py
View File

@ -4,8 +4,6 @@
from __future__ import unicode_literals
import os
from mach.logging import LoggingManager
from mozbuild.util import ReadOnlyDict
@ -37,6 +35,3 @@ class MockConfig(object):
self.defines = self.substs
self.external_source_dir = None
def child_path(self, p):
return os.path.join(self.topsrcdir, p)

2
python/mozbuild/mozbuild/test/frontend/test_sandbox.py
View File

@ -43,7 +43,7 @@ class TestSandbox(unittest.TestCase):
else:
config = MockConfig()
return MozbuildSandbox(config, config.child_path(relpath))
return MozbuildSandbox(config, mozpath.dirname(relpath))
def test_default_state(self):
sandbox = self.sandbox()