feat(core): set .rc values from tauri.conf.json, closes #1849 (#1951)

Author: lucasfernog

.changes/config.json

@@ -249,7 +249,8 @@
       "path": "./core/tauri-build",
       "manager": "rust",
       "dependencies": [
-        "tauri-codegen"
+        "tauri-codegen",
+        "tauri-utils"
       ],
       "postversion": "node ../../.scripts/sync-cli-metadata.js ${ pkg.pkg } ${ release.type }"
     },

.changes/windows-resources-set-values.md

@@ -0,0 +1,5 @@
+---
+"tauri-build": patch
+---
+
+Pull Windows resource information (`FileVersion`, `ProductVersion`, `ProductName` and `FileDescription`) from `tauri.conf.json > package` configuration.

core/tauri-build/Cargo.toml

@@ -23,6 +23,8 @@ tauri-codegen = { version = "1.0.0-beta.0", path = "../tauri-codegen", optional
 
 [target."cfg(windows)".dependencies]
 winres = "0.1"
+serde_json = "1.0"
+tauri-utils = { version = "1.0.0-beta.0", path = "../tauri-utils", features = [ "build" ] }
 
 [features]
 codegen = [ "tauri-codegen" ]

core/tauri-build/src/lib.rs

@@ -93,8 +93,15 @@ pub fn try_build(attributes: Attributes) -> Result<()> {
   #[cfg(windows)]
   {
     use anyhow::{anyhow, Context};
+    use std::fs::read_to_string;
+    use tauri_utils::config::Config;
     use winres::WindowsResource;
 
+    let config: Config = serde_json::from_str(
+      &read_to_string("tauri.conf.json").expect("failed to read tauri.conf.json"),
+    )
+    .expect("failed to parse tauri.conf.json");
+
     let icon_path_string = attributes
       .windows_attributes
       .window_icon_path
@@ -103,6 +110,14 @@ pub fn try_build(attributes: Attributes) -> Result<()> {
 
     if attributes.windows_attributes.window_icon_path.exists() {
       let mut res = WindowsResource::new();
+      if let Some(version) = &config.package.version {
+        res.set("FileVersion", version);
+        res.set("ProductVersion", version);
+      }
+      if let Some(product_name) = &config.package.product_name {
+        res.set("ProductName", product_name);
+        res.set("FileDescription", product_name);
+      }
       res.set_icon_with_id(&icon_path_string, "32512");
       res.compile().with_context(|| {
         format!(

core/tauri-runtime-wry/src/menu.rs

@@ -147,7 +147,7 @@ impl<'a, I: MenuId> From<&'a CustomMenuItem<I>> for MenuItemAttributesWrapper<'a
       .with_selected(item.selected)
       .with_id(WryMenuId(item.id_value()));
     if let Some(accelerator) = item.keyboard_accelerator.as_ref() {
-      attributes = attributes.with_accelerators(&accelerator);
+      attributes = attributes.with_accelerators(accelerator);
     }
     Self(attributes)
   }

core/tauri/src/api/cli.rs

@@ -162,13 +162,13 @@ fn get_app<'a>(name: &str, about: Option<&'a String>, config: &'a CliConfig) ->
   if let Some(args) = config.args() {
     for arg in args {
       let arg_name = arg.name.as_ref();
-      app = app.arg(get_arg(arg_name, &arg));
+      app = app.arg(get_arg(arg_name, arg));
     }
   }
 
   if let Some(subcommands) = config.subcommands() {
     for (subcommand_name, subcommand) in subcommands {
-      let clap_subcommand = get_app(&subcommand_name, subcommand.description(), subcommand);
+      let clap_subcommand = get_app(subcommand_name, subcommand.description(), subcommand);
       app = app.subcommand(clap_subcommand);
     }
   }

core/tauri/src/api/file/extract.rs

@@ -84,7 +84,7 @@ impl<'a> Extract<'a> {
     let source = fs::File::open(self.source)?;
     let archive = self
       .archive_format
-      .unwrap_or_else(|| detect_archive_type(&self.source));
+      .unwrap_or_else(|| detect_archive_type(self.source));
 
     match archive {
       ArchiveFormat::Plain(compression) | ArchiveFormat::Tar(compression) => {
@@ -140,7 +140,7 @@ impl<'a> Extract<'a> {
     let source = fs::File::open(self.source)?;
     let archive = self
       .archive_format
-      .unwrap_or_else(|| detect_archive_type(&self.source));
+      .unwrap_or_else(|| detect_archive_type(self.source));
 
     match archive {
       ArchiveFormat::Plain(compression) | ArchiveFormat::Tar(compression) => {

core/tauri/src/app.rs

@@ -731,7 +731,7 @@ where
             let app_handle = app_handle.clone();
             let event = match event {
               RuntimeSystemTrayEvent::MenuItemClick(id) => tray::SystemTrayEvent::MenuItemClick {
-                id: ids.get(&id).unwrap().clone(),
+                id: ids.get(id).unwrap().clone(),
               },
               RuntimeSystemTrayEvent::LeftClick { position, size } => {
                 tray::SystemTrayEvent::LeftClick {

core/tauri/src/endpoints/app.rs

@@ -9,6 +9,7 @@ use serde::Deserialize;
 /// The API descriptor.
 #[derive(Deserialize)]
 #[serde(tag = "cmd", rename_all = "camelCase")]
+#[allow(clippy::enum_variant_names)]
 pub enum Cmd {
   /// Get Application Version
   GetAppVersion,

core/tauri/src/endpoints/cli.rs

@@ -21,7 +21,7 @@ impl Cmd {
       #[allow(unused_variables)]
       Self::CliMatches => {
         #[cfg(cli)]
-        return crate::api::cli::get_matches(&cli_config)
+        return crate::api::cli::get_matches(cli_config)
           .map_err(Into::into)
           .map(Into::into);
         #[cfg(not(cli))]