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

Bug 1583999 - Use non-unified sources in CompileDB. r=jwatt

Browse Source 
Originally authored in part by Botond Ballo <botond@mozilla.com>.

Differential Revision: https://phabricator.services.mozilla.com/D64284

--HG--
extra : moz-landing-system : lando
This commit is contained in:
Andi-Bogdan Postelnicu 2020-02-26 15:08:49 +00:00
parent 298fec1282
commit 7120bcdd99
1 changed files with 8 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
python/mozbuild/mozbuild/compilation/database.py
View File

@ -85,13 +85,11 @@ class CompileDBBackend(CommonBackend):
db = []
for (directory, filename, unified), cmd in self._db.iteritems():
for (directory, filename), cmd in self._db.iteritems():
env = self._envs[directory]
cmd = list(cmd)
if unified is None:
cmd.append(filename)
else:
cmd.append(unified)
cmd.append(filename)
variables = {
'DIST': mozpath.join(env.topobjdir, 'dist'),
'DEPTH': env.topobjdir,
@ -143,20 +141,10 @@ class CompileDBBackend(CommonBackend):
json.dump(db, jsonout, indent=0)
def _process_unified_sources(self, obj):
if not obj.have_unified_mapping:
for f in list(sorted(obj.files)):
self._build_db_line(obj.objdir, obj.relsrcdir, obj.config, f,
obj.canonical_suffix)
return
# For unified sources, only include the unified source file.
# Note that unified sources are never used for host sources.
for f in obj.unified_source_mapping:
self._build_db_line(obj.objdir, obj.relsrcdir, obj.config, f[0],
for f in list(sorted(obj.files)):
self._build_db_line(obj.objdir, obj.relsrcdir, obj.config, f,
obj.canonical_suffix)
for entry in f[1]:
self._build_db_line(obj.objdir, obj.relsrcdir, obj.config,
entry, obj.canonical_suffix, unified=f[0])
return
def _handle_idl_manager(self, idl_manager):
pass
@ -189,10 +177,10 @@ class CompileDBBackend(CommonBackend):
}
def _build_db_line(self, objdir, reldir, cenv, filename,
canonical_suffix, unified=None):
canonical_suffix):
if canonical_suffix not in self.COMPILERS:
return
db = self._db.setdefault((objdir, filename, unified),
db = self._db.setdefault((objdir, filename),
cenv.substs[self.COMPILERS[canonical_suffix]].split() +
['-o', '/dev/null', '-c'])
reldir = reldir or mozpath.relpath(objdir, cenv.topobjdir)