bazel
/
rules_foreign_cc
mirror of https://github.com/bazel-contrib/rules_foreign_cc
2
0
Fork 0
Code Issues Releases Activity

Upgrade default ninja version to 1.12.1 (#1248)

This commit is contained in:
James Sharpe 2024-08-08 10:51:41 +01:00 committed by GitHub
parent 35bf65674e
commit d58cdf65cd
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
MODULE.bazel
View File

@ -30,7 +30,7 @@ use_repo(
"glib_src", "glib_src",
"gnumake_src", "gnumake_src",
"meson_src", "meson_src",
"ninja_1.12.0_toolchains", "ninja_1.12.1_toolchains",
"ninja_build_src", "ninja_build_src",
"pkgconfig_src", "pkgconfig_src",
"rules_foreign_cc_framework_toolchains", "rules_foreign_cc_framework_toolchains",
@ -39,7 +39,7 @@ use_repo(
register_toolchains( register_toolchains(
"@rules_foreign_cc_framework_toolchains//:all", "@rules_foreign_cc_framework_toolchains//:all",
"@cmake_3.23.2_toolchains//:all", "@cmake_3.23.2_toolchains//:all",
"@ninja_1.12.0_toolchains//:all", "@ninja_1.12.1_toolchains//:all",
"@python_3_9//:all", "@python_3_9//:all",
"@rules_foreign_cc//toolchains:all", "@rules_foreign_cc//toolchains:all",
) )

2
foreign_cc/extensions.bzl
View File

@ -4,7 +4,7 @@ load("//foreign_cc:repositories.bzl", "rules_foreign_cc_dependencies")
load("//toolchains:prebuilt_toolchains.bzl", "prebuilt_toolchains") load("//toolchains:prebuilt_toolchains.bzl", "prebuilt_toolchains")
_DEFAULT_CMAKE_VERSION = "3.23.2" _DEFAULT_CMAKE_VERSION = "3.23.2"
_DEFAULT_NINJA_VERSION = "1.12.0" _DEFAULT_NINJA_VERSION = "1.12.1"
cmake_toolchain_version = tag_class(attrs = { cmake_toolchain_version = tag_class(attrs = {
"version": attr.string(doc = "The cmake version", default = _DEFAULT_CMAKE_VERSION), "version": attr.string(doc = "The cmake version", default = _DEFAULT_CMAKE_VERSION),

2
foreign_cc/repositories.bzl
View File

@ -11,7 +11,7 @@ def rules_foreign_cc_dependencies(
register_default_tools = True, register_default_tools = True,
cmake_version = "3.23.2", cmake_version = "3.23.2",
make_version = "4.4.1", make_version = "4.4.1",
ninja_version = "1.12.0", ninja_version = "1.12.1",
meson_version = "1.1.1", meson_version = "1.1.1",
pkgconfig_version = "0.29.2", pkgconfig_version = "0.29.2",
register_preinstalled_tools = True, register_preinstalled_tools = True,

13
toolchains/built_toolchains.bzl
View File

@ -135,6 +135,19 @@ def _ninja_toolchain(version, register_toolchains):
native.register_toolchains( native.register_toolchains(
"@rules_foreign_cc//toolchains:built_ninja_toolchain", "@rules_foreign_cc//toolchains:built_ninja_toolchain",
) )
if version == "1.12.1":
maybe(
http_archive,
name = "ninja_build_src",
build_file_content = _ALL_CONTENT,
integrity = "sha256-ghvf9Io/aDvEuztvC1/nstZHz2XVKutjMoyRpsbfKFo=",
strip_prefix = "ninja-1.12.1",
urls = [
"https://mirror.bazel.build/github.com/ninja-build/ninja/archive/v1.12.1.tar.gz",
"https://github.com/ninja-build/ninja/archive/v1.12.1.tar.gz",
],
)
return
if version == "1.12.0": if version == "1.12.0":
maybe( maybe(
http_archive, http_archive,