tauri-apps/tauri
1
1
Fork 0
mirror of https://github.com/tauri-apps/tauri.git synced 2024-12-21 01:32:03 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix(build): always invoke resource compiler on windows, fixes #8164 (#8168)

Browse Source 
* fix(build): Always invoke resource compiler on windows, fixes #8164

* move all the stuff out of the version check

* check for icon path when setting the icon
This commit is contained in:
Fabian-Lars 2023-11-06 20:46:25 +01:00 committed by GitHub
parent 01a7a983ab
commit a547971209
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 44 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.changes/tauri-build-resource-compiler.md Normal file
View File

@ -0,0 +1,5 @@
---
"tauri-build": 'patch:bug'
---
Fixed an issue that caused the resource compiler to not run on Windows when `package.version` was not set in `tauri.conf.json` preventing the app from starting.

75
core/tauri-build/src/lib.rs
View File

@ -534,47 +534,50 @@ pub fn try_build(attributes: Attributes) -> Result<()> {
.window_icon_path .window_icon_path
.unwrap_or_else(|| find_icon(&config, |i| i.ends_with(".ico"), "icons/icon.ico")); .unwrap_or_else(|| find_icon(&config, |i| i.ends_with(".ico"), "icons/icon.ico"));
if target_triple.contains("windows") { let mut res = WindowsResource::new();
if window_icon_path.exists() {
let mut res = WindowsResource::new();
if let Some(manifest) = attributes.windows_attributes.app_manifest { if let Some(manifest) = attributes.windows_attributes.app_manifest {
res.set_manifest(&manifest); res.set_manifest(&manifest);
} else { } else {
res.set_manifest(include_str!("window-app-manifest.xml")); res.set_manifest(include_str!("window-app-manifest.xml"));
} }
if let Some(version_str) = &config.package.version { if let Some(version_str) = &config.package.version {
if let Ok(v) = Version::parse(version_str) { if let Ok(v) = Version::parse(version_str) {
let version = v.major << 48 | v.minor << 32 | v.patch << 16; let version = v.major << 48 | v.minor << 32 | v.patch << 16;
res.set_version_info(VersionInfo::FILEVERSION, version); res.set_version_info(VersionInfo::FILEVERSION, version);
res.set_version_info(VersionInfo::PRODUCTVERSION, version); res.set_version_info(VersionInfo::PRODUCTVERSION, version);
}
if let Some(product_name) = &config.package.product_name {
res.set("ProductName", product_name);
}
if let Some(short_description) = &config.tauri.bundle.short_description {
res.set("FileDescription", short_description);
}
if let Some(copyright) = &config.tauri.bundle.copyright {
res.set("LegalCopyright", copyright);
}
res.set_icon_with_id(&window_icon_path.display().to_string(), "32512");
res.compile().with_context(|| {
format!(
"failed to compile `{}` into a Windows Resource file during tauri-build",
window_icon_path.display()
)
})?;
}
} else {
return Err(anyhow!(format!(
"`{}` not found; required for generating a Windows Resource file during tauri-build",
window_icon_path.display()
)));
} }
} }
if let Some(product_name) = &config.package.product_name {
res.set("ProductName", product_name);
}
if let Some(short_description) = &config.tauri.bundle.short_description {
res.set("FileDescription", short_description);
}
if let Some(copyright) = &config.tauri.bundle.copyright {
res.set("LegalCopyright", copyright);
}
if window_icon_path.exists() {
res.set_icon_with_id(&window_icon_path.display().to_string(), "32512");
} else {
return Err(anyhow!(format!(
"`{}` not found; required for generating a Windows Resource file during tauri-build",
window_icon_path.display()
)));
}
res.compile().with_context(|| {
format!(
"failed to compile `{}` into a Windows Resource file during tauri-build",
window_icon_path.display()
)
})?;
let target_env = std::env::var("CARGO_CFG_TARGET_ENV").unwrap(); let target_env = std::env::var("CARGO_CFG_TARGET_ENV").unwrap();
match target_env.as_str() { match target_env.as_str() {
"gnu" => { "gnu" => {