wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 1035099 - Remove the comm-central workarounds from MozbuildObject.from_environment. r=gps

Browse Source
This commit is contained in:
Mike Hommey 2014-07-08 13:47:26 +09:00
parent c355cd1724
commit fc399e43bb
1 changed files with 2 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
python/mozbuild/mozbuild/base.py
View File

@ -172,29 +172,12 @@ class MozbuildObject(ProcessExecutionMixin):
# inside an objdir you probably want to perform actions on that objdir,
# not another one. This prevents accidental usage of the wrong objdir
# when the current objdir is ambiguous.
# However, if the found mozconfig resolves to another objdir that
# doesn't exist, we may be in a subtree like when building mozilla/
# under c-c, and the objdir was defined as a relative path. Try again
# adjusting for that.
if topobjdir and config_topobjdir:
if not os.path.exists(config_topobjdir):
config_topobjdir = MozbuildObject.resolve_mozconfig_topobjdir(
os.path.dirname(topsrcdir), config)
if current_project:
config_topobjdir = os.path.join(config_topobjdir,
current_project)
config_topobjdir = os.path.join(config_topobjdir,
os.path.basename(topsrcdir))
elif current_project:
if current_project:
config_topobjdir = os.path.join(config_topobjdir, current_project)
_config_topobjdir = config_topobjdir
mozilla_dir = os.path.join(_config_topobjdir, 'mozilla')
if not samepath(topobjdir, _config_topobjdir) \
and (not os.path.exists(mozilla_dir) or not samepath(topobjdir,
mozilla_dir)):
if not samepath(topobjdir, _config_topobjdir):
raise ObjdirMismatchException(topobjdir, _config_topobjdir)
topobjdir = topobjdir or config_topobjdir