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 1031132 - Refactor mach environment to use logic from MachCommandBase instead of its own. r=gps

Browse Source 
Also don't print section titles when there is nothing under them, and move
move the ObjdirMismatchException handling to MachCommandBase.
This commit is contained in:
Mike Hommey 2014-07-03 07:15:31 +09:00
parent fad1758c54
commit 70d330c116
2 changed files with 22 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -555,6 +555,15 @@ class MachCommandBase(MozbuildObject):
topobjdir = dummy._topobjdir
except BuildEnvironmentNotFoundException:
pass
except ObjdirMismatchException as e:
print('Ambiguous object directory detected. We detected that '
'both %s and %s could be object directories. This is '
'typically caused by having a mozconfig pointing to a '
'different object directory from the current working '
'directory. To solve this problem, ensure you do not have a '
'default mozconfig in searched paths.' % (e.objdir1,
e.objdir2))
sys.exit(1)
MozbuildObject.__init__(self, topsrcdir, context.settings,
context.log_manager, topobjdir=topobjdir)

57
python/mozbuild/mozbuild/mach_commands.py
View File

@ -932,60 +932,29 @@ class MachDebug(MachCommandBase):
print('mach directory:\n\t%s' % self._mach_context.topdir)
print('state directory:\n\t%s' % state_dir)
try:
mb = MozbuildObject.from_environment(cwd=self._mach_context.cwd)
except ObjdirMismatchException as e:
print('Ambiguous object directory detected. We detected that '
'both %s and %s could be object directories. This is '
'typically caused by having a mozconfig pointing to a '
'different object directory from the current working '
'directory. To solve this problem, ensure you do not have a '
'default mozconfig in searched paths.' % (e.objdir1,
e.objdir2))
return 1
print('object directory:\n\t%s' % self.topobjdir)
mozconfig = None
try:
mozconfig = mb.mozconfig
print('mozconfig path:\n\t%s' % mozconfig['path'])
except MozconfigFindException as e:
print('Unable to find mozconfig: %s' % e.message)
return 1
except MozconfigLoadException as e:
print('Error loading mozconfig: %s' % e.path)
print(e.message)
if e.output:
print('mozconfig evaluation output:')
for line in e.output:
print(line)
return 1
print('object directory:\n\t%s' % mb.topobjdir)
if mozconfig:
print('mozconfig configure args:')
if mozconfig['configure_args']:
for arg in mozconfig['configure_args']:
if self.mozconfig['path']:
print('mozconfig path:\n\t%s' % self.mozconfig['path'])
if self.mozconfig['configure_args']:
print('mozconfig configure args:')
for arg in self.mozconfig['configure_args']:
print('\t%s' % arg)
print('mozconfig extra make args:')
if mozconfig['make_extra']:
for arg in mozconfig['make_extra']:
if self.mozconfig['make_extra']:
print('mozconfig extra make args:')
for arg in self.mozconfig['make_extra']:
print('\t%s' % arg)
print('mozconfig make flags:')
if mozconfig['make_flags']:
for arg in mozconfig['make_flags']:
if self.mozconfig['make_flags']:
print('mozconfig make flags:')
for arg in self.mozconfig['make_flags']:
print('\t%s' % arg)
config = None
try:
config = mb.config_environment
config = self.config_environment
except Exception:
pass