Skip to content

Restore remaining Cargo package environment variables #32

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
michaelm-openai wants to merge 1 commit into from
Closed

Restore remaining Cargo package environment variables #32

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 19 additions & 2 deletions rust/private/rustc.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,13 +119,30 @@ def _get_rustc_env(attr, toolchain, crate_name):
Returns:
dict: Rustc environment variables
"""
version = getattr(attr, "version", "0.0.0")
version_without_build_metadata = version.split("+", 1)[0]
major, minor, patch = version_without_build_metadata.split(".", 2)
if "-" in patch:
patch, pre = patch.split("-", 1)
else:
pre = ""

result = {
"CARGO_CFG_TARGET_ARCH": "" if toolchain.target_arch == None else toolchain.target_arch,
"CARGO_CFG_TARGET_OS": "" if toolchain.target_os == None else toolchain.target_os,
"CARGO_CRATE_NAME": crate_name,
# CARGO_PKG_NAME and CARGO_PKG_VERSION are commonly needed by clap derive macros.
# Cargo always defines these package variables, even when the manifest
# omits the corresponding optional fields. Clap derive macros consume
# AUTHORS and DESCRIPTION for `author` and `about` attributes.
"CARGO_PKG_AUTHORS": "",
"CARGO_PKG_DESCRIPTION": "",
"CARGO_PKG_HOMEPAGE": "",
"CARGO_PKG_NAME": attr.name,
"CARGO_PKG_VERSION": getattr(attr, "version", "0.0.0"),
"CARGO_PKG_VERSION": version,
"CARGO_PKG_VERSION_MAJOR": major,
"CARGO_PKG_VERSION_MINOR": minor,
"CARGO_PKG_VERSION_PATCH": patch,
"CARGO_PKG_VERSION_PRE": pre,
}
return result

Expand Down
2 changes: 1 addition & 1 deletion test/build_env/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ rust_test(
srcs = ["tests/custom_crate_name.rs"],
crate_name = "custom_crate_name",
edition = "2018",
version = "1.2.3",
version = "1.2.3-alpha.1+build.5",
)

rust_library(
Expand Down
9 changes: 8 additions & 1 deletion test/build_env/tests/custom_crate_name.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,13 @@
#[test]
fn cargo_env_vars() {
assert_eq!(env!("CARGO_PKG_AUTHORS"), "");
assert_eq!(env!("CARGO_PKG_DESCRIPTION"), "");
assert_eq!(env!("CARGO_PKG_HOMEPAGE"), "");
assert_eq!(env!("CARGO_PKG_NAME"), "cargo_pkg_env_test");
assert_eq!(env!("CARGO_PKG_VERSION"), "1.2.3");
assert_eq!(env!("CARGO_PKG_VERSION"), "1.2.3-alpha.1+build.5");
assert_eq!(env!("CARGO_PKG_VERSION_MAJOR"), "1");
assert_eq!(env!("CARGO_PKG_VERSION_MINOR"), "2");
assert_eq!(env!("CARGO_PKG_VERSION_PATCH"), "3");
assert_eq!(env!("CARGO_PKG_VERSION_PRE"), "alpha.1");
assert_eq!(env!("CARGO_CRATE_NAME"), "custom_crate_name");
}
Loading