Merge branch 'feat/store-main-binary-name' into refactor/wix-updater-…

…launch-app
tauri-apps · Sep 11, 2024 · d9b9a11 · d9b9a11
2 parents 60bde0b + 497b481
commit d9b9a11
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 3 deletions.
diff --git a/.changes/bundler-store-main-binary-name.md b/.changes/bundler-store-main-binary-name.md
@@ -0,0 +1,5 @@
+---
+"tauri-bundler": "patch:feat"
+---
+
+Store main binary name in registry for NSIS and MSI installers. This will be used in future app updates to detect main binary name changes.
diff --git a/tooling/bundler/src/bundle/windows/msi/wix.rs b/tooling/bundler/src/bundle/windows/msi/wix.rs
@@ -549,7 +549,9 @@ pub fn build_wix_app_installer(
   data.insert("shortcut_guid", to_json(shortcut_guid.as_str()));
 
   let app_exe_name = settings.main_binary_name().to_string();
-  data.insert("app_exe_name", to_json(app_exe_name));
+  // Note: `app_exe_name` kept around to not break custom wix templates depending on it
+  data.insert("app_exe_name", to_json(&app_exe_name));
+  data.insert("main_binary_name", to_json(app_exe_name));
 
   let binaries = generate_binaries_data(settings)?;
 

diff --git a/tooling/bundler/src/bundle/windows/templates/installer.nsi b/tooling/bundler/src/bundle/windows/templates/installer.nsi
@@ -571,6 +571,9 @@ Section Install
     WriteRegStr SHCTX "${UNINSTKEY}" $MultiUser.InstallMode 1
   !endif
 
+  ; Save current MAINBINARYNAME for future updates from v2 updater
+  WriteRegStr SHCTX "${UNINSTKEY}" "MainBinaryName" "${MAINBINARYNAME}.exe"
+
   ; Registry information for add/remove programs
   WriteRegStr SHCTX "${UNINSTKEY}" "DisplayName" "${PRODUCTNAME}"
   WriteRegStr SHCTX "${UNINSTKEY}" "DisplayIcon" "$\"$INSTDIR\${MAINBINARYNAME}.exe$\""

diff --git a/tooling/bundler/src/bundle/windows/templates/main.wxs b/tooling/bundler/src/bundle/windows/templates/main.wxs
@@ -118,6 +118,10 @@
                 <RegistryKey Root="HKCU" Key="Software\\{{manufacturer}}\\{{product_name}}">
                     <RegistryValue Name="InstallDir" Type="string" Value="[INSTALLDIR]" KeyPath="yes" />
                 </RegistryKey>
+                <!-- Save current MAINBINARYNAME for future updates from v2 updater -->
+                <RegistryKey Root="HKLM" Key="Software\\{{manufacturer}}\\{{product_name}}">
+                    <RegistryValue Name="MainBinaryName" Type="string" Value="{{main_binary_name}}"/>
+                </RegistryKey>
             </Component>
             <Component Id="Path" Guid="{{path_component_guid}}" Win64="$(var.Win64)">
                 <File Id="Path" Source="{{app_exe_source}}" KeyPath="yes" Checksum="yes"/>

diff --git a/tooling/cli/node/index.d.ts b/tooling/cli/node/index.d.ts
@@ -3,5 +3,5 @@
 
 /* auto-generated by NAPI-RS */
 
-export function run(args: Array<string>, binName: string | undefined | null, callback: (...args: any[]) => any): void
-export function logError(error: string): void
+export declare function run(args: Array<string>, binName: string | undefined | null, callback: (...args: any[]) => any): void
+export declare function logError(error: string): void