Skip to content

Add configurable application name to CTRConfig #76

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

Merged
merged 1 commit into from
Nov 30, 2025
Merged

Add configurable application name to CTRConfig #76

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 8 additions & 6 deletions src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@

command.args(cargo_cmd.cargo_args());

if let CargoCmd::Run(run) | CargoCmd::Test(Test { run_args: run, .. }) = &cargo_cmd {

Check warning on line 161 in src/lib.rs

View workflow job for this annotation

GitHub Actions / lint (stable) 

this `if` statement can be collapsed
if run.use_custom_runner() {
command
.arg("--")
Expand Down Expand Up @@ -263,7 +263,7 @@
pub(crate) fn get_artifact_config(package: Package, artifact: Artifact) -> CTRConfig {
// For now, assume a single "kind" per artifact. It seems to be the case
// when a single executable is built anyway but maybe not in all cases.
let name = match artifact.target.kind[0] {
let package_name = match artifact.target.kind[0] {
Bin | Lib | RLib | DyLib if artifact.profile.test => {
format!("{} tests", artifact.target.name)
}
Expand All @@ -283,7 +283,7 @@
.unwrap_or_default();

CTRConfig {
name,
package_name,
authors: config.authors.or(Some(package.authors)),
description: config.description.or(package.description),
manifest_dir: package.manifest_path.parent().unwrap().into(),
Expand Down Expand Up @@ -374,11 +374,13 @@
#[serde(alias = "romfs-dir")]
romfs_dir: Option<Utf8PathBuf>,

/// The name of the application, defaulting to the package name if not specified.
name: Option<String>,

// Remaining fields come from cargo metadata / build artifact output and
// cannot be customized by users in `package.metadata.cargo-3ds`. I suppose
// in theory we could allow name to be customizable if we wanted...
// cannot be customized by users in `package.metadata.cargo-3ds`.
#[serde(skip)]
name: String,
package_name: String,
#[serde(skip)]
target_path: Utf8PathBuf,
#[serde(skip)]
Expand Down Expand Up @@ -428,7 +430,7 @@
let mut command = Command::new("smdhtool");
command
.arg("--create")
.arg(&self.name)
.arg(self.name.as_ref().unwrap_or(&self.package_name))
.arg(description)
.arg(publisher)
.arg(icon_path)
Expand Down
Loading