Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 14 additions & 7 deletions crates/wdk-build/src/cargo_make.rs
Original file line number Diff line number Diff line change
Expand Up @@ -822,13 +822,20 @@ fn load_wdk_build_makefile<S: AsRef<str> + AsRef<Utf8Path> + AsRef<Path> + fmt::
.into_iter()
.filter(|package| package.name == "wdk-build")
.collect::<Vec<_>>();
if wdk_build_package_matches.len() != 1 {
return Err(ConfigError::MultipleWdkBuildCratesDetected {
package_ids: wdk_build_package_matches
.iter()
.map(|package_info| package_info.id.clone())
.collect(),
});

match wdk_build_package_matches.len() {
0 => {
return Err(ConfigError::NoWdkBuildCrateDetected);
}
1 => {}
_ => {
return Err(ConfigError::MultipleWdkBuildCratesDetected {
package_ids: wdk_build_package_matches
.iter()
.map(|package_info| package_info.id.clone())
.collect(),
});
}
}

let rust_driver_makefile_toml_path = wdk_build_package_matches[0]
Expand Down
4 changes: 4 additions & 0 deletions crates/wdk-build/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -210,6 +210,10 @@ pub enum ConfigError {
#[error(transparent)]
CargoMetadataError(#[from] cargo_metadata::Error),

/// Error returned when no wdk-build package is detected
#[error("no wdk-build package is detected")]
NoWdkBuildCrateDetected,

/// Error returned when multiple versions of the wdk-build package are
/// detected
#[error(
Expand Down
Loading