Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-08 19:04:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1229245 - Don't store the target in FinalTarget{,Preprocessed}Files instances. r=gps

Browse Source 
They already have that value in self.install_target.
This commit is contained in:
Mike Hommey 2015-11-28 11:42:51 +09:00
parent 2eea6436c2
commit 2e73746038
3 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
python/mozbuild/mozbuild/backend/recursivemake.py
View File

@ -591,11 +591,10 @@ class RecursiveMakeBackend(CommonBackend):
self._process_linked_libraries(obj, backend_file)
elif isinstance(obj, FinalTargetFiles):
self._process_final_target_files(obj, obj.files, obj.target)
self._process_final_target_files(obj, obj.files)
elif isinstance(obj, FinalTargetPreprocessedFiles):
self._process_final_target_pp_files(obj, obj.files, obj.target,
backend_file)
self._process_final_target_pp_files(obj, obj.files, backend_file)
elif isinstance(obj, AndroidResDirs):
# Order matters.
@ -1319,7 +1318,8 @@ INSTALL_TARGETS += %(prefix)s
# Process library-based defines
self._process_defines(obj.defines, backend_file)
def _process_final_target_files(self, obj, files, target):
def _process_final_target_files(self, obj, files):
target = obj.install_target
if target.startswith('dist/bin'):
install_manifest = self._install_manifests['dist_bin']
reltarget = mozpath.relpath(target, 'dist/bin')
@ -1338,7 +1338,7 @@ INSTALL_TARGETS += %(prefix)s
dest = mozpath.join(reltarget, path, mozpath.basename(f))
install_manifest.add_symlink(source, dest)
def _process_final_target_pp_files(self, obj, files, target, backend_file):
def _process_final_target_pp_files(self, obj, files, backend_file):
# We'd like to install these via manifests as preprocessed files.
# But they currently depend on non-standard flags being added via
# some Makefiles, so for now we just pass them through to the
@ -1347,7 +1347,7 @@ INSTALL_TARGETS += %(prefix)s
for f in strings:
backend_file.write('DIST_FILES_%d += %s\n' % (i, f))
backend_file.write('DIST_FILES_%d_PATH := $(DEPTH)/%s\n'
% (i, mozpath.join(target, path)))
% (i, mozpath.join(obj.install_target, path)))
backend_file.write('PP_TARGETS += DIST_FILES_%d\n' % i)
def _process_chrome_manifest_entry(self, obj, backend_file):

6
python/mozbuild/mozbuild/frontend/data.py
View File

@ -820,10 +820,9 @@ class FinalTargetFiles(ContextDerived):
"""
__slots__ = ('files', 'target')
def __init__(self, sandbox, files, target):
def __init__(self, sandbox, files):
ContextDerived.__init__(self, sandbox)
self.files = files
self.target = target
class FinalTargetPreprocessedFiles(ContextDerived):
@ -837,10 +836,9 @@ class FinalTargetPreprocessedFiles(ContextDerived):
"""
__slots__ = ('files', 'target')
def __init__(self, sandbox, files, target):
def __init__(self, sandbox, files):
ContextDerived.__init__(self, sandbox)
self.files = files
self.target = target
class GeneratedFile(ContextDerived):

2
python/mozbuild/mozbuild/frontend/emitter.py
View File

@ -699,7 +699,7 @@ class TreeMetadataEmitter(LoggingMixin):
'RESOURCES_FILES cannot be used with DIST_SUBDIR or '
'XPI_NAME.', context)
yield cls(context, all_files, context['FINAL_TARGET'])
yield cls(context, all_files)
# Check for manifest declarations in EXTRA_{PP_,}COMPONENTS.
if any(e.endswith('.js') for e in components) and \