From f54068e889417d7d90fc0d171b8c44d4e1697785 Mon Sep 17 00:00:00 2001 From: James Sharpe Date: Mon, 21 Feb 2022 01:06:56 +0000 Subject: [PATCH] Add 3.22.2 and 3.21.5 (#875) --- foreign_cc/private/framework/toolchain.bzl | 2 +- foreign_cc/repositories.bzl | 4 +- toolchains/built_toolchains.bzl | 2 + toolchains/prebuilt_toolchains.bzl | 292 ++++++++++++++++++--- toolchains/prebuilt_toolchains.py | 2 + 5 files changed, 258 insertions(+), 44 deletions(-) diff --git a/foreign_cc/private/framework/toolchain.bzl b/foreign_cc/private/framework/toolchain.bzl index 01778d3a..5d55da30 100644 --- a/foreign_cc/private/framework/toolchain.bzl +++ b/foreign_cc/private/framework/toolchain.bzl @@ -107,5 +107,5 @@ def register_framework_toolchains(register_toolchains = True): toolchains.append("@{}//:toolchain".format(toolchain_name)) - if (register_toolchains): + if register_toolchains: native.register_toolchains(*toolchains) diff --git a/foreign_cc/repositories.bzl b/foreign_cc/repositories.bzl index e257d2a6..b8ccac87 100644 --- a/foreign_cc/repositories.bzl +++ b/foreign_cc/repositories.bzl @@ -9,7 +9,7 @@ load("//toolchains:toolchains.bzl", "built_toolchains", "prebuilt_toolchains", " def rules_foreign_cc_dependencies( native_tools_toolchains = [], register_default_tools = True, - cmake_version = "3.22.1", + cmake_version = "3.22.2", make_version = "4.3", ninja_version = "1.10.2", register_preinstalled_tools = True, @@ -48,7 +48,7 @@ def rules_foreign_cc_dependencies( register_framework_toolchains(register_toolchains = register_toolchains) - if (register_toolchains): + if register_toolchains: native.register_toolchains(*native_tools_toolchains) native.register_toolchains( diff --git a/toolchains/built_toolchains.bzl b/toolchains/built_toolchains.bzl index 9fa783d7..3c84202d 100644 --- a/toolchains/built_toolchains.bzl +++ b/toolchains/built_toolchains.bzl @@ -20,8 +20,10 @@ _CMAKE_SRCS = { "3.21.2": [["https://github.com/Kitware/CMake/releases/download/v3.21.2/cmake-3.21.2.tar.gz"], "cmake-3.21.2", "94275e0b61c84bb42710f5320a23c6dcb2c6ee032ae7d2a616f53f68b3d21659"], "3.21.3": [["https://github.com/Kitware/CMake/releases/download/v3.21.3/cmake-3.21.3.tar.gz"], "cmake-3.21.3", "d14d06df4265134ee42c4d50f5a60cb8b471b7b6a47da8e5d914d49dd783794f"], "3.21.4": [["https://github.com/Kitware/CMake/releases/download/v3.21.4/cmake-3.21.4.tar.gz"], "cmake-3.21.4", "d9570a95c215f4c9886dd0f0564ca4ef8d18c30750f157238ea12669c2985978"], + "3.21.5": [["https://github.com/Kitware/CMake/releases/download/v3.21.5/cmake-3.21.5.tar.gz"], "cmake-3.21.5", "c73587b5ab827d56c09f0a1e256b12743ff200495e31fc9686f2b9dc8a28897f"], "3.22.0": [["https://github.com/Kitware/CMake/releases/download/v3.22.0/cmake-3.22.0.tar.gz"], "cmake-3.22.0", "998c7ba34778d2dfdb3df8a695469e24b11e2bfa21fbe41b361a3f45e1c9345e"], "3.22.1": [["https://github.com/Kitware/CMake/releases/download/v3.22.1/cmake-3.22.1.tar.gz"], "cmake-3.22.1", "0e998229549d7b3f368703d20e248e7ee1f853910d42704aa87918c213ea82c0"], + "3.22.2": [["https://github.com/Kitware/CMake/releases/download/v3.22.2/cmake-3.22.2.tar.gz"], "cmake-3.22.2", "3c1c478b9650b107d452c5bd545c72e2fad4e37c09b89a1984b9a2f46df6aced"], } # buildifier: disable=unnamed-macro diff --git a/toolchains/prebuilt_toolchains.bzl b/toolchains/prebuilt_toolchains.bzl index 464073be..04069d04 100644 --- a/toolchains/prebuilt_toolchains.bzl +++ b/toolchains/prebuilt_toolchains.bzl @@ -66,6 +66,111 @@ def prebuilt_toolchains(cmake_version, ninja_version, register_toolchains): _make_toolchains(register_toolchains) def _cmake_toolchains(version, register_toolchains): + if "3.22.2" == version: + maybe( + http_archive, + name = "cmake-3.22.2-linux-aarch64", + urls = [ + "https://github.com/Kitware/CMake/releases/download/v3.22.2/cmake-3.22.2-linux-aarch64.tar.gz", + ], + sha256 = "02b2b36afc932ede2d77ba53456785bae85538d5d4600f87220072b95d926c5b", + strip_prefix = "cmake-3.22.2-linux-aarch64", + build_file_content = _CMAKE_BUILD_FILE.format( + bin = "cmake", + ), + ) + + maybe( + http_archive, + name = "cmake-3.22.2-linux-x86_64", + urls = [ + "https://github.com/Kitware/CMake/releases/download/v3.22.2/cmake-3.22.2-linux-x86_64.tar.gz", + ], + sha256 = "38b3befdee8fd2bac06954e2a77cb3072e6833c69d8cc013c0a3b26f1cfdfe37", + strip_prefix = "cmake-3.22.2-linux-x86_64", + build_file_content = _CMAKE_BUILD_FILE.format( + bin = "cmake", + ), + ) + + maybe( + http_archive, + name = "cmake-3.22.2-macos-universal", + urls = [ + "https://github.com/Kitware/CMake/releases/download/v3.22.2/cmake-3.22.2-macos-universal.tar.gz", + ], + sha256 = "cc763f6110b4d49daf51d05689fe54526f84056c9418b0735d9058c803931e54", + strip_prefix = "cmake-3.22.2-macos-universal/CMake.app/Contents", + build_file_content = _CMAKE_BUILD_FILE.format( + bin = "cmake", + ), + ) + + maybe( + http_archive, + name = "cmake-3.22.2-windows-i386", + urls = [ + "https://github.com/Kitware/CMake/releases/download/v3.22.2/cmake-3.22.2-windows-i386.zip", + ], + sha256 = "c2b32d2b150ea70e353b658fefe5018c486e17a11e95d2e4e4b46dd6f87cea35", + strip_prefix = "cmake-3.22.2-windows-i386", + build_file_content = _CMAKE_BUILD_FILE.format( + bin = "cmake.exe", + ), + ) + + maybe( + http_archive, + name = "cmake-3.22.2-windows-x86_64", + urls = [ + "https://github.com/Kitware/CMake/releases/download/v3.22.2/cmake-3.22.2-windows-x86_64.zip", + ], + sha256 = "192d62eaecb0600e743f01058dfbd5b6bed91504fe8f56416febf54c38ce096e", + strip_prefix = "cmake-3.22.2-windows-x86_64", + build_file_content = _CMAKE_BUILD_FILE.format( + bin = "cmake.exe", + ), + ) + + # buildifier: leave-alone + maybe( + prebuilt_toolchains_repository, + name = "cmake_3.22.2_toolchains", + repos = { + "cmake-3.22.2-linux-aarch64": [ + "@platforms//cpu:aarch64", + "@platforms//os:linux", + ], + "cmake-3.22.2-linux-x86_64": [ + "@platforms//cpu:x86_64", + "@platforms//os:linux", + ], + "cmake-3.22.2-macos-universal": [ + "@platforms//os:macos", + ], + "cmake-3.22.2-windows-i386": [ + "@platforms//cpu:x86_32", + "@platforms//os:windows", + ], + "cmake-3.22.2-windows-x86_64": [ + "@platforms//cpu:x86_64", + "@platforms//os:windows", + ], + }, + tool = "cmake", + ) + + if register_toolchains: + native.register_toolchains( + "@cmake_3.22.2_toolchains//:cmake-3.22.2-linux-aarch64_toolchain", + "@cmake_3.22.2_toolchains//:cmake-3.22.2-linux-x86_64_toolchain", + "@cmake_3.22.2_toolchains//:cmake-3.22.2-macos-universal_toolchain", + "@cmake_3.22.2_toolchains//:cmake-3.22.2-windows-i386_toolchain", + "@cmake_3.22.2_toolchains//:cmake-3.22.2-windows-x86_64_toolchain", + ) + + return + if "3.22.1" == version: maybe( http_archive, @@ -160,7 +265,7 @@ def _cmake_toolchains(version, register_toolchains): tool = "cmake", ) - if (register_toolchains): + if register_toolchains: native.register_toolchains( "@cmake_3.22.1_toolchains//:cmake-3.22.1-linux-aarch64_toolchain", "@cmake_3.22.1_toolchains//:cmake-3.22.1-linux-x86_64_toolchain", @@ -265,7 +370,7 @@ def _cmake_toolchains(version, register_toolchains): tool = "cmake", ) - if (register_toolchains): + if register_toolchains: native.register_toolchains( "@cmake_3.22.0_toolchains//:cmake-3.22.0-linux-aarch64_toolchain", "@cmake_3.22.0_toolchains//:cmake-3.22.0-linux-x86_64_toolchain", @@ -276,6 +381,111 @@ def _cmake_toolchains(version, register_toolchains): return + if "3.21.5" == version: + maybe( + http_archive, + name = "cmake-3.21.5-linux-aarch64", + urls = [ + "https://github.com/Kitware/CMake/releases/download/v3.21.5/cmake-3.21.5-linux-aarch64.tar.gz", + ], + sha256 = "f9809b87d42ff0b0e1a44f9a417d40cd2aced14a7dbadc7ffe5d89b0c5748b24", + strip_prefix = "cmake-3.21.5-linux-aarch64", + build_file_content = _CMAKE_BUILD_FILE.format( + bin = "cmake", + ), + ) + + maybe( + http_archive, + name = "cmake-3.21.5-linux-x86_64", + urls = [ + "https://github.com/Kitware/CMake/releases/download/v3.21.5/cmake-3.21.5-linux-x86_64.tar.gz", + ], + sha256 = "cdee65fe61fdc10db9cc695022924faaa35fb6334a3620cb1b563a9335367756", + strip_prefix = "cmake-3.21.5-linux-x86_64", + build_file_content = _CMAKE_BUILD_FILE.format( + bin = "cmake", + ), + ) + + maybe( + http_archive, + name = "cmake-3.21.5-macos-universal", + urls = [ + "https://github.com/Kitware/CMake/releases/download/v3.21.5/cmake-3.21.5-macos-universal.tar.gz", + ], + sha256 = "1eeaaeb59f1bb032f9572a1673d44ccee1091691de82aadb9a94af0ba6975547", + strip_prefix = "cmake-3.21.5-macos-universal/CMake.app/Contents", + build_file_content = _CMAKE_BUILD_FILE.format( + bin = "cmake", + ), + ) + + maybe( + http_archive, + name = "cmake-3.21.5-windows-i386", + urls = [ + "https://github.com/Kitware/CMake/releases/download/v3.21.5/cmake-3.21.5-windows-i386.zip", + ], + sha256 = "c6e47f3847e201ef181ed4482802f408aad7fadc12e7e5c77a90ca9230c1cb84", + strip_prefix = "cmake-3.21.5-windows-i386", + build_file_content = _CMAKE_BUILD_FILE.format( + bin = "cmake.exe", + ), + ) + + maybe( + http_archive, + name = "cmake-3.21.5-windows-x86_64", + urls = [ + "https://github.com/Kitware/CMake/releases/download/v3.21.5/cmake-3.21.5-windows-x86_64.zip", + ], + sha256 = "346ac5a71012e58a2d76151df3de74074e7199e08091d228a250219419c457bd", + strip_prefix = "cmake-3.21.5-windows-x86_64", + build_file_content = _CMAKE_BUILD_FILE.format( + bin = "cmake.exe", + ), + ) + + # buildifier: leave-alone + maybe( + prebuilt_toolchains_repository, + name = "cmake_3.21.5_toolchains", + repos = { + "cmake-3.21.5-linux-aarch64": [ + "@platforms//cpu:aarch64", + "@platforms//os:linux", + ], + "cmake-3.21.5-linux-x86_64": [ + "@platforms//cpu:x86_64", + "@platforms//os:linux", + ], + "cmake-3.21.5-macos-universal": [ + "@platforms//os:macos", + ], + "cmake-3.21.5-windows-i386": [ + "@platforms//cpu:x86_32", + "@platforms//os:windows", + ], + "cmake-3.21.5-windows-x86_64": [ + "@platforms//cpu:x86_64", + "@platforms//os:windows", + ], + }, + tool = "cmake", + ) + + if register_toolchains: + native.register_toolchains( + "@cmake_3.21.5_toolchains//:cmake-3.21.5-linux-aarch64_toolchain", + "@cmake_3.21.5_toolchains//:cmake-3.21.5-linux-x86_64_toolchain", + "@cmake_3.21.5_toolchains//:cmake-3.21.5-macos-universal_toolchain", + "@cmake_3.21.5_toolchains//:cmake-3.21.5-windows-i386_toolchain", + "@cmake_3.21.5_toolchains//:cmake-3.21.5-windows-x86_64_toolchain", + ) + + return + if "3.21.4" == version: maybe( http_archive, @@ -370,7 +580,7 @@ def _cmake_toolchains(version, register_toolchains): tool = "cmake", ) - if (register_toolchains): + if register_toolchains: native.register_toolchains( "@cmake_3.21.4_toolchains//:cmake-3.21.4-linux-aarch64_toolchain", "@cmake_3.21.4_toolchains//:cmake-3.21.4-linux-x86_64_toolchain", @@ -475,7 +685,7 @@ def _cmake_toolchains(version, register_toolchains): tool = "cmake", ) - if (register_toolchains): + if register_toolchains: native.register_toolchains( "@cmake_3.21.3_toolchains//:cmake-3.21.3-linux-aarch64_toolchain", "@cmake_3.21.3_toolchains//:cmake-3.21.3-linux-x86_64_toolchain", @@ -580,7 +790,7 @@ def _cmake_toolchains(version, register_toolchains): tool = "cmake", ) - if (register_toolchains): + if register_toolchains: native.register_toolchains( "@cmake_3.21.2_toolchains//:cmake-3.21.2-linux-aarch64_toolchain", "@cmake_3.21.2_toolchains//:cmake-3.21.2-linux-x86_64_toolchain", @@ -685,7 +895,7 @@ def _cmake_toolchains(version, register_toolchains): tool = "cmake", ) - if (register_toolchains): + if register_toolchains: native.register_toolchains( "@cmake_3.21.1_toolchains//:cmake-3.21.1-linux-aarch64_toolchain", "@cmake_3.21.1_toolchains//:cmake-3.21.1-linux-x86_64_toolchain", @@ -790,7 +1000,7 @@ def _cmake_toolchains(version, register_toolchains): tool = "cmake", ) - if (register_toolchains): + if register_toolchains: native.register_toolchains( "@cmake_3.21.0_toolchains//:cmake-3.21.0-linux-aarch64_toolchain", "@cmake_3.21.0_toolchains//:cmake-3.21.0-linux-x86_64_toolchain", @@ -895,7 +1105,7 @@ def _cmake_toolchains(version, register_toolchains): tool = "cmake", ) - if (register_toolchains): + if register_toolchains: native.register_toolchains( "@cmake_3.20.5_toolchains//:cmake-3.20.5-linux-aarch64_toolchain", "@cmake_3.20.5_toolchains//:cmake-3.20.5-linux-x86_64_toolchain", @@ -1000,7 +1210,7 @@ def _cmake_toolchains(version, register_toolchains): tool = "cmake", ) - if (register_toolchains): + if register_toolchains: native.register_toolchains( "@cmake_3.20.4_toolchains//:cmake-3.20.4-linux-aarch64_toolchain", "@cmake_3.20.4_toolchains//:cmake-3.20.4-linux-x86_64_toolchain", @@ -1105,7 +1315,7 @@ def _cmake_toolchains(version, register_toolchains): tool = "cmake", ) - if (register_toolchains): + if register_toolchains: native.register_toolchains( "@cmake_3.20.3_toolchains//:cmake-3.20.3-linux-aarch64_toolchain", "@cmake_3.20.3_toolchains//:cmake-3.20.3-linux-x86_64_toolchain", @@ -1210,7 +1420,7 @@ def _cmake_toolchains(version, register_toolchains): tool = "cmake", ) - if (register_toolchains): + if register_toolchains: native.register_toolchains( "@cmake_3.20.2_toolchains//:cmake-3.20.2-linux-aarch64_toolchain", "@cmake_3.20.2_toolchains//:cmake-3.20.2-linux-x86_64_toolchain", @@ -1315,7 +1525,7 @@ def _cmake_toolchains(version, register_toolchains): tool = "cmake", ) - if (register_toolchains): + if register_toolchains: native.register_toolchains( "@cmake_3.20.1_toolchains//:cmake-3.20.1-linux-aarch64_toolchain", "@cmake_3.20.1_toolchains//:cmake-3.20.1-linux-x86_64_toolchain", @@ -1420,7 +1630,7 @@ def _cmake_toolchains(version, register_toolchains): tool = "cmake", ) - if (register_toolchains): + if register_toolchains: native.register_toolchains( "@cmake_3.20.0_toolchains//:cmake-3.20.0-linux-aarch64_toolchain", "@cmake_3.20.0_toolchains//:cmake-3.20.0-linux-x86_64_toolchain", @@ -1525,7 +1735,7 @@ def _cmake_toolchains(version, register_toolchains): tool = "cmake", ) - if (register_toolchains): + if register_toolchains: native.register_toolchains( "@cmake_3.19.8_toolchains//:cmake-3.19.8-Linux-aarch64_toolchain", "@cmake_3.19.8_toolchains//:cmake-3.19.8-Linux-x86_64_toolchain", @@ -1630,7 +1840,7 @@ def _cmake_toolchains(version, register_toolchains): tool = "cmake", ) - if (register_toolchains): + if register_toolchains: native.register_toolchains( "@cmake_3.19.7_toolchains//:cmake-3.19.7-Linux-aarch64_toolchain", "@cmake_3.19.7_toolchains//:cmake-3.19.7-Linux-x86_64_toolchain", @@ -1735,7 +1945,7 @@ def _cmake_toolchains(version, register_toolchains): tool = "cmake", ) - if (register_toolchains): + if register_toolchains: native.register_toolchains( "@cmake_3.19.6_toolchains//:cmake-3.19.6-Linux-aarch64_toolchain", "@cmake_3.19.6_toolchains//:cmake-3.19.6-Linux-x86_64_toolchain", @@ -1840,7 +2050,7 @@ def _cmake_toolchains(version, register_toolchains): tool = "cmake", ) - if (register_toolchains): + if register_toolchains: native.register_toolchains( "@cmake_3.19.5_toolchains//:cmake-3.19.5-Linux-aarch64_toolchain", "@cmake_3.19.5_toolchains//:cmake-3.19.5-Linux-x86_64_toolchain", @@ -1929,7 +2139,7 @@ def _cmake_toolchains(version, register_toolchains): tool = "cmake", ) - if (register_toolchains): + if register_toolchains: native.register_toolchains( "@cmake_3.18.6_toolchains//:cmake-3.18.6-Darwin-x86_64_toolchain", "@cmake_3.18.6_toolchains//:cmake-3.18.6-Linux-x86_64_toolchain", @@ -2017,7 +2227,7 @@ def _cmake_toolchains(version, register_toolchains): tool = "cmake", ) - if (register_toolchains): + if register_toolchains: native.register_toolchains( "@cmake_3.17.5_toolchains//:cmake-3.17.5-Darwin-x86_64_toolchain", "@cmake_3.17.5_toolchains//:cmake-3.17.5-Linux-x86_64_toolchain", @@ -2105,7 +2315,7 @@ def _cmake_toolchains(version, register_toolchains): tool = "cmake", ) - if (register_toolchains): + if register_toolchains: native.register_toolchains( "@cmake_3.16.9_toolchains//:cmake-3.16.9-Darwin-x86_64_toolchain", "@cmake_3.16.9_toolchains//:cmake-3.16.9-Linux-x86_64_toolchain", @@ -2193,7 +2403,7 @@ def _cmake_toolchains(version, register_toolchains): tool = "cmake", ) - if (register_toolchains): + if register_toolchains: native.register_toolchains( "@cmake_3.15.7_toolchains//:cmake-3.15.7-Darwin-x86_64_toolchain", "@cmake_3.15.7_toolchains//:cmake-3.15.7-Linux-x86_64_toolchain", @@ -2281,7 +2491,7 @@ def _cmake_toolchains(version, register_toolchains): tool = "cmake", ) - if (register_toolchains): + if register_toolchains: native.register_toolchains( "@cmake_3.14.7_toolchains//:cmake-3.14.7-Darwin-x86_64_toolchain", "@cmake_3.14.7_toolchains//:cmake-3.14.7-Linux-x86_64_toolchain", @@ -2369,7 +2579,7 @@ def _cmake_toolchains(version, register_toolchains): tool = "cmake", ) - if (register_toolchains): + if register_toolchains: native.register_toolchains( "@cmake_3.13.5_toolchains//:cmake-3.13.5-Darwin-x86_64_toolchain", "@cmake_3.13.5_toolchains//:cmake-3.13.5-Linux-x86_64_toolchain", @@ -2457,7 +2667,7 @@ def _cmake_toolchains(version, register_toolchains): tool = "cmake", ) - if (register_toolchains): + if register_toolchains: native.register_toolchains( "@cmake_3.12.4_toolchains//:cmake-3.12.4-Darwin-x86_64_toolchain", "@cmake_3.12.4_toolchains//:cmake-3.12.4-Linux-x86_64_toolchain", @@ -2545,7 +2755,7 @@ def _cmake_toolchains(version, register_toolchains): tool = "cmake", ) - if (register_toolchains): + if register_toolchains: native.register_toolchains( "@cmake_3.11.4_toolchains//:cmake-3.11.4-Darwin-x86_64_toolchain", "@cmake_3.11.4_toolchains//:cmake-3.11.4-Linux-x86_64_toolchain", @@ -2633,7 +2843,7 @@ def _cmake_toolchains(version, register_toolchains): tool = "cmake", ) - if (register_toolchains): + if register_toolchains: native.register_toolchains( "@cmake_3.10.3_toolchains//:cmake-3.10.3-Darwin-x86_64_toolchain", "@cmake_3.10.3_toolchains//:cmake-3.10.3-Linux-x86_64_toolchain", @@ -2721,7 +2931,7 @@ def _cmake_toolchains(version, register_toolchains): tool = "cmake", ) - if (register_toolchains): + if register_toolchains: native.register_toolchains( "@cmake_3.9.6_toolchains//:cmake-3.9.6-Darwin-x86_64_toolchain", "@cmake_3.9.6_toolchains//:cmake-3.9.6-Linux-x86_64_toolchain", @@ -2809,7 +3019,7 @@ def _cmake_toolchains(version, register_toolchains): tool = "cmake", ) - if (register_toolchains): + if register_toolchains: native.register_toolchains( "@cmake_3.8.2_toolchains//:cmake-3.8.2-Darwin-x86_64_toolchain", "@cmake_3.8.2_toolchains//:cmake-3.8.2-Linux-x86_64_toolchain", @@ -2897,7 +3107,7 @@ def _cmake_toolchains(version, register_toolchains): tool = "cmake", ) - if (register_toolchains): + if register_toolchains: native.register_toolchains( "@cmake_3.7.2_toolchains//:cmake-3.7.2-Darwin-x86_64_toolchain", "@cmake_3.7.2_toolchains//:cmake-3.7.2-Linux-x86_64_toolchain", @@ -2985,7 +3195,7 @@ def _cmake_toolchains(version, register_toolchains): tool = "cmake", ) - if (register_toolchains): + if register_toolchains: native.register_toolchains( "@cmake_3.6.3_toolchains//:cmake-3.6.3-Darwin-x86_64_toolchain", "@cmake_3.6.3_toolchains//:cmake-3.6.3-Linux-x86_64_toolchain", @@ -3056,7 +3266,7 @@ def _cmake_toolchains(version, register_toolchains): tool = "cmake", ) - if (register_toolchains): + if register_toolchains: native.register_toolchains( "@cmake_3.5.2_toolchains//:cmake-3.5.2-Darwin-x86_64_toolchain", "@cmake_3.5.2_toolchains//:cmake-3.5.2-Linux-x86_64_toolchain", @@ -3126,7 +3336,7 @@ def _cmake_toolchains(version, register_toolchains): tool = "cmake", ) - if (register_toolchains): + if register_toolchains: native.register_toolchains( "@cmake_3.4.3_toolchains//:cmake-3.4.3-Darwin-x86_64_toolchain", "@cmake_3.4.3_toolchains//:cmake-3.4.3-Linux-x86_64_toolchain", @@ -3196,7 +3406,7 @@ def _cmake_toolchains(version, register_toolchains): tool = "cmake", ) - if (register_toolchains): + if register_toolchains: native.register_toolchains( "@cmake_3.3.2_toolchains//:cmake-3.3.2-Darwin-x86_64_toolchain", "@cmake_3.3.2_toolchains//:cmake-3.3.2-Linux-x86_64_toolchain", @@ -3266,7 +3476,7 @@ def _cmake_toolchains(version, register_toolchains): tool = "cmake", ) - if (register_toolchains): + if register_toolchains: native.register_toolchains( "@cmake_3.2.3_toolchains//:cmake-3.2.3-Darwin-x86_64_toolchain", "@cmake_3.2.3_toolchains//:cmake-3.2.3-Linux-x86_64_toolchain", @@ -3336,7 +3546,7 @@ def _cmake_toolchains(version, register_toolchains): tool = "cmake", ) - if (register_toolchains): + if register_toolchains: native.register_toolchains( "@cmake_3.1.3_toolchains//:cmake-3.1.3-Darwin-x86_64_toolchain", "@cmake_3.1.3_toolchains//:cmake-3.1.3-Linux-x86_64_toolchain", @@ -3372,7 +3582,7 @@ def _cmake_toolchains(version, register_toolchains): tool = "cmake", ) - if (register_toolchains): + if register_toolchains: native.register_toolchains( "@cmake_3.0.2_toolchains//:cmake-3.0.2-win32-x86_toolchain", ) @@ -3443,7 +3653,7 @@ def _ninja_toolchains(version, register_toolchains): tool = "ninja", ) - if (register_toolchains): + if register_toolchains: native.register_toolchains( "@ninja_1.10.2_toolchains//:ninja_1.10.2_linux_toolchain", "@ninja_1.10.2_toolchains//:ninja_1.10.2_mac_toolchain", @@ -3513,7 +3723,7 @@ def _ninja_toolchains(version, register_toolchains): tool = "ninja", ) - if (register_toolchains): + if register_toolchains: native.register_toolchains( "@ninja_1.10.1_toolchains//:ninja_1.10.1_linux_toolchain", "@ninja_1.10.1_toolchains//:ninja_1.10.1_mac_toolchain", @@ -3583,7 +3793,7 @@ def _ninja_toolchains(version, register_toolchains): tool = "ninja", ) - if (register_toolchains): + if register_toolchains: native.register_toolchains( "@ninja_1.10.0_toolchains//:ninja_1.10.0_linux_toolchain", "@ninja_1.10.0_toolchains//:ninja_1.10.0_mac_toolchain", @@ -3653,7 +3863,7 @@ def _ninja_toolchains(version, register_toolchains): tool = "ninja", ) - if (register_toolchains): + if register_toolchains: native.register_toolchains( "@ninja_1.9.0_toolchains//:ninja_1.9.0_linux_toolchain", "@ninja_1.9.0_toolchains//:ninja_1.9.0_mac_toolchain", @@ -3723,7 +3933,7 @@ def _ninja_toolchains(version, register_toolchains): tool = "ninja", ) - if (register_toolchains): + if register_toolchains: native.register_toolchains( "@ninja_1.8.2_toolchains//:ninja_1.8.2_linux_toolchain", "@ninja_1.8.2_toolchains//:ninja_1.8.2_mac_toolchain", diff --git a/toolchains/prebuilt_toolchains.py b/toolchains/prebuilt_toolchains.py index 4143f5a5..0f959a77 100755 --- a/toolchains/prebuilt_toolchains.py +++ b/toolchains/prebuilt_toolchains.py @@ -11,8 +11,10 @@ CMAKE_SHA256_URL_TEMPLATE = "https://cmake.org/files/v{minor}/cmake-{full}-SHA-2 CMAKE_URL_TEMPLATE = "https://github.com/Kitware/CMake/releases/download/v{full}/{file}" CMAKE_VERSIONS = [ + "3.22.2", "3.22.1", "3.22.0", + "3.21.5", "3.21.4", "3.21.3", "3.21.2",