From 08d5eb6d683b42229321f4e8ff4ac1ab97e17047 Mon Sep 17 00:00:00 2001 From: Fumitoshi Ukai Date: Wed, 8 May 2024 01:57:35 +0000 Subject: [PATCH] Reland "siso.py check ninja marker" This reverts siso.py in commit 6ed0d7b86cb1a256b43744a6de9b9ac2218b3419 siso.py doesn't affect `ninja -t commands` If out dir was built by Ninja, don't build by Siso. (still allow `siso query` etc) Bug: b/338414465 Change-Id: I3b317ca40153cee3987390d8b62ac070b6f85243 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/5524213 Commit-Queue: Andrew Grieve Reviewed-by: Andrew Grieve Auto-Submit: Fumitoshi Ukai --- siso.py | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/siso.py b/siso.py index a0b8902f9..97a9ae6e1 100644 --- a/siso.py +++ b/siso.py @@ -15,6 +15,29 @@ import sys import gclient_paths +def checkOutdir(args): + subcmd = '' + out_dir = "." + for i, arg in enumerate(args): + if not arg.startswith("-") and not subcmd: + subcmd = arg + continue + if arg == "-C": + out_dir = args[i + 1] + elif arg.startswith("-C"): + out_dir = arg[2:] + if subcmd != "ninja": + return + ninja_marker = os.path.join(out_dir, ".ninja_deps") + if os.path.exists(ninja_marker): + print("depot_tools/siso.py: %s contains Ninja state file.\n" + "Use `autoninja` to use reclient,\n" + "or run `gn clean %s` to switch from ninja to siso\n" % + (out_dir, out_dir), + file=sys.stderr) + sys.exit(1) + + def main(args): # Propagate signals to siso process so that it can run cleanup steps. # Siso will be terminated immediately after the second Ctrl-C.