Skip to content

Commit

Permalink
Fix "file not found" error when the crate name contains hyphens
Browse files Browse the repository at this point in the history
The library is written with hyphens replaced with underscores.
  • Loading branch information
parasyte committed Aug 31, 2023
1 parent 6d046ce commit c5f84d5
Showing 1 changed file with 5 additions and 4 deletions.
9 changes: 5 additions & 4 deletions src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -676,6 +676,7 @@ impl Build {
.and_then(|target| target.metadata.as_ref())
.and_then(|metadata| metadata.name.clone())
.unwrap_or(to_title_case(&target_name));
let package_name = target_name.replace('-', "_");
let source_path = self.make_source_dir(&overall_target_dir, &game_title)?;
let dest_path = overall_target_dir.join(format!("{}.pdx", &game_title));
if dest_path.exists() {
Expand All @@ -685,10 +686,10 @@ impl Build {
let dir_name = if self.release { "release" } else { "debug" };
if self.device {
target_dir = target_dir.join("thumbv7em-none-eabihf").join(dir_name);
let lib_file = target_dir.join(format!("{}lib{}.a", target_path, target_name));
let lib_file = target_dir.join(format!("{}lib{}.a", target_path, package_name));
self.compile_setup(&target_dir)?;
self.link_binary(&target_dir, &target_name, &lib_file)?;
self.make_binary(&target_dir, &target_name, &source_path)?;
self.link_binary(&target_dir, &package_name, &lib_file)?;
self.make_binary(&target_dir, &package_name, &source_path)?;
self.copy_assets(&target_name, &project_path, &crank_manifest, &source_path)?;
self.make_manifest(&crank_manifest, &target_name, &source_path)?;
self.run_pdc(&source_path, &dest_path)?;
Expand All @@ -697,7 +698,7 @@ impl Build {
}
} else {
target_dir = target_dir.join(dir_name).join(target_path);
self.link_dylib(&target_dir, &target_name, &source_path)?;
self.link_dylib(&target_dir, &package_name, &source_path)?;
self.copy_assets(&target_name, &project_path, &crank_manifest, &source_path)?;
self.make_manifest(&crank_manifest, &target_name, &source_path)?;
self.run_pdc(&source_path, &dest_path)?;
Expand Down

0 comments on commit c5f84d5

Please sign in to comment.