Skip to content

Commit 8e23870

Browse files
authored
fix(cli.rs): fix out dir detection when target arg is set, closes #2040 (#2098)
1 parent d18b536 commit 8e23870

File tree

4 files changed

+9
-4
lines changed

4 files changed

+9
-4
lines changed

.changes/fix-cli-target-set.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"cli.rs": patch
3+
---
4+
5+
Fixes `build` command when the `target` arg is set.

tooling/cli.rs/src/build.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ impl Build {
128128
let app_settings = crate::interface::rust::AppSettings::new(config_)?;
129129

130130
let out_dir = app_settings
131-
.get_out_dir(self.debug)
131+
.get_out_dir(self.target.clone(), self.debug)
132132
.with_context(|| "failed to get project out directory")?;
133133
if let Some(product_name) = config_.package.product_name.clone() {
134134
let bin_name = app_settings.cargo_package_settings().name.clone();

tooling/cli.rs/src/dev.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ impl Dev {
102102
let config_ = config_guard.as_ref().unwrap();
103103
let app_settings = crate::interface::rust::AppSettings::new(config_)?;
104104
let out_dir = app_settings
105-
.get_out_dir(true)
105+
.get_out_dir(self.target.clone(), true)
106106
.with_context(|| "failed to get project out directory")?;
107107
let settings = crate::interface::get_bundler_settings(
108108
app_settings,

tooling/cli.rs/src/interface/rust.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -186,10 +186,10 @@ impl AppSettings {
186186
)
187187
}
188188

189-
pub fn get_out_dir(&self, debug: bool) -> crate::Result<PathBuf> {
189+
pub fn get_out_dir(&self, target: Option<String>, debug: bool) -> crate::Result<PathBuf> {
190190
let tauri_dir = tauri_dir();
191191
let workspace_dir = get_workspace_dir(&tauri_dir);
192-
get_target_dir(&workspace_dir, None, !debug)
192+
get_target_dir(&workspace_dir, target, !debug)
193193
}
194194

195195
pub fn get_package_settings(&self) -> PackageSettings {

0 commit comments

Comments
 (0)