SERVER-55259 Ensure build.ninja is always in a clean state

1 files changed, 29 insertions, 7 deletions

diff --git a/site_scons/site_tools/ninja.py b/site_scons/site_tools/ninja.py
index b9b2c3d2d47..34a77ffc6a9 100644
--- a/site_scons/site_tools/ninja.py
+++ b/site_scons/site_tools/ninja.py
@@ -28,6 +28,7 @@ import importlib
 import io
 import shutil
 import shlex
+import tempfile
 import textwrap
 
 from glob import glob
@@ -446,6 +447,7 @@ class NinjaState:
 
         self.variables = {
             "COPY": "cmd.exe /c 1>NUL copy" if sys.platform == "win32" else "cp",
+            "NOOP": "cmd.exe /c 1>NUL echo 0" if sys.platform == "win32" else "echo 0 >/dev/null",
             "SCONS_INVOCATION": "{} {} __NINJA_NO=1 $out".format(
                 sys.executable,
                 " ".join(
@@ -515,6 +517,11 @@ class NinjaState:
                 ),
                 "description": "Symlink $in -> $out",
             },
+            "NOOP": {
+                "command": "$NOOP",
+                "description": "Checking $out",
+                "pool": "local_pool",
+            },
             "INSTALL": {
                 "command": "$COPY $in $out",
                 "description": "Install $out",
@@ -559,9 +566,9 @@ class NinjaState:
             },
             "REGENERATE": {
                 "command": "$SCONS_INVOCATION_W_TARGETS",
-                "description": "Regenerating $out",
-                "generator": 1,
+                "description": "Regenerating $self",
                 "depfile": os.path.join(get_path(env['NINJA_BUILDDIR']), '$out.depfile'),
+                "generator": 1,
                 # Console pool restricts to 1 job running at a time,
                 # it additionally has some special handling about
                 # passing stdin, stdout, etc to process in this pool
@@ -806,15 +813,28 @@ class NinjaState:
         # list of build generation about. However, because the generate rule
         # is hardcoded here, we need to do this generate_depfile call manually.
         ninja_file_path = self.env.File(ninja_file).path
+        ninja_in_file_path = os.path.join(get_path(self.env['NINJA_BUILDDIR']), os.path.basename(ninja_file)) + ".in"
         generate_depfile(
             self.env,
-            ninja_file_path,
-            self.env['NINJA_REGENERATE_DEPS']
+            ninja_in_file_path,
+            self.env['NINJA_REGENERATE_DEPS'],
         )
 
         ninja.build(
-            ninja_file_path,
+            ninja_in_file_path,
             rule="REGENERATE",
+            variables={
+                "self": ninja_file_path,
+            },
+        )
+
+        # This sets up a dependency edge between build.ninja.in and build.ninja
+        # without actually taking any action to transform one into the other
+        # because we write both files ourselves later.
+        ninja.build(
+            ninja_file_path,
+            rule="NOOP",
+            inputs=[ninja_in_file_path],
             implicit=[__file__],
         )
 
@@ -851,8 +871,10 @@ class NinjaState:
         if scons_default_targets:
             ninja.default(" ".join(scons_default_targets))
 
-        with open(ninja_file, "w") as build_ninja:
-            build_ninja.write(content.getvalue())
+        with tempfile.NamedTemporaryFile(delete=False, mode='w') as temp_ninja_file:
+            temp_ninja_file.write(content.getvalue())
+        shutil.move(temp_ninja_file.name, ninja_file)
+        shutil.copy2(ninja_file, ninja_in_file_path)
 
         self.__generated = True