| Index: tools/release/common_includes.py
|
| diff --git a/tools/release/common_includes.py b/tools/release/common_includes.py
|
| index 996428ab0fb5b25c5318831a454f7b8daccfaf4e..c2b64c38ec85946d01a6e9f5e6bb7f9ca0d48573 100644
|
| --- a/tools/release/common_includes.py
|
| +++ b/tools/release/common_includes.py
|
| @@ -738,9 +738,12 @@ class Step(GitRecipesMixin):
|
|
|
|
|
| class BootstrapStep(Step):
|
| - MESSAGE = "Bootstrapping v8 checkout."
|
| + MESSAGE = "Bootstrapping checkout and state."
|
|
|
| def RunStep(self):
|
| + # Reserve state entry for json output.
|
| + self['json_output'] = {}
|
| +
|
| if os.path.realpath(self.default_cwd) == os.path.realpath(V8_BASE):
|
| self.Die("Can't use v8 checkout with calling script as work checkout.")
|
| # Directory containing the working v8 checkout.
|
| @@ -868,17 +871,15 @@ class ScriptsBase(object):
|
| for (number, step_class) in enumerate([BootstrapStep] + step_classes):
|
| steps.append(MakeStep(step_class, number, self._state, self._config,
|
| options, self._side_effect_handler))
|
| - step_summary = []
|
| +
|
| try:
|
| for step in steps[options.step:]:
|
| - terminate = step.Run()
|
| - step_summary.append(step._text)
|
| - if terminate:
|
| + if step.Run():
|
| return 0
|
| finally:
|
| if options.json_output:
|
| with open(options.json_output, "w") as f:
|
| - json.dump({"step_summary": step_summary}, f)
|
| + json.dump(self._state['json_output'], f)
|
|
|
| return 0
|
|
|
|
|