Update to 2025.4.10.0-3

wpilibsuite · Jan 1, 2025 · 669ddd2 · 669ddd2
1 parent 1c9785b
commit 669ddd2
Show file tree

Hide file tree

Showing 13 changed files with 452 additions and 314 deletions.
diff --git a/.bazelrc b/.bazelrc
@@ -33,10 +33,21 @@ build:bookworm64 --platforms=@rules_bzlmodrio_toolchains//platforms/bookworm64
 build:bookworm64 --build_tag_filters=-no-bookworm
 build:bookworm64 --platform_suffix=bookworm64
 
-# rasppi
-build:raspi32 --platforms=@rules_bzlmodrio_toolchains//platforms/raspi32
-build:raspi32 --build_tag_filters=-no-raspi
-build:raspi32 --platform_suffix=raspi32
+# rasppi bullseye
+build:raspibullseye32 --platforms=@rules_bzlmodrio_toolchains//platforms/raspibullseye32
+build:raspibullseye32 --build_tag_filters=-no-raspi
+build:raspibullseye32 --platform_suffix=raspibullseye32
+
+# rasppi bookworm
+build:raspibookworm32 --platforms=@rules_bzlmodrio_toolchains//platforms/raspibookworm32
+build:raspibookworm32 --build_tag_filters=-no-raspi
+build:raspibookworm32 --platform_suffix=raspibookworm32
+
+# Alias toolchain names to what wpilibsuite uses for CI/Artifact naming
+build:athena --config=roborio
+build:systemcore --config=bookworm64
+build:linuxarm32 --config=raspibookworm32
+build:linuxarm64 --config=bookworm64
 
 test --test_output=errors
 common --registry=https://raw.githubusercontent.com/pjreiniger/bazel-central-registry/bzlmodrio/
diff --git a/.bazelrc-cc b/.bazelrc-cc
@@ -65,7 +65,12 @@ build:bookworm64 --incompatible_enable_cc_toolchain_resolution
 build:bookworm64 --copt=-std=c++20
 build:bookworm64 --features=compiler_param_file
 
-# rasppi
-build:raspi32 --incompatible_enable_cc_toolchain_resolution
-build:raspi32 --copt=-std=c++20
-build:raspi32 --features=compiler_param_file
+# rasppi bullseye
+build:raspibullseye32 --incompatible_enable_cc_toolchain_resolution
+build:raspibullseye32 --copt=-std=c++20
+build:raspibullseye32 --features=compiler_param_file
+
+# rasppi bookworm
+build:raspibookworm32 --incompatible_enable_cc_toolchain_resolution
+build:raspibookworm32 --copt=-std=c++20
+build:raspibookworm32 --features=compiler_param_file
diff --git a/MODULE.bazel b/MODULE.bazel
@@ -1,6 +1,6 @@
 module(
     name = "bzlmodrio-opencv",
-    version = "2025.4.10.0-2",
+    version = "2025.4.10.0-3",
     compatibility_level = 2025,
 )
 
@@ -41,6 +41,10 @@ use_repo(
     "bazelrio_edu_wpi_first_thirdparty_frc_opencv_opencv-cpp_osxuniversaldebug",
     "bazelrio_edu_wpi_first_thirdparty_frc_opencv_opencv-cpp_osxuniversalstatic",
     "bazelrio_edu_wpi_first_thirdparty_frc_opencv_opencv-cpp_osxuniversalstaticdebug",
+    "bazelrio_edu_wpi_first_thirdparty_frc_opencv_opencv-cpp_osxx86-64",
+    "bazelrio_edu_wpi_first_thirdparty_frc_opencv_opencv-cpp_osxx86-64debug",
+    "bazelrio_edu_wpi_first_thirdparty_frc_opencv_opencv-cpp_osxx86-64static",
+    "bazelrio_edu_wpi_first_thirdparty_frc_opencv_opencv-cpp_osxx86-64staticdebug",
     "bazelrio_edu_wpi_first_thirdparty_frc_opencv_opencv-cpp_sources",
     "bazelrio_edu_wpi_first_thirdparty_frc_opencv_opencv-cpp_windowsarm64",
     "bazelrio_edu_wpi_first_thirdparty_frc_opencv_opencv-cpp_windowsarm64debug",

diff --git a/libraries/cpp/opencv/BUILD.bazel b/libraries/cpp/opencv/BUILD.bazel
@@ -23,10 +23,6 @@ alias(
 alias(
     name = "shared",
     actual = "@bzlmodrio-opencv//private/cpp/opencv:shared",
-    target_compatible_with = select({
-        "@rules_bzlmodrio_toolchains//constraints/is_raspi32:raspi32": ["@platforms//:incompatible"],
-        "//conditions:default": [],
-    }),
     visibility = ["//visibility:public"],
 )
 

diff --git a/maven_cpp_deps.bzl b/maven_cpp_deps.bzl
diff --git a/maven_java_deps.bzl b/maven_java_deps.bzl
diff --git a/private/cpp/opencv/BUILD.bazel b/private/cpp/opencv/BUILD.bazel
@@ -16,10 +16,6 @@ cc_library(
     }),
     linkstatic = True,
     tags = ["manual"],
-    target_compatible_with = select({
-        "@rules_bzlmodrio_toolchains//constraints/is_raspi32:raspi32": ["@platforms//:incompatible"],
-        "//conditions:default": [],
-    }),
     visibility = ["@bzlmodrio-opencv//:__subpackages__"],
     deps = ["@bazelrio_edu_wpi_first_thirdparty_frc_opencv_opencv-cpp_headers//:headers"],
 )
@@ -35,12 +31,10 @@ filegroup(
         "@rules_bzlmodrio_toolchains//conditions:windows_arm64": ["@bazelrio_edu_wpi_first_thirdparty_frc_opencv_opencv-cpp_windowsarm64//:shared"],
         "@rules_bzlmodrio_toolchains//conditions:windows_arm64_debug": ["@bazelrio_edu_wpi_first_thirdparty_frc_opencv_opencv-cpp_windowsarm64debug//:shared"],
         "@rules_bzlmodrio_toolchains//conditions:windows_debug": ["@bazelrio_edu_wpi_first_thirdparty_frc_opencv_opencv-cpp_windowsx86-64debug//:shared"],
-        "@rules_bzlmodrio_toolchains//constraints/is_bookworm64:bookworm64": ["@bazelrio_edu_wpi_first_thirdparty_frc_opencv_opencv-cpp_linuxsystemcore//:shared"],
-        "@rules_bzlmodrio_toolchains//constraints/is_bookworm64:bookworm64_debug": ["@bazelrio_edu_wpi_first_thirdparty_frc_opencv_opencv-cpp_linuxsystemcoredebug//:shared"],
-        "@rules_bzlmodrio_toolchains//constraints/is_bullseye32:bullseye32": ["@bazelrio_edu_wpi_first_thirdparty_frc_opencv_opencv-cpp_linuxarm32//:shared"],
-        "@rules_bzlmodrio_toolchains//constraints/is_bullseye32:bullseye32_debug": ["@bazelrio_edu_wpi_first_thirdparty_frc_opencv_opencv-cpp_linuxarm32debug//:shared"],
-        "@rules_bzlmodrio_toolchains//constraints/is_bullseye64:bullseye64": ["@bazelrio_edu_wpi_first_thirdparty_frc_opencv_opencv-cpp_linuxarm64//:shared"],
-        "@rules_bzlmodrio_toolchains//constraints/is_bullseye64:bullseye64_debug": ["@bazelrio_edu_wpi_first_thirdparty_frc_opencv_opencv-cpp_linuxarm64debug//:shared"],
+        "@rules_bzlmodrio_toolchains//constraints/is_bookworm64:bookworm64": ["@bazelrio_edu_wpi_first_thirdparty_frc_opencv_opencv-cpp_linuxarm64//:shared"],
+        "@rules_bzlmodrio_toolchains//constraints/is_bookworm64:bookworm64_debug": ["@bazelrio_edu_wpi_first_thirdparty_frc_opencv_opencv-cpp_linuxarm64debug//:shared"],
+        "@rules_bzlmodrio_toolchains//constraints/is_raspibookworm32:raspibookworm32": ["@bazelrio_edu_wpi_first_thirdparty_frc_opencv_opencv-cpp_linuxarm32//:shared"],
+        "@rules_bzlmodrio_toolchains//constraints/is_raspibookworm32:raspibookworm32_debug": ["@bazelrio_edu_wpi_first_thirdparty_frc_opencv_opencv-cpp_linuxarm32debug//:shared"],
         "@rules_bzlmodrio_toolchains//constraints/is_roborio:roborio": ["@bazelrio_edu_wpi_first_thirdparty_frc_opencv_opencv-cpp_linuxathena//:shared"],
         "@rules_bzlmodrio_toolchains//constraints/is_roborio:roborio_debug": ["@bazelrio_edu_wpi_first_thirdparty_frc_opencv_opencv-cpp_linuxathenadebug//:shared"],
         "//conditions:default": [],
@@ -51,10 +45,6 @@ filegroup(
 cc_library(
     name = "shared",
     srcs = [":shared_raw"],
-    target_compatible_with = select({
-        "@rules_bzlmodrio_toolchains//constraints/is_raspi32:raspi32": ["@platforms//:incompatible"],
-        "//conditions:default": [],
-    }),
     visibility = ["@bzlmodrio-opencv//:__subpackages__"],
     deps = [] + select({
         "@rules_bzlmodrio_toolchains//conditions:windows": [":shared_interface"],
@@ -80,12 +70,10 @@ cc_library(
         "@rules_bzlmodrio_toolchains//conditions:windows_arm64": ["@bazelrio_edu_wpi_first_thirdparty_frc_opencv_opencv-cpp_windowsarm64static//:static_libs"],
         "@rules_bzlmodrio_toolchains//conditions:windows_arm64_debug": ["@bazelrio_edu_wpi_first_thirdparty_frc_opencv_opencv-cpp_windowsarm64staticdebug//:static_libs"],
         "@rules_bzlmodrio_toolchains//conditions:windows_debug": ["@bazelrio_edu_wpi_first_thirdparty_frc_opencv_opencv-cpp_windowsx86-64staticdebug//:static_libs"],
-        "@rules_bzlmodrio_toolchains//constraints/is_bookworm64:bookworm64": ["@bazelrio_edu_wpi_first_thirdparty_frc_opencv_opencv-cpp_linuxsystemcorestatic//:static_libs"],
-        "@rules_bzlmodrio_toolchains//constraints/is_bookworm64:bookworm64_debug": ["@bazelrio_edu_wpi_first_thirdparty_frc_opencv_opencv-cpp_linuxsystemcorestaticdebug//:static_libs"],
-        "@rules_bzlmodrio_toolchains//constraints/is_bullseye32:bullseye32": ["@bazelrio_edu_wpi_first_thirdparty_frc_opencv_opencv-cpp_linuxarm32static//:static_libs"],
-        "@rules_bzlmodrio_toolchains//constraints/is_bullseye32:bullseye32_debug": ["@bazelrio_edu_wpi_first_thirdparty_frc_opencv_opencv-cpp_linuxarm32staticdebug//:static_libs"],
-        "@rules_bzlmodrio_toolchains//constraints/is_bullseye64:bullseye64": ["@bazelrio_edu_wpi_first_thirdparty_frc_opencv_opencv-cpp_linuxarm64static//:static_libs"],
-        "@rules_bzlmodrio_toolchains//constraints/is_bullseye64:bullseye64_debug": ["@bazelrio_edu_wpi_first_thirdparty_frc_opencv_opencv-cpp_linuxarm64staticdebug//:static_libs"],
+        "@rules_bzlmodrio_toolchains//constraints/is_bookworm64:bookworm64": ["@bazelrio_edu_wpi_first_thirdparty_frc_opencv_opencv-cpp_linuxarm64static//:static_libs"],
+        "@rules_bzlmodrio_toolchains//constraints/is_bookworm64:bookworm64_debug": ["@bazelrio_edu_wpi_first_thirdparty_frc_opencv_opencv-cpp_linuxarm64staticdebug//:static_libs"],
+        "@rules_bzlmodrio_toolchains//constraints/is_raspibookworm32:raspibookworm32": ["@bazelrio_edu_wpi_first_thirdparty_frc_opencv_opencv-cpp_linuxarm32static//:static_libs"],
+        "@rules_bzlmodrio_toolchains//constraints/is_raspibookworm32:raspibookworm32_debug": ["@bazelrio_edu_wpi_first_thirdparty_frc_opencv_opencv-cpp_linuxarm32staticdebug//:static_libs"],
         "@rules_bzlmodrio_toolchains//constraints/is_roborio:roborio": ["@bazelrio_edu_wpi_first_thirdparty_frc_opencv_opencv-cpp_linuxathenastatic//:static_libs"],
         "@rules_bzlmodrio_toolchains//constraints/is_roborio:roborio_debug": ["@bazelrio_edu_wpi_first_thirdparty_frc_opencv_opencv-cpp_linuxathenastaticdebug//:static_libs"],
     }),
@@ -102,20 +90,14 @@ cc_library(
         "@rules_bzlmodrio_toolchains//conditions:windows_arm64": ["@bazelrio_edu_wpi_first_thirdparty_frc_opencv_opencv-cpp_windowsarm64//:jni"],
         "@rules_bzlmodrio_toolchains//conditions:windows_arm64_debug": ["@bazelrio_edu_wpi_first_thirdparty_frc_opencv_opencv-cpp_windowsarm64debug//:jni"],
         "@rules_bzlmodrio_toolchains//conditions:windows_debug": ["@bazelrio_edu_wpi_first_thirdparty_frc_opencv_opencv-cpp_windowsx86-64debug//:jni"],
-        "@rules_bzlmodrio_toolchains//constraints/is_bookworm64:bookworm64": ["@bazelrio_edu_wpi_first_thirdparty_frc_opencv_opencv-cpp_linuxsystemcore//:jni"],
-        "@rules_bzlmodrio_toolchains//constraints/is_bookworm64:bookworm64_debug": ["@bazelrio_edu_wpi_first_thirdparty_frc_opencv_opencv-cpp_linuxsystemcoredebug//:jni"],
-        "@rules_bzlmodrio_toolchains//constraints/is_bullseye32:bullseye32": ["@bazelrio_edu_wpi_first_thirdparty_frc_opencv_opencv-cpp_linuxarm32//:jni"],
-        "@rules_bzlmodrio_toolchains//constraints/is_bullseye32:bullseye32_debug": ["@bazelrio_edu_wpi_first_thirdparty_frc_opencv_opencv-cpp_linuxarm32debug//:jni"],
-        "@rules_bzlmodrio_toolchains//constraints/is_bullseye64:bullseye64": ["@bazelrio_edu_wpi_first_thirdparty_frc_opencv_opencv-cpp_linuxarm64//:jni"],
-        "@rules_bzlmodrio_toolchains//constraints/is_bullseye64:bullseye64_debug": ["@bazelrio_edu_wpi_first_thirdparty_frc_opencv_opencv-cpp_linuxarm64debug//:jni"],
+        "@rules_bzlmodrio_toolchains//constraints/is_bookworm64:bookworm64": ["@bazelrio_edu_wpi_first_thirdparty_frc_opencv_opencv-cpp_linuxarm64//:jni"],
+        "@rules_bzlmodrio_toolchains//constraints/is_bookworm64:bookworm64_debug": ["@bazelrio_edu_wpi_first_thirdparty_frc_opencv_opencv-cpp_linuxarm64debug//:jni"],
+        "@rules_bzlmodrio_toolchains//constraints/is_raspibookworm32:raspibookworm32": ["@bazelrio_edu_wpi_first_thirdparty_frc_opencv_opencv-cpp_linuxarm32//:jni"],
+        "@rules_bzlmodrio_toolchains//constraints/is_raspibookworm32:raspibookworm32_debug": ["@bazelrio_edu_wpi_first_thirdparty_frc_opencv_opencv-cpp_linuxarm32debug//:jni"],
         "@rules_bzlmodrio_toolchains//constraints/is_roborio:roborio": ["@bazelrio_edu_wpi_first_thirdparty_frc_opencv_opencv-cpp_linuxathena//:jni"],
         "@rules_bzlmodrio_toolchains//constraints/is_roborio:roborio_debug": ["@bazelrio_edu_wpi_first_thirdparty_frc_opencv_opencv-cpp_linuxathenadebug//:jni"],
     }),
     linkstatic = 1,
-    target_compatible_with = select({
-        "@rules_bzlmodrio_toolchains//constraints/is_raspi32:raspi32": ["@platforms//:incompatible"],
-        "//conditions:default": [],
-    }),
     visibility = ["@bzlmodrio-opencv//:__subpackages__"],
     deps = [
         ":shared",

diff --git a/private/non_bzlmod_dependencies/download_dependencies.bzl b/private/non_bzlmod_dependencies/download_dependencies.bzl
@@ -26,8 +26,9 @@ def download_dependencies():
     # Roborio Toolchain
     http_archive(
         name = "rules_bzlmodrio_toolchains",
-        sha256 = "fe267e2af53c1def1e962700a9aeda9e8fdfa9fb46b72167c615ec0e25447dd6",
-        url = "https://github.com/wpilibsuite/rules_bzlmodRio_toolchains/releases/download/2025-1/rules_bzlmodRio_toolchains-2025-1.tar.gz",
+        sha256 = "958130b125506a81199b60644ba5127aa9c3e312cef936a08302827469dc8971",
+        strip_prefix = "rules_bzlmodrio_toolchains-39c30a642687eec03d1dd514af9282a1141616d4",
+        url = "https://github.com/wpilibsuite/rules_bzlmodRio_toolchains/archive/39c30a642687eec03d1dd514af9282a1141616d4/rules_bzlmodRio_toolchains.tar.gz",
     )
 
     ########################

diff --git a/private/non_bzlmod_dependencies/setup_dependencies.bzl b/private/non_bzlmod_dependencies/setup_dependencies.bzl
@@ -14,9 +14,12 @@ def _setup_toolchains():
         "@local_roborio//:macos",
         "@local_roborio//:linux",
         "@local_roborio//:windows",
-        "@local_raspi_32//:macos",
-        "@local_raspi_32//:linux",
-        "@local_raspi_32//:windows",
+        "@local_raspi_bookworm_32//:macos",
+        "@local_raspi_bookworm_32//:linux",
+        "@local_raspi_bookworm_32//:windows",
+        "@local_raspi_bookworm_32//:macos",
+        "@local_raspi_bookworm_32//:linux",
+        "@local_raspi_bookworm_32//:windows",
         "@local_bullseye_32//:macos",
         "@local_bullseye_32//:linux",
         "@local_bullseye_32//:windows",

diff --git a/tests/.bazelrc b/tests/.bazelrc
@@ -33,10 +33,21 @@ build:bookworm64 --platforms=@rules_bzlmodrio_toolchains//platforms/bookworm64
 build:bookworm64 --build_tag_filters=-no-bookworm
 build:bookworm64 --platform_suffix=bookworm64
 
-# rasppi
-build:raspi32 --platforms=@rules_bzlmodrio_toolchains//platforms/raspi32
-build:raspi32 --build_tag_filters=-no-raspi
-build:raspi32 --platform_suffix=raspi32
+# rasppi bullseye
+build:raspibullseye32 --platforms=@rules_bzlmodrio_toolchains//platforms/raspibullseye32
+build:raspibullseye32 --build_tag_filters=-no-raspi
+build:raspibullseye32 --platform_suffix=raspibullseye32
+
+# rasppi bookworm
+build:raspibookworm32 --platforms=@rules_bzlmodrio_toolchains//platforms/raspibookworm32
+build:raspibookworm32 --build_tag_filters=-no-raspi
+build:raspibookworm32 --platform_suffix=raspibookworm32
+
+# Alias toolchain names to what wpilibsuite uses for CI/Artifact naming
+build:athena --config=roborio
+build:systemcore --config=bookworm64
+build:linuxarm32 --config=raspibookworm32
+build:linuxarm64 --config=bookworm64
 
 test --test_output=errors
 common --registry=https://raw.githubusercontent.com/pjreiniger/bazel-central-registry/bzlmodrio/
diff --git a/tests/.bazelrc-cc b/tests/.bazelrc-cc
@@ -65,7 +65,12 @@ build:bookworm64 --incompatible_enable_cc_toolchain_resolution
 build:bookworm64 --copt=-std=c++20
 build:bookworm64 --features=compiler_param_file
 
-# rasppi
-build:raspi32 --incompatible_enable_cc_toolchain_resolution
-build:raspi32 --copt=-std=c++20
-build:raspi32 --features=compiler_param_file
+# rasppi bullseye
+build:raspibullseye32 --incompatible_enable_cc_toolchain_resolution
+build:raspibullseye32 --copt=-std=c++20
+build:raspibullseye32 --features=compiler_param_file
+
+# rasppi bookworm
+build:raspibookworm32 --incompatible_enable_cc_toolchain_resolution
+build:raspibookworm32 --copt=-std=c++20
+build:raspibookworm32 --features=compiler_param_file
diff --git a/tests/MODULE.bazel b/tests/MODULE.bazel
@@ -16,6 +16,18 @@ bazel_dep(name = "rules_wpiformat", version = "2024.45")
 bazel_dep(name = "rules_wpi_styleguide", version = "2024.11.19")
 bazel_dep(name = "rules_spotless", version = "2.40.0")
 bazel_dep(name = "rules_bzlmodrio_jdk", version = "17.0.12-7")
+archive_override(
+    module_name = "rules_bzlmodrio_jdk",
+    integrity = "sha256-SrikyrF2v2lENdqn9aFC//d0TkIE620lR60yXTrWFTs=",
+    strip_prefix = "rules_bzlmodrio_jdk-4ecd4cbc97dfbfe2ceefa627de1228e2f2ca5773",
+    urls = ["https://github.com/wpilibsuite/rules_bzlmodRio_jdk/archive/4ecd4cbc97dfbfe2ceefa627de1228e2f2ca5773.tar.gz"],
+)
+archive_override(
+    module_name = "rules_bzlmodrio_toolchains",
+    integrity = "sha256-lYEwsSVQaoEZm2BkS6USeqnD4xLO+TaggwKCdGnciXE=",
+    strip_prefix = "rules_bzlmodrio_toolchains-39c30a642687eec03d1dd514af9282a1141616d4",
+    urls = ["https://github.com/wpilibsuite/rules_bzlmodrio_toolchains/archive/39c30a642687eec03d1dd514af9282a1141616d4.tar.gz"],
+)
 
 maven = use_extension("@rules_jvm_external//:extensions.bzl", "maven")
 maven.install(