Merge pull request #80252 from etcwilde/ewilde/reenable-ninja-time-tracking

[build-sciprt] Re-enable time tracking local ninja build

Author: drexin

utils/swift_build_support/swift_build_support/products/ninja.py

@@ -21,6 +21,7 @@
 
 from . import product
 from .. import shell
+from ..utils import log_time_in_scope
 
 
 class Ninja(product.Product):
@@ -53,15 +54,18 @@ def ninja_bin_path(self):
     def build(self):
         if os.path.exists(self.ninja_bin_path):
             return
-        shell.call([
-            self.toolchain.cmake,
-            "-S", self.source_dir,
-            "-B", self.build_dir,
-            "-DCMAKE_BUILD_TYPE=Release",
-            "-DBUILD_TESTING=OFF",
-            f"-DCMAKE_C_COMPILER={self.toolchain.cc}",
-            f"-DCMAKE_CXX_COMPILER={self.toolchain.cxx}"])
-        shell.call([self.toolchain.cmake, "--build", self.build_dir])
+
+        print("--- Local Ninja Build ---")
+        with log_time_in_scope('local ninja'):
+            shell.call([
+                self.toolchain.cmake,
+                "-S", self.source_dir,
+                "-B", self.build_dir,
+                "-DCMAKE_BUILD_TYPE=Release",
+                "-DBUILD_TESTING=OFF",
+                f"-DCMAKE_C_COMPILER={self.toolchain.cc}",
+                f"-DCMAKE_CXX_COMPILER={self.toolchain.cxx}"])
+            shell.call([self.toolchain.cmake, "--build", self.build_dir])
 
 
 def get_ninja_version(ninja_bin_path):

utils/swift_build_support/swift_build_support/utils.py

@@ -48,8 +48,11 @@ def clear_log_time():
 
 
 def log_time(event, command, duration=0):
-    f = open(log_time_path(), "a")
+    log_time_dir = os.path.dirname(log_time_path())
+    if not os.path.isdir(log_time_dir):
+        os.mkdir(log_time_dir)
 
+    f = open(log_time_path(), "a")
     log_event = {
         "event": event,
         "command": command,