Skip to content

Commit 060ebe2

Browse files
committed
meson: use py_binary from aspect_rules_py to run meson
1 parent 389ebcf commit 060ebe2

17 files changed

Lines changed: 1610 additions & 619 deletions

File tree

‎MODULE.bazel‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,11 @@ module(
66
compatibility_level = 1,
77
)
88

9-
bazel_dep(name = "bazel_features", version = "1.28.0")
9+
bazel_dep(name = "aspect_rules_py", version = "1.8.4")
10+
bazel_dep(name = "bazel_features", version = "1.38.0")
1011
bazel_dep(name = "bazel_skylib", version = "1.9.0")
1112
bazel_dep(name = "platforms", version = "1.0.0")
12-
bazel_dep(name = "rules_cc", version = "0.2.13")
13+
bazel_dep(name = "rules_cc", version = "0.2.16")
1314
bazel_dep(name = "rules_python", version = "1.9.0")
1415
bazel_dep(name = "rules_shell", version = "0.6.1")
1516
bazel_dep(name = "bazel_lib", version = "3.2.0")

‎MODULE.bazel.lock‎

Lines changed: 232 additions & 481 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎WORKSPACE.bazel‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,14 @@ load("@bazel_skylib//:workspace.bzl", "bazel_skylib_workspace")
2828

2929
bazel_skylib_workspace()
3030

31+
load("@aspect_rules_py//py:repositories.bzl", "rules_py_dependencies")
32+
33+
rules_py_dependencies()
34+
35+
load("@aspect_rules_py//py:toolchains.bzl", "rules_py_toolchains")
36+
37+
rules_py_toolchains()
38+
3139
load("@rules_python//python:repositories.bzl", "py_repositories", "python_register_toolchains")
3240

3341
py_repositories()

‎docs/MODULE.bazel.lock‎

Lines changed: 260 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎examples/MODULE.bazel‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ bazel_dep(name = "rules_swift", version = "1.17.0", repo_name = "build_bazel_rul
2424
bazel_dep(name = "rules_apple", version = "3.4.0", repo_name = "build_bazel_rules_apple")
2525
bazel_dep(name = "apple_support", version = "1.24.5", repo_name = "build_bazel_apple_support")
2626
bazel_dep(name = "rules_python", version = "1.9.0")
27-
bazel_dep(name = "rules_cc", version = "0.2.13")
27+
bazel_dep(name = "rules_cc", version = "0.2.16")
2828
bazel_dep(name = "rules_shell", version = "0.6.1")
2929
bazel_dep(name = "rules_perl", version = "1.0.0")
3030

‎examples/MODULE.bazel.lock‎

Lines changed: 284 additions & 18 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎examples/third_party/MODULE.bazel‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@ module(
33
version = "0.0.0",
44
)
55

6-
bazel_dep(name = "bazel_features", version = "1.28.0")
6+
bazel_dep(name = "bazel_features", version = "1.38.0")
77
bazel_dep(name = "bazel_skylib", version = "1.9.0")
88
bazel_dep(name = "apple_support", version = "1.24.5", repo_name = "build_bazel_apple_support")
99
bazel_dep(name = "platforms", version = "1.0.0")
10-
bazel_dep(name = "rules_cc", version = "0.2.13")
10+
bazel_dep(name = "rules_cc", version = "0.2.16")
1111
bazel_dep(name = "rules_apple", version = "3.4.0", repo_name = "build_bazel_rules_apple")
1212
bazel_dep(name = "rules_foreign_cc", version = "0.0.0")
1313
bazel_dep(name = "rules_perl", version = "1.0.0", repo_name = "rules_perl")

‎examples/third_party/MODULE.bazel.lock‎

Lines changed: 274 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎foreign_cc/built_tools/BUILD.bazel‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,9 @@ bzl_library(
2323
name = "meson_build",
2424
srcs = ["meson_build.bzl"],
2525
visibility = ["//visibility:public"],
26-
deps = [
27-
"@rules_python//python:defs_bzl",
28-
],
26+
deps = ["@rules_python//python:defs_bzl"],
2927
)
3028

31-
exports_files(["meson_tool_wrapper.py"])
32-
3329
bzl_library(
3430
name = "ninja_build",
3531
srcs = ["ninja_build.bzl"],
Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,14 @@
11
""" Rule for building meson from source. """
22

3-
load("@rules_python//python:defs.bzl", "py_binary")
4-
load("@rules_python//python:features.bzl", "features")
3+
load("@aspect_rules_py//py:defs.bzl", "py_binary")
54

65
def meson_tool(name, main, data, requirements = [], **kwargs):
76
kwargs.pop("precompile", None)
8-
if not features.uses_builtin_rules:
9-
kwargs["precompile"] = "disabled"
107
py_binary(
118
name = name,
12-
srcs = ["@rules_foreign_cc//foreign_cc/built_tools:meson_tool_wrapper.py"],
13-
data = data + [main],
14-
deps = requirements + ["@rules_python//python/runfiles"],
15-
python_version = "PY3",
16-
main = "@rules_foreign_cc//foreign_cc/built_tools:meson_tool_wrapper.py",
9+
srcs = [main],
10+
data = data,
11+
deps = requirements,
12+
main = main,
1713
**kwargs
1814
)

0 commit comments

Comments
 (0)