Auto merge of #29954 - mrobinson:windows-bootstrap, r=mukilan

Windows bootstrap support

<!-- Please describe your changes on the following line: -->

---
<!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `___` with appropriate data: -->
- [x] `./mach build -d` does not report any errors
- [x] `./mach test-tidy` does not report any errors
- [x] These changes fix #25224
- [x] These changes do not require tests because they are just support script changes.

<!-- Also, please make sure that "Allow edits from maintainers" checkbox is checked, so that we can help you if you get stuck somewhere along the way.-->

<!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. -->

1 files changed, 2 insertions, 10 deletions

diff --git a/python/servo/command_base.py b/python/servo/command_base.py
index 0c9f3b2adf1..58f8197d6a2 100644
--- a/python/servo/command_base.py
+++ b/python/servo/command_base.py
@@ -476,8 +476,7 @@ class CommandBase(object):
         return self.get_executable(destination_folder)
 
     def msvc_package_dir(self, package):
-        return path.join(self.context.sharedir, "msvc-dependencies", package,
-                         servo.platform.windows.DEPENDENCIES[package])
+        return servo.platform.windows.get_dependency_dir(package)
 
     def vs_dirs(self):
         assert 'windows' in servo.platform.host_triple()
@@ -508,11 +507,7 @@ class CommandBase(object):
         extra_path = []
         effective_target = self.cross_compile_target or servo.platform.host_triple()
         if "msvc" in effective_target:
-            extra_path += [path.join(self.msvc_package_dir("cmake"), "bin")]
             extra_path += [path.join(self.msvc_package_dir("llvm"), "bin")]
-            extra_path += [path.join(self.msvc_package_dir("ninja"), "bin")]
-            extra_path += [self.msvc_package_dir("nuget")]
-
             env.setdefault("CC", "clang-cl.exe")
             env.setdefault("CXX", "clang-cl.exe")
             if self.is_uwp_build:
@@ -911,10 +906,7 @@ class CommandBase(object):
         if self.context.bootstrapped:
             return
 
-        # Always check if all needed MSVC dependencies are installed
-        target_platform = self.cross_compile_target or servo.platform.host_triple()
-        if "msvc" in target_platform:
-            Registrar.dispatch("bootstrap", context=self.context)
+        servo.platform.get().passive_bootstrap()
 
         if self.config["tools"]["use-rustup"]:
             self.ensure_rustup_version()