[WIP] Tweak bazel settings on Windows

Author: rdesgroppes

.gitlab/bazel/build-deps.yaml

@@ -36,5 +36,4 @@ bazel:build-deps:windows-amd64:
     ARCH: x64
     SCRIPT: |-
       echo "🟡 TODO(regis): compilation errors remain - limiting to a working subset for the time being"
-      bazel build @zlib//...
-      # bazel build @bzip2//...
+      bazel run //bazel/buildifier

MODULE.bazel

@@ -12,6 +12,11 @@ bazel_dep(name = "rules_pkg", version = "1.1.0")
 #########################
 
 bazel_dep(name = "buildifier_prebuilt", version = "8.2.0.2", dev_dependency = True)
+single_version_override(
+    module_name = "buildifier_prebuilt",
+    patch_strip = 1,
+    patches = ["//bazel/patches:buildifier_prebuilt.windows.patch"],
+)
 
 bazel_dep(name = "rules_multitool", version = "1.9.0")
 

bazel/patches/buildifier_prebuilt.windows.patch

@@ -0,0 +1,131 @@
+commit 48d799c583061928695056dd2d17a6501bc06002
+Author: Régis Desgroppes <[email protected]>
+Date:   Fri Sep 26 13:08:27 2025 +0200
+
+    Anticipate Windows fixes for buildifier
+    
+    This applies Windows fixes proposed by:
+    https://github.com/keith/buildifier-prebuilt/pull/89
+
+diff --git a/buildifier/factory.bzl b/buildifier/factory.bzl
+index 6a8098c..f708ea3 100644
+--- a/buildifier/factory.bzl
++++ b/buildifier/factory.bzl
+@@ -151,7 +151,7 @@ def buildifier_impl_factory(ctx, *, test_rule):
+ 
+     substitutions = {
+         "@@ARGS@@": shell.array_literal(args) if out_ext == ".bash" else shell.array_literal(args)[1:][:-1].replace("'", ""),
+-        "@@BUILDIFIER_SHORT_PATH@@": shell.quote(buildifier.short_path) if out_ext == ".bash" else buildifier.path,
++        "@@BUILDIFIER_SHORT_PATH@@": shell.quote(buildifier.short_path) if out_ext == ".bash" else buildifier.short_path,
+         "@@EXCLUDE_PATTERNS@@": exclude_patterns_str,
+         "@@WORKSPACE@@": workspace,
+     }
+diff --git a/runner.bat.template b/runner.bat.template
+index c27e34d..fc2b873 100644
+--- a/runner.bat.template
++++ b/runner.bat.template
+@@ -6,52 +6,80 @@ set EXTRA_ARGS=@@ARGS@@
+ set WORKSPACE=@@WORKSPACE@@
+ 
+ REM When --enable_runfiles, we should be able to locate buildifier directly through symlink.
+-for %%I in (%BUILDIFIER_SHORT_PATH%) do set "buildifier_short_path=%%~fI"
++set buildifier_path=%BUILDIFIER_SHORT_PATH:/=\%
++for %%I in (%buildifier_path%) do (
++    set "buildifier_path=%%~fI"
++)
+ 
+-REM If we can't find it, then parse the MANIFEST file to find buildifier.
+-if not exist !buildifier_short_path! (
+-    if not exist MANIFEST (
+-        echo Runfiles are not enabled, yet a MANIFEST file cannot be found
+-        exit /b 1
+-    )
+-    type MANIFEST
+-    for /F "tokens=1" %%F IN ('findstr /L /C:buildifier.exe MANIFEST') DO (
+-        set "buildifier_short_path=%%~fF"
++set manifest_path=MANIFEST
++if not exist %manifest_path% (
++    set manifest_path=..\MANIFEST
++)
++if not exist %manifest_path% (
++    echo a MANIFEST file cannot be found
++    exit /b 1
++)
++
++REM find the workspace directory in manifest. 
++REM No good way in bat to read path of a symlink's target
++set workspace_dir=
++for /F "tokens=2 delims= " %%F IN ('findstr /l /c:"WORKSPACE" %manifest_path%') DO (
++    set "workspace_dir=%%~dpF"
++)
++
++REM If the buildifier isn't immediately available via short_path from
++REM current directory, then parse the MANIFEST file to find buildifier.
++if not exist !buildifier_path! (
++    for /F "tokens=2 delims= " %%F IN ('findstr /l /c:"buildifier.exe" %manifest_path%') DO (
++        set "buildifier_path=%%F"
+     )
+ )
+ 
+-if not exist !buildifier_short_path! (
+-    echo Failed to find buildifier at !buildifier_short_path!
++if not exist !buildifier_path! (
++    echo Failed to find buildifier at !buildifier_path!
+     exit /b 1
+ )
+ 
+-if defined TEST_WORKSPACE (
+-    if not defined BUILD_WORKSPACE_DIRECTORY (
+-        if defined WORKSPACE (
+-            cd "%WORKSPACE%"
+-        ) else (
+-            set follow_links=1
+-        )
++if defined BUILD_WORKSPACE_DIRECTORY (
++    rem either a build, or a run/build inside a test
++    echo cd %BUILD_WORKSPACE_DIRECTORY%
++    cd %BUILD_WORKSPACE_DIRECTORY%
++) else if defined TEST_WORKSPACE (
++    if defined workspace_dir (
++        echo cd: %workspace_dir%
++        cd %workspace_dir%
++    ) else (
++        REM this path doesn't seem required in bazel 7.2; manifest is always present
++        echo set follow_links=1
++        set follow_links=1
+     )
+ ) else (
+-    cd "%BUILD_WORKSPACE_DIRECTORY%"
++    echo Failed to find workspace to check 
+ )
+ 
+ call :collectFiles .
+ 
+-!buildifier_short_path! %EXTRA_ARGS% !files_to_analyze!
++if !files_to_analyze! == "" (
++    echo Failed to find files to analyze
++    exit /b 1
++)
++echo !buildifier_path! %EXTRA_ARGS% !files_to_analyze!
++!buildifier_path! %EXTRA_ARGS% !files_to_analyze!
+ 
+ exit /b !ERRORLEVEL!
+ 
+ REM Utility function to collect all wanted files.
+ REM Exclude patterns are not supported by `dir.exe`.
+ :collectFiles
+-
+ REM First, non-symlinked files
+ pushd %~1
++REM echo collecting in %cd%
+ FOR /F %%f IN ('dir /b/a:-d-l-h *.bzl *.sky *.bazel *.BUILD BUILD BUILD.*.oss WORKSPACE WORKSPACE.bzlmod WORKSPACE.oss WORKSPACE.*.oss 2^>nul') DO (
+-    REM echo File %~1\%%f
+-    set files_to_analyze=!files_to_analyze! %~1\%%f
++    set FILE=%~1\%%f
++    REM remove .\ prefix
++    set FILE=!FILE:.\=!
++    REM echo Found %~1\%%f adding !FILE!
++    set files_to_analyze=!files_to_analyze! !FILE!
+ )
+ popd
+