Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix "file not found" error when the crate name contains hyphens #48

Merged
merged 2 commits into from
Sep 13, 2023
Merged

Fix "file not found" error when the crate name contains hyphens #48

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c5f84d5
Fix "file not found" error when the crate name contains hyphens
parasyte Aug 27, 2023
01d90ea
Merge branch 'main' into fix/hyphenated-crate-names
boozook Sep 13, 2023
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
9 changes: 5 additions & 4 deletions src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -685,6 +685,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 @@ -694,10 +695,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 @@ -706,7 +707,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