fix merge and reorganize the CLI a bit

This commit is contained in:
Evan Almloff committed 2024-01-08 13:39:12 -06:00
1 parent 0269a59c95
commit 2cc6f2f51f
10 files changed
+100 -61

No files matched your search

+1
View File
@@ -200,6 +200,7 @@ impl From<NsisSettings> for tauri_bundler::NsisSettings {
display_language_selector: val.display_language_selector,
custom_language_files: None,
template: None,
compression: None,
}
}
}
+16
View File
@@ -353,6 +353,8 @@ pub struct CrateConfig {
pub verbose: bool,
pub custom_profile: Option<String>,
pub features: Option<Vec<String>>,
pub target: Option<String>,
pub cargo_args: Vec<String>,
}
#[derive(Debug, Clone, Serialize, Deserialize)]
@@ -415,6 +417,8 @@ impl CrateConfig {
let verbose = false;
let custom_profile = None;
let features = None;
let target = None;
let cargo_args = vec![];
Ok(Self {
out_dir,
@@ -432,6 +436,8 @@ impl CrateConfig {
custom_profile,
features,
verbose,
target,
cargo_args,
})
}
@@ -469,6 +475,16 @@ impl CrateConfig {
self.features = Some(features);
self
}
pub fn set_target(&mut self, target: String) -> &mut Self {
self.target = Some(target);
self
}
pub fn set_cargo_args(&mut self, cargo_args: Vec<String>) -> &mut Self {
self.cargo_args = cargo_args;
self
}
}
fn true_bool() -> bool {