tauri-apps/tauri
1
1
Fork 0
mirror of https://github.com/tauri-apps/tauri.git synced 2024-09-11 07:55:34 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix(cli.rs): cargo build failed due to cache issue, closes #1543 (#1741)

Browse Source
This commit is contained in:
Lucas Fernandes Nogueira 2021-05-07 16:31:52 -03:00 committed by GitHub
parent f369a9c076
commit 79feb6a918
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.changes/cargo-cache.md Normal file
View File

@ -0,0 +1,5 @@
---
"cli.rs": patch
---
Fixes a cargo `target/` cache issue.

27
tooling/cli.rs/src/dev.rs
View File

@ -119,14 +119,6 @@ impl Dev {
}
}
let dev_path = config
.lock()
.unwrap()
.as_ref()
.unwrap()
.build
.dev_path
.to_string();
let runner_from_config = config
.lock()
.unwrap()
@ -164,19 +156,6 @@ impl Dev {
watcher.watch(tauri_path.join("src"), RecursiveMode::Recursive)?;
watcher.watch(tauri_path.join("Cargo.toml"), RecursiveMode::Recursive)?;
watcher.watch(tauri_path.join("tauri.conf.json"), RecursiveMode::Recursive)?;
if !dev_path.starts_with("http") {
watcher.watch(
config
.lock()
.unwrap()
.as_ref()
.unwrap()
.build
.dev_path
.to_string(),
RecursiveMode::Recursive,
)?;
}
loop {
if let Ok(event) = rx.recv() {
@ -200,6 +179,12 @@ impl Dev {
process
.kill()
.with_context(|| "failed to kill app process")?;
// wait for the process to exit
loop {
if let Ok(Some(_)) = process.try_wait() {
break;
}
}
process = self.start_app(&runner, child_wait_rx.clone());
}
}