Skip to content

Commit 155da63

Browse files
authored
Merge pull request pd-rs#48 from parasyte/fix/hyphenated-crate-names
Fix "file not found" error when the crate name contains hyphens
2 parents 8c77385 + 01d90ea commit 155da63

File tree

1 file changed

+5
-4
lines changed

1 file changed

+5
-4
lines changed

src/main.rs

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -685,6 +685,7 @@ impl Build {
685685
.and_then(|target| target.metadata.as_ref())
686686
.and_then(|metadata| metadata.name.clone())
687687
.unwrap_or(to_title_case(&target_name));
688+
let package_name = target_name.replace('-', "_");
688689
let source_path = self.make_source_dir(&overall_target_dir, &game_title)?;
689690
let dest_path = overall_target_dir.join(format!("{}.pdx", &game_title));
690691
if dest_path.exists() {
@@ -694,10 +695,10 @@ impl Build {
694695
let dir_name = if self.release { "release" } else { "debug" };
695696
if self.device {
696697
target_dir = target_dir.join("thumbv7em-none-eabihf").join(dir_name);
697-
let lib_file = target_dir.join(format!("{}lib{}.a", target_path, target_name));
698+
let lib_file = target_dir.join(format!("{}lib{}.a", target_path, package_name));
698699
self.compile_setup(&target_dir)?;
699-
self.link_binary(&target_dir, &target_name, &lib_file)?;
700-
self.make_binary(&target_dir, &target_name, &source_path)?;
700+
self.link_binary(&target_dir, &package_name, &lib_file)?;
701+
self.make_binary(&target_dir, &package_name, &source_path)?;
701702
self.copy_assets(&target_name, &project_path, &crank_manifest, &source_path)?;
702703
self.make_manifest(&crank_manifest, &target_name, &source_path)?;
703704
self.run_pdc(&source_path, &dest_path)?;
@@ -706,7 +707,7 @@ impl Build {
706707
}
707708
} else {
708709
target_dir = target_dir.join(dir_name).join(target_path);
709-
self.link_dylib(&target_dir, &target_name, &source_path)?;
710+
self.link_dylib(&target_dir, &package_name, &source_path)?;
710711
self.copy_assets(&target_name, &project_path, &crank_manifest, &source_path)?;
711712
self.make_manifest(&crank_manifest, &target_name, &source_path)?;
712713
self.run_pdc(&source_path, &dest_path)?;

0 commit comments

Comments
 (0)