Skip to content

Commit a7088bc

Browse files
committed
Bug 1850647 - make py_action emit BUILDSTATUS START and END lines for every action, r=glandium.
Differential Revision: https://phabricator.services.mozilla.com/D190514
1 parent f26d5aa commit a7088bc

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

config/makefiles/functions.mk

+2
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,8 @@ core_winabspath = $(error core_winabspath is unsupported)
2828
# libs::
2929
# $(call py_action,purge_manifests,_build_manifests/purge/foo.manifest)
3030
define py_action
31+
$(call BUILDSTATUS,START_$(1) $(subst ','\'',$(2)))
3132
$(if $(3),cd $(3) && )$(PYTHON3) -m mozbuild.action.$(1) $(2)
33+
$(call BUILDSTATUS,END_$(1) $(subst ','\'',$(2)))
3234

3335
endef

python/mozbuild/mozbuild/controller/building.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -274,10 +274,10 @@ def on_line(self, line):
274274
self.resources.begin_marker("Object", args[0])
275275
update_needed = False
276276
elif action.startswith("START_"):
277-
self.resources.begin_marker(action[len("START_") :], args[0])
277+
self.resources.begin_marker(action[len("START_") :], " ".join(args))
278278
update_needed = False
279279
elif action.startswith("END_"):
280-
self.resources.end_marker(action[len("END_") :], args[0])
280+
self.resources.end_marker(action[len("END_") :], " ".join(args))
281281
update_needed = False
282282
elif action == "BUILD_VERBOSE":
283283
build_dir = args[0]

0 commit comments

Comments
 (0)