windows fixes

Author: peakschris

.bazelrc

@@ -4,6 +4,14 @@ common --enable_bzlmod
 
 common --test_output=errors
 
+# Windows settings
+startup --windows_enable_symlinks
+
+# Point tools such as coursier (used in rules_jvm_external) to Bazel's downloaded JDK
+# suggested in https://github.com/bazelbuild/rules_jvm_external/issues/445
+common --repo_env=JAVA_HOME=../bazel_tools/jdk
+common --action_env=JAVA_HOME=../bazel_tools/jdk
+
 # Define value used by tests
 common --define=SOME_VAR=SOME_VALUE
 
@@ -17,7 +25,9 @@ common --per_file_copt=external/.*protobuf.*@--PROTOBUF_WAS_NOT_SUPPOSED_TO_BE_B
 common --host_per_file_copt=external/.*protobuf.*@--PROTOBUF_WAS_NOT_SUPPOSED_TO_BE_BUILT
 
 # Don't try and auto detect the cc toolchain, as we use our own gcc toolchains.
-common --repo_env=BAZEL_DO_NOT_DETECT_CPP_TOOLCHAIN=1
+# Except on windows, where we use msvc
+common:linux --repo_env=BAZEL_DO_NOT_DETECT_CPP_TOOLCHAIN=1
+common:macos --repo_env=BAZEL_DO_NOT_DETECT_CPP_TOOLCHAIN=1
 
 # Don't link against libunwind on macos as it causes linking failures (https://github.com/bazel-contrib/toolchains_llvm/pull/346)
 common:macos --@toolchains_llvm//toolchain/config:libunwind=False

MODULE.bazel

@@ -13,6 +13,12 @@ bazel_dep(name = "platforms", version = "1.0.0")
 bazel_dep(name = "rules_python", version = "1.0.0")
 bazel_dep(name = "with_cfg.bzl", version = "0.11.0")
 
+python_stdlib_list = use_extension("@rules_python//python:extensions.bzl", "python_stdlib_list")
+use_repo(
+    python_stdlib_list,
+    "python_stdlib_list",
+)
+
 tools = use_extension("//py:extensions.bzl", "py_tools")
 tools.rules_py_tools()
 use_repo(tools, "rules_py_tools")
@@ -30,8 +36,10 @@ use_repo(
     toml,
     "toml2json_aarch64_linux_gnu",
     "toml2json_aarch64_osx_libsystem",
+    "toml2json_aarch64_windows_msvc",
     "toml2json_x86_64_linux_gnu",
     "toml2json_x86_64_osx_libsystem",
+    "toml2json_x86_64_windows_msvc",
 )
 
 host = use_extension("//uv/private/host:extension.bzl", "host_platform")
@@ -409,7 +417,7 @@ register_toolchains("@rust_toolchains//:all")
 bazel_dep(name = "xz", version = "5.4.5.bcr.5")
 bazel_dep(name = "zstd", version = "1.5.7")
 bazel_dep(name = "bzip2", version = "1.0.8.bcr.2")
-bazel_dep(name = "rules_rs", version = "0.0.7")
+bazel_dep(name = "rules_rs", version = "0.0.13")
 
 crate = use_extension(
     "@rules_rs//rs:extensions.bzl",

bazel/platforms/config/defs.bzl

@@ -9,6 +9,7 @@ cpus = ["aarch64", "x86_64"]
 os_to_linker = {
     "linux": ["unknown"],
     "macos": ["unknown"],
+    "windows": ["unknown"],
 }
 
 platforms = [

bazel/rust/multi_platform_rust_binaries.bzl

@@ -11,6 +11,7 @@ TARGET_TRIPLES = [
     ("aarch64_unknown_linux_gnu", "linux_aarch64"),
     ("x86_64_apple_darwin", "macos_x86_64"),
     ("aarch64_apple_darwin", "macos_aarch64"),
+    ("x86_64_pc_windows_msvc", "windows_x86_64"),
 ]
 
 # Map a Rust naming scheme to a custom name.
@@ -40,12 +41,19 @@ def multi_platform_rust_binaries(name, target, name_scheme = TARGET_NAMING_SCHEM
 
     for (target_triple, target_platform) in target_triples:
         target_naming = name_scheme.get(target_triple, target_triple)
-
+        not_windows = select({
+            "@platforms//os:windows": ["@platforms//:incompatible"],
+            "//conditions:default": [],
+        })
+        target_compatible_with = not_windows
+        if target_platform.startswith("windows"):
+            target_compatible_with = ["@platforms//os:windows"]
         transition_build = "{}_{}_build".format(bin, target_naming)
         platform_transition_filegroup(
             name = transition_build,
             srcs = [target],
             target_platform = "//bazel/platforms:{}".format(target_platform),
+            target_compatible_with = target_compatible_with,
             tags = ["release"],
         )
 
@@ -54,13 +62,15 @@ def multi_platform_rust_binaries(name, target, name_scheme = TARGET_NAMING_SCHEM
             name = "{}_copy".format(copy_name),
             src = transition_build,
             out = copy_name,
+            target_compatible_with = target_compatible_with,
             tags = ["release"],
         )
 
         bin_sha256 = "{}_bin_hash".format(copy_name)
         hashes(
             name = bin_sha256,
             src = copy_name,
+            target_compatible_with = target_compatible_with,
             tags = ["release"],
         )
 
@@ -71,6 +81,7 @@ def multi_platform_rust_binaries(name, target, name_scheme = TARGET_NAMING_SCHEM
             renames = {copy_name: bin},
             attributes = pkg_attributes(mode = "0744"),
             strip_prefix = "/",
+            target_compatible_with = target_compatible_with,
             tags = ["release"],
         )
 
@@ -84,13 +95,15 @@ def multi_platform_rust_binaries(name, target, name_scheme = TARGET_NAMING_SCHEM
             # Why is -1 not the default :/
             # This also sets the modified time in UTC.
             stamp = -1,
+            target_compatible_with = target_compatible_with,
             tags = ["release"],
         )
 
         pkged_sha256 = "{}_pkged_hash".format(copy_name)
         hashes(
             name = pkged_sha256,
             src = pkged,
+            target_compatible_with = target_compatible_with,
             tags = ["release"],
         )
 

e2e/cases/repository-rule-deps-299/.bazelrc

@@ -5,3 +5,6 @@ common --enable_bzlmod
 
 # The imports=[".."] only works properly when this matches the python toolchain major version.
 common --@aspect_rules_py//py:interpreter_version=3.11.6
+
+# Windows settings
+startup --windows_enable_symlinks

py/BUILD.bazel

@@ -36,6 +36,7 @@ bzl_library(
         "//py/private:virtual",
         "//py/private/py_venv",
         "@aspect_bazel_lib//lib:utils",
+        "@aspect_bazel_lib//lib:windows_utils",
     ],
 )
 

py/private/py_binary.bzl

@@ -2,6 +2,7 @@
 
 load("@aspect_bazel_lib//lib:expand_make_vars.bzl", "expand_locations", "expand_variables")
 load("@aspect_bazel_lib//lib:paths.bzl", "BASH_RLOCATION_FUNCTION", "to_rlocation_path")
+load("@aspect_bazel_lib//lib:windows_utils.bzl", "create_windows_native_launcher_script")
 load("@rules_python//python:defs.bzl", "PyInfo")
 load("//py/private:py_library.bzl", _py_library = "py_library_utils")
 load("//py/private:py_semantics.bzl", _py_semantics = "semantics")
@@ -15,6 +16,7 @@ def _dict_to_exports(env):
     ]
 
 def _py_binary_rule_impl(ctx):
+    is_windows = ctx.target_platform_has_constraint(ctx.attr._windows_constraint[platform_common.ConstraintValueInfo])
     venv_toolchain = ctx.toolchains[VENV_TOOLCHAIN]
     py_toolchain = _py_semantics.resolve_toolchain(ctx)
 
@@ -69,10 +71,15 @@ def _py_binary_rule_impl(ctx):
             attribute_name = "env",
         )
 
-    executable_launcher = ctx.actions.declare_file(ctx.attr.name)
+    print(py_toolchain.python)
+    print(py_toolchain.runfiles_interpreter)
+    print(py_toolchain.python.path)
+    print(to_rlocation_path(ctx, py_toolchain.python))
+
+    bash_launcher = ctx.actions.declare_file(ctx.attr.name)
     ctx.actions.expand_template(
         template = ctx.file._run_tmpl,
-        output = executable_launcher,
+        output = bash_launcher,
         substitutions = {
             "{{BASH_RLOCATION_FN}}": BASH_RLOCATION_FUNCTION,
             "{{INTERPRETER_FLAGS}}": " ".join(py_toolchain.flags + ctx.attr.interpreter_options),
@@ -91,6 +98,8 @@ def _py_binary_rule_impl(ctx):
         is_executable = True,
     )
 
+    launcher = create_windows_native_launcher_script(ctx, bash_launcher) if is_windows else bash_launcher
+
     srcs_depset = _py_library.make_srcs_depset(ctx)
 
     runfiles = _py_library.make_merged_runfiles(
@@ -100,6 +109,8 @@ def _py_binary_rule_impl(ctx):
             srcs_depset,
         ] + virtual_resolution.srcs + virtual_resolution.runfiles,
         extra_runfiles = [
+            launcher,
+            bash_launcher,
             site_packages_pth_file,
         ],
         extra_runfiles_depsets = [
@@ -116,11 +127,11 @@ def _py_binary_rule_impl(ctx):
     return [
         DefaultInfo(
             files = depset([
-                executable_launcher,
+                bash_launcher,
                 main,
-                site_packages_pth_file,
+                site_packages_pth_file
             ]),
-            executable = executable_launcher,
+            executable = launcher,
             runfiles = runfiles,
         ),
         PyInfo(
@@ -194,6 +205,7 @@ A collision can occur when multiple packages providing the same file are install
     "_allowlist_function_transition": attr.label(
         default = "@bazel_tools//tools/allowlists/function_transition_allowlist",
     ),
+    "_windows_constraint": attr.label(default = "@platforms//os:windows"),
 })
 
 _attrs.update(**_py_library.attrs)
@@ -222,6 +234,7 @@ py_base = struct(
     toolchains = [
         PY_TOOLCHAIN,
         VENV_TOOLCHAIN,
+        "@bazel_tools//tools/sh:toolchain_type",
     ],
     cfg = python_version_transition,
 )

py/tools/py/Cargo.toml

@@ -6,7 +6,6 @@ homepage.workspace = true
 repository.workspace = true
 license.workspace = true
 edition.workspace = true
-readme.workspace = true
 rust-version.workspace = true
 
 [features]
@@ -30,3 +29,6 @@ uv-pypi-types = { workspace = true }
 uv-python = { workspace = true }
 uv-virtualenv = { workspace = true }
 walkdir = "2.5.0"
+# workaround issue with this package building with rules_rust on windows; the snap files used in their unit tests have
+# too long a path and import of this module is failing (even when tests are not run)
+rattler_installs_packages = { git = "https://github.com/peakschris/rip", rev = "3de9ee95eab577c9e48526464013e217287c6937", default-features = false, features = ["rustls-tls"] }

py/tools/py/src/pth.rs

@@ -256,13 +256,7 @@ fn create_symlink(
         };
     }
 
-    std::os::unix::fs::symlink(&tgt, &link)
-        .into_diagnostic()
-        .wrap_err(format!(
-            "Unable to create symlink: {} -> {}",
-            tgt.to_string_lossy(),
-            link.to_string_lossy()
-        ))?;
+    create_cross_platform_symlink(&tgt, &link)?;
 
     Ok(())
 }
@@ -291,3 +285,37 @@ fn is_same_file(p1: &Path, p2: &Path) -> miette::Result<bool> {
 
     return Ok(true);
 }
+
+fn create_cross_platform_symlink(tgt: &Path, link: &Path) -> miette::Result<()> {
+    #[cfg(unix)]
+    {
+        std::os::unix::fs::symlink(tgt, link)
+            .into_diagnostic()
+            .wrap_err(format!(
+                "Unable to create symlink: {} -> {}",
+                tgt.to_string_lossy(),
+                link.to_string_lossy()
+            ))
+    }
+
+    #[cfg(windows)]
+    {
+        if tgt.is_dir() {
+            std::os::windows::fs::symlink_dir(tgt, link)
+                .into_diagnostic()
+                .wrap_err(format!(
+                    "Unable to create directory symlink: {} -> {}",
+                    tgt.to_string_lossy(),
+                    link.to_string_lossy()
+                ))
+        } else {
+            std::os::windows::fs::symlink_file(tgt, link)
+                .into_diagnostic()
+                .wrap_err(format!(
+                    "Unable to create file symlink: {} -> {}",
+                    tgt.to_string_lossy(),
+                    link.to_string_lossy()
+                ))
+        }
+    }
+}

py/tools/unpack_bin/BUILD.bazel

@@ -31,3 +31,10 @@ release(
     name = "release",
     targets = [":bins"],
 )
+
+# multi_arch_rust_binary_release(
+#     name = "windows",
+#     src = ":unpack",
+#     os = "windows",
+#     visibility = ["//tools/release:__pkg__"],
+# )