CalvinBackup/tauri
1
0
Fork 0
mirror of https://github.com/tauri-apps/tauri.git synced 2026-04-11 10:43:31 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix: Windows bundling due to missing CEF dir copy regression

Browse Source
This commit is contained in:
Lucas Nogueira
2026-04-04 07:39:18 -03:00
parent c641dfdde5
commit 00eefcc71f
2 changed files with 42 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
crates/tauri-bundler/src/bundle/windows/msi/mod.rs
View File

@@ -14,7 +14,7 @@ use crate::{
},
},
},
error::Context,
error::{Context, ErrorExt},
utils::{
CommandExt,
fs_utils::copy_file,
@@ -1091,8 +1091,9 @@ fn generate_resource_data(settings: &Settings) -> crate::Result<ResourceMap> {
// Handle CEF support if cef_path is set,
// using https://github.com/chromiumembedded/cef/blob/master/tools/distrib/win/README.redistrib.txt as a reference
if settings.bundle_settings().cef_path.is_some() {
let mut cef_files = [
if let Some(cef_path) = settings.bundle_settings().cef_path.as_ref() {
let project_out = settings.project_out_directory();
let cef_filenames = [
// required
"libcef.dll",
"chrome_elf.dll",
@@ -1119,19 +1120,24 @@ fn generate_resource_data(settings: &Settings) -> crate::Result<ResourceMap> {
// sandbox - may need to be behind a setting?
"bootstrap.exe",
"bootstrapc.exe",
]
.map(|f| ResourceFile {
id: format!("I{}", Uuid::new_v4().as_simple()),
guid: Uuid::new_v4().to_string(),
// We don't want to sign the cached files directly so we use the copied ones.
path: dunce::simplified(&settings.project_out_directory().join(f)).to_path_buf(),
})
.to_vec();
];
let mut cef_files = Vec::with_capacity(cef_filenames.len());
for f in cef_filenames {
let from = cef_path.join(f);
let path = dunce::simplified(&project_out.join(f)).to_path_buf();
fs::copy(&from, &path).fs_context("failed to copy CEF file for MSI bundle", from)?;
if settings.windows().can_sign() && should_sign(&path)? {
try_sign(&path, settings)?;
}
cef_files.push(ResourceFile {
id: format!("I{}", Uuid::new_v4().as_simple()),
guid: Uuid::new_v4().to_string(),
path,
});
}
for f in &cef_files {
if settings.windows().can_sign() && should_sign(&f.path)? {
try_sign(&f.path, settings)?;
}
added_resources.push(f.path.clone());
}
@@ -1147,20 +1153,24 @@ fn generate_resource_data(settings: &Settings) -> crate::Result<ResourceMap> {
// TODO: locales?
// crash without at least en
let mut locales = [
let locale_names = [
"en-US.pak",
"en-US_FEMININE.pak",
"en-US_MASCULINE.pak",
"en-US_NEUTER.pak",
]
.map(|f| ResourceFile {
id: format!("I{}", Uuid::new_v4().as_simple()),
guid: Uuid::new_v4().to_string(),
// We don't want to sign the cached files directly so we use the copied ones.
path: dunce::simplified(&settings.project_out_directory().join("locales").join(f))
.to_path_buf(),
})
.to_vec();
];
let mut locales = Vec::with_capacity(locale_names.len());
for f in locale_names {
let target_file = PathBuf::from("locales").join(f);
let from = cef_path.join(&target_file);
let path = dunce::simplified(&project_out.join(&target_file)).to_path_buf();
fs::copy(&from, &path).fs_context("failed to copy CEF locale for MSI bundle", from)?;
locales.push(ResourceFile {
id: format!("I{}", Uuid::new_v4().as_simple()),
guid: Uuid::new_v4().to_string(),
path,
});
}
for f in &locales {
added_resources.push(f.path.clone());

12
crates/tauri-bundler/src/bundle/windows/nsis/mod.rs
View File

@@ -760,7 +760,8 @@ fn generate_resource_data(settings: &Settings) -> crate::Result<ResourcesMap> {
// Handle CEF support if cef_path is set,
// using https://github.com/chromiumembedded/cef/blob/master/tools/distrib/win/README.redistrib.txt as a reference
if settings.bundle_settings().cef_path.is_some() {
if let Some(cef_path) = settings.bundle_settings().cef_path.as_ref() {
let project_out = settings.project_out_directory();
let cef_files = [
// required
"libcef.dll",
@@ -791,7 +792,9 @@ fn generate_resource_data(settings: &Settings) -> crate::Result<ResourcesMap> {
];
for f in &cef_files {
let src_path = dunce::simplified(&settings.project_out_directory().join(f)).to_path_buf();
let from = cef_path.join(f);
let src_path = dunce::simplified(&project_out.join(f)).to_path_buf();
fs::copy(&from, &src_path).fs_context("failed to copy CEF file for NSIS bundle", from)?;
if settings.windows().can_sign() && should_sign(&src_path)? {
try_sign(&src_path, settings)?;
}
@@ -810,8 +813,9 @@ fn generate_resource_data(settings: &Settings) -> crate::Result<ResourcesMap> {
for f in &locales {
let target_file = PathBuf::from("locales").join(f);
let src_path =
dunce::simplified(&settings.project_out_directory().join(&target_file)).to_path_buf();
let from = cef_path.join(&target_file);
let src_path = dunce::simplified(&project_out.join(&target_file)).to_path_buf();
fs::copy(&from, &src_path).fs_context("failed to copy CEF locale for NSIS bundle", from)?;
added_resources.push(src_path.clone());
resources.insert(src_path, (PathBuf::from("locales"), target_file));
}