Internal change

PiperOrigin-RevId: 917337474

Author: dmitriplotnikov

.bazelrc

@@ -9,7 +9,25 @@ build --incompatible_default_to_explicit_init_py
 
 # MSVC: Use the C++20 standard in order to support C++20 features that were introduced in clang and gcc
 build:windows --copt="/std:c++20" --cxxopt="/std:c++20"
+# MSVC: Corrects the __cplusplus macro to report the true standard
+build:windows --copt="/Zc:__cplusplus" --cxxopt="/Zc:__cplusplus"
 # MSVC: Enable modern standards-compatible preprocessor
 build:windows --cxxopt="/Zc:preprocessor" --host_cxxopt="/Zc:preprocessor"
 # MSVC: Link ANTLR statically to avoid Windows DLL linking errors
 build:windows --cxxopt="-DANTLR4CPP_STATIC" --host_cxxopt="-DANTLR4CPP_STATIC"
+
+# Repo environment bypasses for corporate proxy (Windows-only)
+common:windows --repo_env=no_proxy=bcr.bazel.build,bazel.build,storage.googleapis.com,*.googleapis.com,metadata.google.internal,169.254.169.254
+common:windows --repo_env=NO_PROXY=bcr.bazel.build,bazel.build,storage.googleapis.com,*.googleapis.com,metadata.google.internal,169.254.169.254
+
+# Downloader attempts and retries for BCR network stability (Windows-only)
+common:windows --http_connector_attempts=10
+common:windows --experimental_repository_downloader_retries=10
+
+# Build verbosity and output options (Windows-only)
+build:windows --verbose_failures
+test:windows --test_output=errors
+
+# GCS remote caching config (Windows-only, active by default on Windows!)
+build:windows --remote_cache=https://storage.googleapis.com/windows-cel-python-remote-cache
+build:windows --google_default_credentials=true

MODULE.bazel

@@ -3,23 +3,27 @@ module(
 )
 
 # https://registry.bazel.build/modules/abseil-cpp
-bazel_dep(name = "abseil-cpp", version = "20250814.1", repo_name = "com_google_absl")
+bazel_dep(name = "abseil-cpp", version = "20260107.0", repo_name = "com_google_absl")
 
 # https://registry.bazel.build/modules/abseil-py
-bazel_dep(name = "abseil-py", version = "2.1.0", repo_name = "com_google_absl_py")
+bazel_dep(name = "abseil-py", version = "2.4.0", repo_name = "com_google_absl_py")
 
 # https://github.com/bazelbuild/bazel-skylib
-bazel_dep(name = "bazel_skylib", version = "1.8.2")
+bazel_dep(name = "bazel_skylib", version = "1.9.0")
 
 # https://registry.bazel.build/modules/cel-cpp
 bazel_dep(name = "cel-cpp", version = "0.15.0", repo_name = "com_google_cel_cpp")
-single_version_override(
+git_override(
     module_name = "cel-cpp",
+    commit = "2e6e9ff4493bfbe0baf883107f3fb7ce6f675d88",
     patch_cmds = [
         # ABSL_CONST_INIT is incompatible with MSVC-CL with the /std:c++20 option
         "sed -i 's/ABSL_CONST_INIT //g' common/values/optional_value.cc",
     ],
-    version = "0.15.0",
+    patch_cmds_win = [
+        "python -c \"import sys; path='common/values/optional_value.cc'; content=open(path).read(); open(path,'w').write(content.replace('ABSL_CONST_INIT ',''))\"",
+    ],
+    remote = "https://github.com/google/cel-cpp",
 )
 
 # https://registry.bazel.build/modules/cel-spec
@@ -32,7 +36,7 @@ bazel_dep(name = "googletest", version = "1.17.0.bcr.2", repo_name = "com_google
 bazel_dep(name = "platforms", version = "1.0.0")
 
 # https://registry.bazel.build/modules/protobuf
-bazel_dep(name = "protobuf", version = "33.1", repo_name = "com_google_protobuf")
+bazel_dep(name = "protobuf", version = "33.4", repo_name = "com_google_protobuf")
 
 # https://registry.bazel.build/modules/pybind11_abseil
 bazel_dep(name = "pybind11_abseil", version = "202402.0")
@@ -41,25 +45,34 @@ bazel_dep(name = "pybind11_abseil", version = "202402.0")
 bazel_dep(name = "pybind11_bazel", version = "3.0.0")
 
 # https://registry.bazel.build/modules/rules_cc
-bazel_dep(name = "rules_cc", version = "0.2.14")
+bazel_dep(name = "rules_cc", version = "0.2.16")
 
 # https://registry.bazel.build/modules/rules_proto
 bazel_dep(name = "rules_proto", version = "7.1.0")
 
 # https://registry.bazel.build/modules/rules_python
-bazel_dep(name = "rules_python", version = "1.7.0")
+bazel_dep(name = "rules_python", version = "1.9.0")
 
 # On Windows the file system is case-insensitive, which creates a collision between
 # antlr4-cpp-runtime/VERSION and the system `#include <version>`
 single_version_override(
     module_name = "antlr4-cpp-runtime",
     patch_cmds = [
-        "mv VERSION VERSION.txt",
+        "python -c \"import os; os.rename('VERSION', 'VERSION.txt') if os.path.exists('VERSION') else None\"",
+        "python -c \"import os; os.rename('version', 'version.txt') if os.path.exists('version') else None\"",
     ],
 )
 
-python_rules = use_extension("@rules_python//python/extensions:python.bzl", "python")
-python_rules.toolchain(
-    is_default = True,
-    python_version = "3.11",
+python = use_extension("@rules_python//python/extensions:python.bzl", "python")
+python.defaults(python_version = "3.11")
+python.toolchain(python_version = "3.11")
+use_repo(python, "pythons_hub")
+
+pybind11_internal_configure = use_extension(
+    "@pybind11_bazel//:internal_configure.bzl",
+    "internal_configure_extension",
 )
+use_repo(pybind11_internal_configure, "pybind11")
+
+local_repo_ext = use_extension("//cel_expr_python:local_repo_extension.bzl", "local_repo_ext")
+use_repo(local_repo_ext, "python_headers_custom")

cel_expr_python/BUILD

@@ -45,7 +45,10 @@ pybind_extension(
         "py_message_factory.cc",
         "py_message_factory.h",
     ],
-    data = ["cel.pyi"],
+    data = select({
+        "@platforms//os:windows": ["@python_headers_custom//:dll"],
+        "//conditions:default": [],
+    }) + ["cel.pyi"],
     visibility = [
         "//visibility:public",
     ],
@@ -125,6 +128,7 @@ pybind_library(
         "@com_google_cel_cpp//compiler",
         "@com_google_cel_cpp//runtime:runtime_builder",
         "@com_google_cel_cpp//runtime:runtime_options",
+        "@python_headers_custom//:headers",
     ],
 )
 

cel_expr_python/ext/BUILD

@@ -16,6 +16,7 @@ pybind_extension(
         "//cel_expr_python:cel_extension",
         "@com_google_cel_cpp//compiler",
         "@com_google_cel_cpp//extensions:bindings_ext",
+        "@python_headers_custom//:headers",
     ],
 )
 
@@ -36,6 +37,7 @@ pybind_extension(
         "@com_google_cel_cpp//extensions:encoders",
         "@com_google_cel_cpp//runtime:runtime_builder",
         "@com_google_cel_cpp//runtime:runtime_options",
+        "@python_headers_custom//:headers",
     ],
 )
 
@@ -58,6 +60,7 @@ pybind_extension(
         "@com_google_cel_cpp//extensions:math_ext_decls",
         "@com_google_cel_cpp//runtime:runtime_builder",
         "@com_google_cel_cpp//runtime:runtime_options",
+        "@python_headers_custom//:headers",
     ],
 )
 
@@ -81,6 +84,7 @@ pybind_extension(
         "@com_google_cel_cpp//runtime:optional_types",
         "@com_google_cel_cpp//runtime:runtime_builder",
         "@com_google_cel_cpp//runtime:runtime_options",
+        "@python_headers_custom//:headers",
     ],
 )
 
@@ -98,6 +102,7 @@ pybind_extension(
         "//cel_expr_python:cel_extension",
         "@com_google_cel_cpp//compiler",
         "@com_google_cel_cpp//extensions:proto_ext",
+        "@python_headers_custom//:headers",
     ],
 )
 
@@ -119,5 +124,6 @@ pybind_extension(
         "@com_google_cel_cpp//extensions:strings",
         "@com_google_cel_cpp//runtime:runtime_builder",
         "@com_google_cel_cpp//runtime:runtime_options",
+        "@python_headers_custom//:headers",
     ],
 )

cel_expr_python/local_repo_extension.bzl

@@ -0,0 +1,74 @@
+"""Module extension to create a local repository for custom headers."""
+
+# A repository rule that dynamically constructs a platform-independent
+# `python_headers_custom` repository.
+#
+# Why this is needed:
+# 1. In the Google internal repository, Python headers are implicitly provided by internal rules.
+#    In the OSS export, `pybind_extension` and `pybind_library` require explicit access to C++ Python headers.
+# 2. Instead of hardcoding a platform-specific repository (like the Linux-only x86_64-unknown-linux-gnu),
+#    we dynamically resolve the compiler headers from the host platform's registered toolchain alias
+#    (`@@rules_python++python+python_3_11_host`).
+# 3. The directory layout of Python include headers varies by platform:
+#    - POSIX (Linux/macOS) Python distributions nest headers under `include/python3.11/Python.h`.
+#    - Windows MSVC Python distributions place headers directly under `include/Python.h`.
+# 4. This implementation symlinks the host's `include` directory, checks if the nested `python3.11`
+#    folder exists, and dynamically configures the `cc_library` glob and `includes` path accordingly.
+#    This guarantees a seamless, warning-free C++20 compilation on Windows, Linux, and macOS.
+def _custom_headers_repo_impl(ctx):
+    # Resolve label to path
+    build_file_path = ctx.path(ctx.attr.build_file_label)
+    repo_dir = build_file_path.dirname
+
+    # Symlink the include directory
+    ctx.symlink(repo_dir.get_child("include"), "include")
+
+    # Check if include/python3.11 exists (dynamic pathing for POSIX vs Windows)
+    if ctx.path("include/python3.11").exists:
+        include_path = "include/python3.11"
+    else:
+        include_path = "include"
+
+    # Dynamically find and symlink python*.dll files in the repo root (on Windows)
+    python_dlls = []
+    for child in repo_dir.readdir():
+        name = child.basename
+        if name.startswith("python") and name.endswith(".dll"):
+            ctx.symlink(child, name)
+            python_dlls.append('"{}"'.format(name))
+
+    dll_srcs = ", ".join(python_dlls)
+
+    # Create BUILD file with dynamic includes and dll filegroup
+    ctx.file("BUILD.bazel", """
+cc_library(
+    name = "headers",
+    hdrs = glob(["{include_path}/**"]),
+    includes = ["{include_path}"],
+    visibility = ["//visibility:public"],
+)
+
+filegroup(
+    name = "dll",
+    srcs = [{dll_srcs}],
+    visibility = ["//visibility:public"],
+)
+""".format(include_path = include_path, dll_srcs = dll_srcs))
+
+custom_headers_repo = repository_rule(
+    implementation = _custom_headers_repo_impl,
+    attrs = {
+        "build_file_label": attr.label(mandatory = True),
+    },
+)
+
+def _local_repo_extension_impl(_ctx):
+    custom_headers_repo(
+        name = "python_headers_custom",
+        # Use the platform-independent host repository alias!
+        build_file_label = "@@rules_python++python+python_3_11_host//:BUILD.bazel",
+    )
+
+local_repo_ext = module_extension(
+    implementation = _local_repo_extension_impl,
+)

release/kokoro/build_windows.bat

@@ -0,0 +1,62 @@
+@echo off
+:: build_windows.bat
+:: Core Bazel Build script for CEL Python on Windows.
+
+echo === Loading Environment Configuration ===
+call "%~dp0set_env_windows.bat"
+if !ERRORLEVEL! NEQ 0 (
+    echo Failed to configure build environment!
+    exit /b 1
+)
+
+echo --- Fetching Dependencies ---
+bazel %STARTUP_FLAGS% fetch %DISTDIR_FLAGS% //...
+if !ERRORLEVEL! NEQ 0 (
+    echo Fetch failed!
+    exit /b 1
+)
+
+echo --- Getting Output Base ---
+for /f "tokens=*" %%i in ('bazel --output_user_root=C:/tmp info output_base') do set "OUTPUT_BASE=%%i"
+set "OUTPUT_BASE=!OUTPUT_BASE:/=\!"
+echo Output Base: !OUTPUT_BASE!
+
+echo --- Resolving Hermetic Python Toolchain ---
+for /f "tokens=*" %%A in ('dir /b /ad "!OUTPUT_BASE!\external\*python_3_11_host" 2^>nul') do set "PY_HOST_DIR=%%A"
+echo Hermetic Python Directory: !PY_HOST_DIR!
+
+if not "!PY_HOST_DIR!" == "" (
+    echo --- Copying Hermetic Python import library to space-free directory ---
+    if not exist C:\tmp\python_libs mkdir C:\tmp\python_libs
+    copy "!OUTPUT_BASE!\external\!PY_HOST_DIR!\libs\python*.lib" C:\tmp\python_libs\
+    echo --- Copying Hermetic Python DLL to space-free directory ---
+    copy "!OUTPUT_BASE!\external\!PY_HOST_DIR!\python*.dll" C:\tmp\python_libs\
+    set "LINK_FLAGS=--linkopt=/LIBPATH:C:\tmp\python_libs --action_env=PATH"
+    set "PATH=C:\tmp\python_libs;!PATH!"
+) else (
+    echo Warning: Hermetic Python directory not found! Skipping import library copy.
+)
+
+echo --- Applying VERSION Collision Fix ---
+set "ANTLR_DIR=!OUTPUT_BASE!\external\antlr4-cpp-runtime+"
+if exist "!ANTLR_DIR!\VERSION" (
+    if not exist "!ANTLR_DIR!\VERSION.txt" (
+        echo Renaming !ANTLR_DIR!\VERSION to VERSION.txt
+        ren "!ANTLR_DIR!\VERSION" VERSION.txt
+    )
+)
+if exist "!ANTLR_DIR!\version" (
+    if not exist "!ANTLR_DIR!\version.txt" (
+        echo Renaming !ANTLR_DIR!\version to version.txt
+        ren "!ANTLR_DIR!\version" version.txt
+    )
+)
+
+echo --- Bazel Build ---
+bazel %STARTUP_FLAGS% build %DISTDIR_FLAGS% %LINK_FLAGS% //...
+if !ERRORLEVEL! NEQ 0 (
+    echo Build failed!
+    exit /b 1
+)
+
+echo --- Build Success ---

release/kokoro/build_windows.cfg

@@ -2,7 +2,7 @@
 # proto-message: BuildConfig
 
 build_file: "cel-python/release/kokoro/presubmit_windows.bat"
-timeout_mins: 30
+timeout_mins: 120
 
 container_properties {
   docker_image: "us-central1-docker.pkg.dev/kokoro-container-bakery/kokoro/windows/windows2019/full@sha256:c9995cdda2206803409164f9682f47e0027b8836076591a960373e3cdb1847e1"