зеркало из https://github.com/mozilla/gecko-dev.git
Bug 778236 - Remove EXTERNAL_MAKE_DIRS and PARALLEL_EXTERNAL_MAKE_DIRS. r=gps
This commit is contained in:
Родитель
4b94156b00
Коммит
f31e7b8bc4
|
@ -891,17 +891,6 @@ class RecursiveMakeBackend(CommonBackend):
|
||||||
self._traversal.add(backend_file.relobjdir,
|
self._traversal.add(backend_file.relobjdir,
|
||||||
tools=relativize(obj.test_tool_dirs))
|
tools=relativize(obj.test_tool_dirs))
|
||||||
|
|
||||||
if len(obj.external_make_dirs):
|
|
||||||
fh.write('DIRS += %s\n' % ' '.join(obj.external_make_dirs))
|
|
||||||
self._traversal.add(backend_file.relobjdir,
|
|
||||||
dirs=relativize(obj.external_make_dirs))
|
|
||||||
|
|
||||||
if len(obj.parallel_external_make_dirs):
|
|
||||||
fh.write('PARALLEL_DIRS += %s\n' %
|
|
||||||
' '.join(obj.parallel_external_make_dirs))
|
|
||||||
self._traversal.add(backend_file.relobjdir,
|
|
||||||
parallel=relativize(obj.parallel_external_make_dirs))
|
|
||||||
|
|
||||||
# The directory needs to be registered whether subdirectories have been
|
# The directory needs to be registered whether subdirectories have been
|
||||||
# registered or not.
|
# registered or not.
|
||||||
self._traversal.add(backend_file.relobjdir)
|
self._traversal.add(backend_file.relobjdir)
|
||||||
|
|
|
@ -102,8 +102,6 @@ class DirectoryTraversal(SandboxDerived):
|
||||||
'test_tool_dirs',
|
'test_tool_dirs',
|
||||||
'tier_dirs',
|
'tier_dirs',
|
||||||
'tier_static_dirs',
|
'tier_static_dirs',
|
||||||
'external_make_dirs',
|
|
||||||
'parallel_external_make_dirs',
|
|
||||||
)
|
)
|
||||||
|
|
||||||
def __init__(self, sandbox):
|
def __init__(self, sandbox):
|
||||||
|
@ -116,8 +114,6 @@ class DirectoryTraversal(SandboxDerived):
|
||||||
self.test_tool_dirs = []
|
self.test_tool_dirs = []
|
||||||
self.tier_dirs = OrderedDict()
|
self.tier_dirs = OrderedDict()
|
||||||
self.tier_static_dirs = OrderedDict()
|
self.tier_static_dirs = OrderedDict()
|
||||||
self.external_make_dirs = []
|
|
||||||
self.parallel_external_make_dirs = []
|
|
||||||
|
|
||||||
|
|
||||||
class BaseConfigSubstitution(SandboxDerived):
|
class BaseConfigSubstitution(SandboxDerived):
|
||||||
|
|
|
@ -495,8 +495,6 @@ class TreeMetadataEmitter(LoggingMixin):
|
||||||
o.tool_dirs = sandbox.get('TOOL_DIRS', [])
|
o.tool_dirs = sandbox.get('TOOL_DIRS', [])
|
||||||
o.test_dirs = sandbox.get('TEST_DIRS', [])
|
o.test_dirs = sandbox.get('TEST_DIRS', [])
|
||||||
o.test_tool_dirs = sandbox.get('TEST_TOOL_DIRS', [])
|
o.test_tool_dirs = sandbox.get('TEST_TOOL_DIRS', [])
|
||||||
o.external_make_dirs = sandbox.get('EXTERNAL_MAKE_DIRS', [])
|
|
||||||
o.parallel_external_make_dirs = sandbox.get('PARALLEL_EXTERNAL_MAKE_DIRS', [])
|
|
||||||
o.is_tool_dir = sandbox.get('IS_TOOL_DIR', False)
|
o.is_tool_dir = sandbox.get('IS_TOOL_DIR', False)
|
||||||
o.affected_tiers = sandbox.get_affected_tiers()
|
o.affected_tiers = sandbox.get_affected_tiers()
|
||||||
|
|
||||||
|
|
|
@ -760,8 +760,8 @@ class BuildReader(object):
|
||||||
gyp_sandboxes.extend(read_from_gyp(self.config,
|
gyp_sandboxes.extend(read_from_gyp(self.config,
|
||||||
mozpath.join(curdir, gyp_dir.input),
|
mozpath.join(curdir, gyp_dir.input),
|
||||||
mozpath.join(sandbox['OBJDIR'],
|
mozpath.join(sandbox['OBJDIR'],
|
||||||
target_dir),
|
target_dir),
|
||||||
gyp_dir.variables))
|
gyp_dir.variables))
|
||||||
|
|
||||||
# Add the gyp subdirectories to DIRS. We don't care about trying to
|
# Add the gyp subdirectories to DIRS. We don't care about trying to
|
||||||
# place some of them in PARALLEL_DIRS because they're only going to be
|
# place some of them in PARALLEL_DIRS because they're only going to be
|
||||||
|
|
|
@ -384,18 +384,6 @@ VARIABLES = {
|
||||||
populated by calling add_tier_dir().
|
populated by calling add_tier_dir().
|
||||||
""", None),
|
""", None),
|
||||||
|
|
||||||
'EXTERNAL_MAKE_DIRS': (list, list,
|
|
||||||
"""Directories that build with make but don't use moz.build files.
|
|
||||||
|
|
||||||
This is like ``DIRS`` except it implies that ``make`` is used to build the
|
|
||||||
directory and that the directory does not define itself with moz.build
|
|
||||||
files.
|
|
||||||
""", None),
|
|
||||||
|
|
||||||
'PARALLEL_EXTERNAL_MAKE_DIRS': (list, list,
|
|
||||||
"""Parallel version of ``EXTERNAL_MAKE_DIRS``.
|
|
||||||
""", None),
|
|
||||||
|
|
||||||
'CONFIGURE_SUBST_FILES': (StrictOrderingOnAppendList, list,
|
'CONFIGURE_SUBST_FILES': (StrictOrderingOnAppendList, list,
|
||||||
"""Output files that will be generated using configure-like substitution.
|
"""Output files that will be generated using configure-like substitution.
|
||||||
|
|
||||||
|
|
|
@ -42,11 +42,6 @@ CONFIGS = {
|
||||||
('MOZ_BAR', 'bar'),
|
('MOZ_BAR', 'bar'),
|
||||||
],
|
],
|
||||||
},
|
},
|
||||||
'external_make_dirs': {
|
|
||||||
'defines': [],
|
|
||||||
'non_global_defines': [],
|
|
||||||
'substs': [],
|
|
||||||
},
|
|
||||||
'substitute_config_files': {
|
'substitute_config_files': {
|
||||||
'defines': [],
|
'defines': [],
|
||||||
'non_global_defines': [],
|
'non_global_defines': [],
|
||||||
|
|
|
@ -1,8 +0,0 @@
|
||||||
# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
|
|
||||||
# Any copyright is dedicated to the Public Domain.
|
|
||||||
# http://creativecommons.org/publicdomain/zero/1.0/
|
|
||||||
|
|
||||||
DIRS = ['dir']
|
|
||||||
PARALLEL_DIRS = ['p_dir']
|
|
||||||
EXTERNAL_MAKE_DIRS = ['external']
|
|
||||||
PARALLEL_EXTERNAL_MAKE_DIRS = ['p_external']
|
|
|
@ -235,19 +235,6 @@ class TestRecursiveMakeBackend(BackendTester):
|
||||||
self.assertEqual(os.path.getmtime(makefile_path), makefile_mtime)
|
self.assertEqual(os.path.getmtime(makefile_path), makefile_mtime)
|
||||||
self.assertEqual(os.path.getmtime(backend_path), backend_mtime)
|
self.assertEqual(os.path.getmtime(backend_path), backend_mtime)
|
||||||
|
|
||||||
def test_external_make_dirs(self):
|
|
||||||
"""Ensure we have make recursion into external make directories."""
|
|
||||||
env = self._consume('external_make_dirs', RecursiveMakeBackend)
|
|
||||||
|
|
||||||
backend_path = mozpath.join(env.topobjdir, 'backend.mk')
|
|
||||||
lines = [l.strip() for l in open(backend_path, 'rt').readlines()[2:]]
|
|
||||||
self.assertEqual(lines, [
|
|
||||||
'DIRS := dir',
|
|
||||||
'PARALLEL_DIRS := p_dir',
|
|
||||||
'DIRS += external',
|
|
||||||
'PARALLEL_DIRS += p_external',
|
|
||||||
])
|
|
||||||
|
|
||||||
def test_substitute_config_files(self):
|
def test_substitute_config_files(self):
|
||||||
"""Ensure substituted config files are produced."""
|
"""Ensure substituted config files are produced."""
|
||||||
env = self._consume('substitute_config_files', RecursiveMakeBackend)
|
env = self._consume('substitute_config_files', RecursiveMakeBackend)
|
||||||
|
|
|
@ -7,6 +7,3 @@ PARALLEL_DIRS = ['parallel']
|
||||||
TEST_DIRS = ['test']
|
TEST_DIRS = ['test']
|
||||||
TEST_TOOL_DIRS = ['test_tool']
|
TEST_TOOL_DIRS = ['test_tool']
|
||||||
TOOL_DIRS = ['tool']
|
TOOL_DIRS = ['tool']
|
||||||
EXTERNAL_MAKE_DIRS = ['external_make']
|
|
||||||
PARALLEL_EXTERNAL_MAKE_DIRS = ['parallel_external_make']
|
|
||||||
|
|
||||||
|
|
|
@ -102,9 +102,6 @@ class TestEmitterBasic(unittest.TestCase):
|
||||||
self.assertEqual(o.test_dirs, ['test'])
|
self.assertEqual(o.test_dirs, ['test'])
|
||||||
self.assertEqual(o.test_tool_dirs, ['test_tool'])
|
self.assertEqual(o.test_tool_dirs, ['test_tool'])
|
||||||
self.assertEqual(o.tool_dirs, ['tool'])
|
self.assertEqual(o.tool_dirs, ['tool'])
|
||||||
self.assertEqual(o.external_make_dirs, ['external_make'])
|
|
||||||
self.assertEqual(o.parallel_external_make_dirs,
|
|
||||||
['parallel_external_make'])
|
|
||||||
|
|
||||||
def test_tier_simple(self):
|
def test_tier_simple(self):
|
||||||
reader = self.reader('traversal-tier-simple')
|
reader = self.reader('traversal-tier-simple')
|
||||||
|
|
|
@ -285,14 +285,6 @@ add_tier_dir('t1', 'bat', static=True)
|
||||||
|
|
||||||
self.assertEqual(sandbox['DIRS'], ['foo'])
|
self.assertEqual(sandbox['DIRS'], ['foo'])
|
||||||
|
|
||||||
def test_external_make_dirs(self):
|
|
||||||
sandbox = self.sandbox()
|
|
||||||
sandbox.exec_source('EXTERNAL_MAKE_DIRS += ["foo"]', 'test.py')
|
|
||||||
sandbox.exec_source('PARALLEL_EXTERNAL_MAKE_DIRS += ["bar"]', 'test.py')
|
|
||||||
|
|
||||||
self.assertEqual(sandbox['EXTERNAL_MAKE_DIRS'], ['foo'])
|
|
||||||
self.assertEqual(sandbox['PARALLEL_EXTERNAL_MAKE_DIRS'], ['bar'])
|
|
||||||
|
|
||||||
def test_error(self):
|
def test_error(self):
|
||||||
sandbox = self.sandbox()
|
sandbox = self.sandbox()
|
||||||
|
|
||||||
|
|
Загрузка…
Ссылка в новой задаче