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 978211 - Seemlessly support make 4 output buffering for automation/% steps. r=mshal

Browse Source
This commit is contained in:
Mike Hommey 2014-06-19 09:06:13 +09:00
parent 40d8d0fb28
commit 724fa20ba3
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
build/moz-automation.mk
View File

@ -3,6 +3,14 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
ifneq (,$(filter automation/%,$(MAKECMDGOALS)))
ifeq (4.0,$(firstword $(sort 4.0 $(MAKE_VERSION))))
MAKEFLAGS += --output-sync=target
else
.NOTPARALLEL:
endif
endif
include $(topsrcdir)/toolkit/mozapps/installer/package-name.mk
# Log file from the 'make upload' step. We need this to parse out the URLs of

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

@ -372,12 +372,10 @@ class Build(MachCommandBase):
moz_automation = os.getenv('MOZ_AUTOMATION') or make_extra.get('export MOZ_AUTOMATION', None)
if moz_automation and status == 0:
# Default to 1 job until we have make-4.0 in for output
# buffering.
status = self._run_make(target='automation/build',
line_handler=output.on_line, log=False, print_directory=False,
allow_parallel=False, ensure_exit_code=False, num_jobs=1,
silent=not verbose, force_pymake=pymake)
ensure_exit_code=False, num_jobs=jobs, silent=not verbose,
force_pymake=pymake)
self.log(logging.WARNING, 'warning_summary',
{'count': len(monitor.warnings_database)},