alex/nih-plug
1
0
Fork 0
Code Activity

Fix terminology in workspace root detection

Browse source
This commit is contained in:
Robbert van der Helm 2022-07-18 23:53:24 +02:00
parent ae8c78c5e5
commit 0168af7008
1 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
nih_plug_xtask/src/lib.rs
View file

@ -124,28 +124,29 @@ pub fn main_with_args(command_name: &str, args: impl IntoIterator<Item = String>
pub fn chdir_workspace_root() -> Result<()> { pub fn chdir_workspace_root() -> Result<()> {
let xtask_project_dir = std::env::var("CARGO_MANIFEST_DIR") let xtask_project_dir = std::env::var("CARGO_MANIFEST_DIR")
.context("'$CARGO_MANIFEST_DIR' was not set, are you running this binary directly?")?; .context("'$CARGO_MANIFEST_DIR' was not set, are you running this binary directly?")?;
let project_root = Path::new(&xtask_project_dir).parent().context( let workspace_root = Path::new(&xtask_project_dir).parent().context(
"'$CARGO_MANIFEST_DIR' has an unexpected value, are you running this binary directly?", "'$CARGO_MANIFEST_DIR' has an unexpected value, are you running this binary directly?",
)?; )?;
// If `project_root` is not actually the project's root because this xtask binary's `Cargo.toml` // If `workspace_root` is not actually the workspace's root because this xtask binary's `Cargo.toml`
// file is in a sub-subdirectory, then we'll walk up the directory stack until we hopefully find // file is in a sub-subdirectory, then we'll walk up the directory stack until we hopefully find
// it. // it.
let project_root = if project_root.join("Cargo.toml").exists() { let workspace_root = if workspace_root.join("Cargo.toml").exists() {
project_root workspace_root
} else { } else {
let mut project_root_candidate = project_root; let mut workspace_root_candidate = workspace_root;
loop { loop {
project_root_candidate = project_root_candidate workspace_root_candidate = workspace_root_candidate
.parent() .parent()
.context("Reached the file system root without finding a parent Cargo.toml file")?; .context("Reached the file system root without finding a parent Cargo.toml file")?;
if project_root_candidate.join("Cargo.toml").exists() { if workspace_root_candidate.join("Cargo.toml").exists() {
break project_root_candidate; break workspace_root_candidate;
} }
} }
}; };
std::env::set_current_dir(project_root).context("Could not change to project root directory") std::env::set_current_dir(workspace_root)
.context("Could not change to workspace root directory")
} }
/// Build one or more packages using the provided `cargo build` arguments. This should be caleld /// Build one or more packages using the provided `cargo build` arguments. This should be caleld