mirror of
https://github.com/openai/codex.git
synced 2026-11-13 21:30:47 +00:00
Sean Huang
76a8ca3914
## What changed - Use the `rules_rs` 0.2.3 registry release instead of an archive override, and upgrade `platforms` to 1.1.0. - Disable root crate alias targets and migrate explicit dependencies to package labels such as `@crates//tokio`. Disable root crate data for the argument comment linter's crate repository. - Refresh the retained `rules_rs` patches, remove the zlib snapshot URL backport, and drop extra dependency declarations from `exec-server` and `v8-poc`. GitOrigin-RevId: c354413a19b45964104457063c613028f5325bc0
60 lines
2.8 KiB
Diff
60 lines
2.8 KiB
Diff
# What: restore explicit build-script dependency annotations used by Codex.
|
|
# Scope: rules_rs crate-universe annotation plumbing only.
|
|
|
|
diff --git a/rs/extensions.bzl b/rs/extensions.bzl
|
|
--- a/rs/extensions.bzl
|
|
+++ b/rs/extensions.bzl
|
|
@@ -324,7 +324,7 @@ crate.annotation(
|
|
hub_name = hub_name,
|
|
crate_visibility = package["visibility"],
|
|
gen_build_script = annotation.gen_build_script,
|
|
- build_script_deps = [],
|
|
+ build_script_deps = annotation.build_script_deps,
|
|
build_script_deps_select = feature_resolutions.build_deps,
|
|
build_script_data = annotation.build_script_data,
|
|
build_script_data_select = annotation.build_script_data_select,
|
|
@@ -996,9 +996,9 @@ _annotation = tag_class(
|
|
# "build_script_data_glob": attr.string_list(
|
|
# doc = "A list of glob patterns to add to a crate's `cargo_build_script::data` attribute",
|
|
# ),
|
|
- # "build_script_deps": attr.label_list(
|
|
- # doc = "A list of labels to add to a crate's `cargo_build_script::deps` attribute.",
|
|
- # ),
|
|
+ "build_script_deps": attr.string_list(
|
|
+ doc = "A list of labels to add to a crate's `cargo_build_script::deps` attribute.",
|
|
+ ),
|
|
"build_script_env_files": attr.label_list(
|
|
doc = "Files containing additional environment variables for a crate's `cargo_build_script`.",
|
|
allow_files = True,
|
|
diff --git a/rs/private/annotations.bzl b/rs/private/annotations.bzl
|
|
--- a/rs/private/annotations.bzl
|
|
+++ b/rs/private/annotations.bzl
|
|
@@ -4,6 +4,7 @@ def _crate_annotation(
|
|
additive_build_file = None,
|
|
additive_build_file_content = "",
|
|
gen_build_script = "auto",
|
|
+ build_script_deps = [],
|
|
build_script_data = [],
|
|
build_script_data_select = {},
|
|
build_script_env = {},
|
|
@@ -40,6 +41,7 @@ def _crate_annotation(
|
|
additive_build_file = additive_build_file,
|
|
additive_build_file_content = additive_build_file_content,
|
|
gen_build_script = gen_build_script,
|
|
+ build_script_deps = build_script_deps,
|
|
build_script_data = build_script_data,
|
|
build_script_data_select = build_script_data_select,
|
|
build_script_env = build_script_env,
|
|
diff --git a/rs/private/repository_utils.bzl b/rs/private/repository_utils.bzl
|
|
--- a/rs/private/repository_utils.bzl
|
|
+++ b/rs/private/repository_utils.bzl
|
|
@@ -330,7 +330,7 @@ rust_crate_attrs = {
|
|
"crate_visibility": attr.label_list(default = ["//visibility:public"]),
|
|
"hub_name": attr.string(),
|
|
"gen_build_script": attr.string(),
|
|
- "build_script_deps": attr.label_list(),
|
|
+ "build_script_deps": attr.string_list(),
|
|
"build_script_deps_select": _label_list_dict(),
|
|
"build_script_data": attr.label_list(),
|
|
"build_script_data_select": _label_list_dict(),
|