artin/tauri
1
0
Fork 0
mirror of https://github.com/tauri-apps/tauri.git synced 2026-02-06 11:41:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix merge conflicts

Browse Source
This commit is contained in:
FabianLars 2026-02-03 15:53:43 +01:00
parent 4118846d11
commit b29823c226
No known key found for this signature in database
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
crates/tauri-cli/src/bundle.rs
View File

@ -147,7 +147,7 @@ pub fn command(options: Options, verbosity: u8) -> crate::Result<()> {
let out_dir = app_settings.out_dir(&interface_options, dirs.tauri)?;
interface.on_before_bundle(&interface_options)?;
interface.on_before_bundle(&interface_options, &dirs)?;
bundle(
&options,

14
crates/tauri-cli/src/interface/rust.rs
View File

@ -182,12 +182,12 @@ impl Rust {
self.app_settings.clone()
}
pub fn on_before_bundle(&self, options: &Options) -> crate::Result<()> {
self.prepare(options)
pub fn on_before_bundle(&self, options: &Options, dirs: &Dirs) -> crate::Result<()> {
self.prepare(options, dirs)
}
pub fn build(&mut self, options: Options, dirs: &Dirs) -> crate::Result<PathBuf> {
self.prepare(&options)?;
self.prepare(&options, dirs)?;
desktop::build(
options,
&self.app_settings,
@ -205,7 +205,7 @@ impl Rust {
on_exit: F,
dirs: &Dirs,
) -> crate::Result<()> {
self.prepare(&options)?;
self.prepare(&options, dirs)?;
let on_exit = Arc::new(on_exit);
let mut run_args = Vec::new();
@ -494,6 +494,7 @@ fn ensure_cef_directory_if_needed(
config_features: Vec<String>,
target: Option<&str>,
features: &Vec<String>,
tauri_dir: &Path,
) -> crate::Result<()> {
let mut merged_features = config_features;
merged_features.extend(features.clone());
@ -522,7 +523,7 @@ fn ensure_cef_directory_if_needed(
// We also do this for builds since we can't codesign the global cache.
#[cfg(windows)]
Ok(Some(cef_dir)) => {
let out_dir = app_settings.out_dir(options)?;
let out_dir = app_settings.out_dir(options, tauri_dir)?;
crate::helpers::fs::copy_dir_all(&cef_dir, &out_dir)?;
}
Err(e) => {
@ -533,13 +534,14 @@ fn ensure_cef_directory_if_needed(
}
impl Rust {
fn prepare(&self, options: &Options) -> crate::Result<()> {
fn prepare(&self, options: &Options, dirs: &Dirs) -> crate::Result<()> {
ensure_cef_directory_if_needed(
&self.app_settings,
options,
self.config_features.clone(),
options.target.as_deref(),
&options.features,
dirs.tauri,
)
}