Skip to content

Commit 26c7f5c

Browse files
committed
Make --expand-build-script-invocation scriptable
The previous commit moved the note containing the output to stderr. This change prints it on stdout again, but now with no human-consumption prefix so it can be directly executed by tools.
1 parent 72f8249 commit 26c7f5c

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

utils/build-script

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1158,13 +1158,13 @@ def main_preset():
11581158
if args.cmake_cxx_launcher:
11591159
build_script_args += ["--cmake-cxx-launcher", args.cmake_cxx_launcher]
11601160

1161-
diagnostics.note('using preset "{}", which expands to \n\n{}\n'.format(
1162-
args.preset, shell.quote_command(build_script_args)))
1163-
1161+
printable_command = shell.quote_command(build_script_args)
11641162
if args.expand_build_script_invocation:
1165-
return 0
1166-
1167-
shell.call_without_sleeping(build_script_args)
1163+
print(printable_command)
1164+
else:
1165+
diagnostics.note('using preset "{}", which expands to \n\n{}\n'.format(
1166+
args.preset, printable_command))
1167+
shell.call_without_sleeping(build_script_args)
11681168
return 0
11691169

11701170

0 commit comments

Comments
 (0)