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 1223385 - refactor mach helper into LocalesMixin, r=rail

Browse Source
This commit is contained in:
Axel Hecht 2016-01-08 15:09:57 +01:00
parent be61131443
commit bb1d2c2c59
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
testing/mozharness/mozharness/mozilla/l10n/locales.py
View File

@ -31,6 +31,19 @@ class LocalesMixin(ChunkingMixin):
self.gecko_locale_revisions = None
self.l10n_revisions = {}
def _get_mach_executable(self):
python = self.query_exe('python2.7')
return [python, 'mach']
def _mach(self, target, env, halt_on_failure=True, output_parser=None):
dirs = self.query_abs_dirs()
mach = self._get_mach_executable()
return self.run_command(mach + target,
halt_on_failure=True,
env=env,
cwd=dirs['abs_mozilla_dir'],
output_parser=None)
def query_locales(self):
if self.locales is not None:
return self.locales

13
testing/mozharness/scripts/desktop_l10n.py
View File

@ -606,25 +606,12 @@ class DesktopSingleLocale(LocalesMixin, ReleaseMixin, MockMixin, BuildbotMixin,
self.copyfile(src, dst)
self.read_from_file(dst, verbose=True)
def _mach(self, target, env, halt_on_failure=True, output_parser=None):
dirs = self.query_abs_dirs()
mach = self._get_mach_executable()
return self.run_command(mach + target,
halt_on_failure=True,
env=env,
cwd=dirs['abs_mozilla_dir'],
output_parser=None)
def _mach_configure(self):
"""calls mach configure"""
env = self.query_bootstrap_env()
target = ["configure"]
return self._mach(target=target, env=env)
def _get_mach_executable(self):
python = self.query_exe('python2.7')
return [python, 'mach']
def _get_make_executable(self):
config = self.config
dirs = self.query_abs_dirs()