Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-28 15:23:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Backed out 2 changesets (bug 1440879) for build bustages on mozbuild\test\backend. CLOSED TREE

Browse Source 
Backed out changeset 93892cfed015 (bug 1440879)
Backed out changeset 71d569322700 (bug 1440879)
This commit is contained in:
Narcis Beleuzu 2018-09-04 18:38:19 +03:00
parent 21c79a18a8
commit b0827c4040
3 changed files with 2 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
config/moz.build
View File

@ -47,10 +47,6 @@ if CONFIG['WRAP_STL_INCLUDES']:
stl_compiler = 'msvc'
if stl_compiler:
# Note that the 'stl_wrappers' folder is known to the build system as
# containing generated files; if this is changed here then the code in
# GeneratedFile.__init__ in python/mozbuild/mozbuild/frontend/data.py
# might need to be updated accordingly as well.
template_file = SRCDIR + '/%s-stl-wrapper.template.h' % stl_compiler
output_dir = '../dist/stl_wrappers'
# We have to use a sentinel file as the first file because the

9
python/mozbuild/mozbuild/backend/common.py
View File

@ -28,7 +28,6 @@ from mozbuild.frontend.data import (
Exports,
FinalTargetPreprocessedFiles,
FinalTargetFiles,
GeneratedFile,
GeneratedSources,
GnProjectData,
HostLibrary,
@ -170,14 +169,6 @@ class CommonBackend(BuildBackend):
self._handle_generated_sources(obj.files)
return False
elif isinstance(obj, GeneratedFile):
if obj.required_for_compile:
for f in obj.required_for_compile:
fullpath = ObjDirPath(obj._context, '!' + f).full_path
relpath = mozpath.relpath(fullpath, obj._context.config.topobjdir)
self._handle_generated_sources([relpath])
return False
elif isinstance(obj, Exports):
objdir_files = [f.full_path for path, files in obj.files.walk() for f in files if isinstance(f, ObjDirPath)]
if objdir_files:

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

@ -1168,8 +1168,9 @@ class GeneratedFile(ContextDerived):
'.inc',
'.py',
'.rs',
'new', # 'new' is an output from make-stl-wrappers.py
)
self.required_for_compile = [f for f in self.outputs if f.endswith(suffixes) or 'stl_wrappers/' in f]
self.required_for_compile = any(f.endswith(suffixes) for f in self.outputs)
class ChromeManifestEntry(ContextDerived):