From 06b5678d601a868d8dc02a63c41e8695eb66c6d7 Mon Sep 17 00:00:00 2001 From: PJ Reiniger Date: Thu, 19 Oct 2023 01:27:02 +0100 Subject: [PATCH] Update toolchains version (#9) --- .bazelrc | 2 ++ MODULE.bazel | 4 ++-- generate/generate.py | 4 +--- generate/get_opencv_dependencies.py | 2 ++ generate/get_version.py | 2 +- private/non_bzlmod_dependencies/download_dependencies.bzl | 4 ++-- tests/.bazelrc | 2 ++ tests/MODULE.bazel | 2 +- 8 files changed, 13 insertions(+), 9 deletions(-) diff --git a/.bazelrc b/.bazelrc index 15b80b5..0aa2075 100644 --- a/.bazelrc +++ b/.bazelrc @@ -9,6 +9,7 @@ build:windows --copt=/WX build:windows --copt=/std:c++20 build:windows --copt=/Zc:preprocessor build:windows --copt=/wd5105 +build:windows --cxxopt=/wd4146 build:windows --cxxopt=/wd4267 build:windows --cxxopt=/wd4244 @@ -18,6 +19,7 @@ build:windows_arm --copt=/WX build:windows_arm --copt=/std:c++20 build:windows_arm --copt=/Zc:preprocessor build:windows_arm --copt=/wd5105 +build:windows_arm --cxxopt=/wd4146 build:windows_arm --cxxopt=/wd4267 build:windows_arm --cxxopt=/wd4244 build:windows_arm --cpu=x64_arm64_windows diff --git a/MODULE.bazel b/MODULE.bazel index f82f95d..715d8a4 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -1,6 +1,6 @@ module( name = "bzlmodrio-opencv", - version = "4.8.0-1", + version = "2024.4.8.0-1", compatibility_level = 2024, ) @@ -8,7 +8,7 @@ bazel_dep(name = "platforms", version = "0.0.7") bazel_dep(name = "rules_cc", version = "0.0.8") bazel_dep(name = "rules_java", version = "6.4.0") bazel_dep(name = "rules_bazelrio", version = "0.0.13") -bazel_dep(name = "rules_bzlmodrio_toolchains", version = "2023-7") +bazel_dep(name = "rules_bzlmodrio_toolchains", version = "2024-1") setup_bzlmodrio_opencv_cpp_dependencies = use_extension("//:maven_cpp_deps.bzl", "setup_bzlmodrio_opencv_cpp_dependencies") use_repo( diff --git a/generate/generate.py b/generate/generate.py index 0622ca1..2628a06 100644 --- a/generate/generate.py +++ b/generate/generate.py @@ -25,9 +25,7 @@ def main(): mandatory_dependencies = create_default_mandatory_settings(GenericCliArgs(args)) clean_existing_version(REPO_DIR) - generate_module_project_files( - REPO_DIR, group, mandatory_dependencies, include_windows_arm_compiler=True - ) + generate_module_project_files(REPO_DIR, group, mandatory_dependencies) generate_group(output_dir, group, force_tests=args.force_tests) diff --git a/generate/get_opencv_dependencies.py b/generate/get_opencv_dependencies.py index 477f8c2..bfa69ba 100644 --- a/generate/get_opencv_dependencies.py +++ b/generate/get_opencv_dependencies.py @@ -76,6 +76,8 @@ def get_opencv_dependencies(): dependencies=["opencv-cpp"], ) + group.sanitized_version = year + "." + group.sanitized_version + return group diff --git a/generate/get_version.py b/generate/get_version.py index 6b77cc0..3230253 100644 --- a/generate/get_version.py +++ b/generate/get_version.py @@ -3,7 +3,7 @@ def main(): group = get_opencv_dependencies() - print(group.version) + print(group.year + "." + group.version) if __name__ == "__main__": diff --git a/private/non_bzlmod_dependencies/download_dependencies.bzl b/private/non_bzlmod_dependencies/download_dependencies.bzl index 7679f6b..da12b51 100644 --- a/private/non_bzlmod_dependencies/download_dependencies.bzl +++ b/private/non_bzlmod_dependencies/download_dependencies.bzl @@ -19,8 +19,8 @@ def download_dependencies(): # Roborio Toolchain http_archive( name = "rules_bzlmodrio_toolchains", - sha256 = "1c566358f97b093916e150de10b65d6527ad268e5bd8bc0a0a8bfd04b390751a", - url = "https://github.com/bzlmodRio/rules_bzlmodRio_toolchains/releases/download/2023-7/rules_bzlmodRio_toolchains-2023-7.tar.gz", + sha256 = "cd3ff046427e9c6dbc0c86a458c8cf081b8045fc3fb4265d08c0ebfc17f9cb30", + url = "https://github.com/bzlmodRio/rules_bzlmodRio_toolchains/releases/download/2024-1/rules_bzlmodRio_toolchains-2024-1.tar.gz", ) ######################## diff --git a/tests/.bazelrc b/tests/.bazelrc index 15b80b5..0aa2075 100644 --- a/tests/.bazelrc +++ b/tests/.bazelrc @@ -9,6 +9,7 @@ build:windows --copt=/WX build:windows --copt=/std:c++20 build:windows --copt=/Zc:preprocessor build:windows --copt=/wd5105 +build:windows --cxxopt=/wd4146 build:windows --cxxopt=/wd4267 build:windows --cxxopt=/wd4244 @@ -18,6 +19,7 @@ build:windows_arm --copt=/WX build:windows_arm --copt=/std:c++20 build:windows_arm --copt=/Zc:preprocessor build:windows_arm --copt=/wd5105 +build:windows_arm --cxxopt=/wd4146 build:windows_arm --cxxopt=/wd4267 build:windows_arm --cxxopt=/wd4244 build:windows_arm --cpu=x64_arm64_windows diff --git a/tests/MODULE.bazel b/tests/MODULE.bazel index ad3381b..3b816a8 100644 --- a/tests/MODULE.bazel +++ b/tests/MODULE.bazel @@ -9,7 +9,7 @@ bazel_dep(name = "rules_cc", version = "0.0.8") bazel_dep(name = "rules_java", version = "6.4.0") bazel_dep(name = "rules_jvm_external", version = "5.3") bazel_dep(name = "rules_bazelrio", version = "0.0.13") -bazel_dep(name = "rules_bzlmodrio_toolchains", version = "2023-7") +bazel_dep(name = "rules_bzlmodrio_toolchains", version = "2024-1") bazel_dep(name = "rules_pmd", version = "6.43.0") bazel_dep(name = "rules_checkstyle", version = "10.1") bazel_dep(name = "rules_wpiformat", version = "2022.30")