openai/codex
1
0
Fork 0
mirror of https://github.com/openai/codex.git synced 2026-11-02 19:43:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

bazel fixes 4

Browse Source
This commit is contained in:
iceweasel-oai
2026-01-29 15:15:09 -08:00
parent 6c1b2c448a
commit 7e194a169f
1 changed files with 22 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
codex-rs/utils/cargo-bin/src/lib.rs
+22 -33
View File
@@ -131,41 +131,30 @@ macro_rules! find_resource {
// the `tests/common` folder will not exist at runtime under
// Bazel. As such, we have to normalize it before passing it
// to `dotslash fetch`.
return manifest_dir.absolutize().map(|p| p.to_path_buf());
}
if std::env::var_os("RUNFILES_MANIFEST_FILE").is_none() {
return Err(std::io::Error::new(
manifest_dir.absolutize().map(|p| p.to_path_buf())
} else if std::env::var_os("RUNFILES_MANIFEST_FILE").is_none() {
Err(std::io::Error::new(
std::io::ErrorKind::NotFound,
"RUNFILES_DIR set but resource missing",
));
}
match option_env!("BAZEL_PACKAGE") {
Some(bazel_package) => {
if resource == std::path::Path::new(".") {
$crate::runfiles_package_root_from_manifest(bazel_package)
.ok_or_else(|| {
std::io::Error::new(
std::io::ErrorKind::NotFound,
"runfiles manifest missing package root entry",
)
})
} else {
let key = $crate::runfiles_manifest_key_for_resource(
bazel_package,
resource,
);
$crate::runfiles_manifest_lookup(&key).ok_or_else(|| {
std::io::Error::new(
std::io::ErrorKind::NotFound,
format!("runfiles manifest missing entry for {key}"),
)
})
}
}
None => Err(std::io::Error::new(
std::io::ErrorKind::NotFound,
"BAZEL_PACKAGE not set in Bazel build",
)),
))
} else if resource == std::path::Path::new(".") {
$crate::runfiles_package_root_from_manifest(bazel_package).ok_or_else(
|| {
std::io::Error::new(
std::io::ErrorKind::NotFound,
"runfiles manifest missing package root entry",
)
},
)
} else {
let key =
$crate::runfiles_manifest_key_for_resource(bazel_package, resource);
$crate::runfiles_manifest_lookup(&key).ok_or_else(|| {
std::io::Error::new(
std::io::ErrorKind::NotFound,
format!("runfiles manifest missing entry for {key}"),
)
})
}
}
None => Err(std::io::Error::new(