aaron/mattermost-desktop
1
0
Fork 0
Code Issues Pull requests Actions 2 Packages Projects Releases Wiki Activity
mattermost-desktop/patches/app-builder-lib+24.13.3.patch

70 lines
2.8 KiB
Diff
Raw Normal View History

[MM-55341][MM-56894] Use `electron-builder` to create the MSI installer, drop support for 32-bit Windows and the NSIS installer (#3028) * Drop 32-bit windows support * Remove unnecessary after build script * Enable MSI build from electron-builder * Copy MSI installers correctly * Change script to `windows-installer` * Revert "Remove unnecessary after build script" This reverts commit 65b1cccb063656916a7d12c440792ad013dff826. * Fix duplicate installers when updating to EXE version * Inject the app-update.yml from the NSIS installer into the MSI, have the MSI uninstall the EXE if it exists * Cleanup old MSI builder, switch actions to use new process * Sign PR builds * Update to use absolute paths * Use env variable paths
2024-05-14 09:07:45 -07:00
diff --git a/node_modules/app-builder-lib/templates/msi/template.xml b/node_modules/app-builder-lib/templates/msi/template.xml
Fixes for the MSI installer (#3043) * Run uninstaller for EXE synchronously so that it doesn't try to uninstall while also installing * Display error message before running MSI installer to close the application manually
2024-05-28 14:04:13 -07:00
index 2d5cd3c..92a0556 100644
[MM-55341][MM-56894] Use `electron-builder` to create the MSI installer, drop support for 32-bit Windows and the NSIS installer (#3028) * Drop 32-bit windows support * Remove unnecessary after build script * Enable MSI build from electron-builder * Copy MSI installers correctly * Change script to `windows-installer` * Revert "Remove unnecessary after build script" This reverts commit 65b1cccb063656916a7d12c440792ad013dff826. * Fix duplicate installers when updating to EXE version * Inject the app-update.yml from the NSIS installer into the MSI, have the MSI uninstall the EXE if it exists * Cleanup old MSI builder, switch actions to use new process * Sign PR builds * Update to use absolute paths * Use env variable paths
2024-05-14 09:07:45 -07:00
--- a/node_modules/app-builder-lib/templates/msi/template.xml
+++ b/node_modules/app-builder-lib/templates/msi/template.xml
Fixes for the MSI installer (#3043) * Run uninstaller for EXE synchronously so that it doesn't try to uninstall while also installing * Display error message before running MSI installer to close the application manually
2024-05-28 14:04:13 -07:00
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
+<Wix
+ xmlns="http://wixtoolset.org/schemas/v4/wxs"
+ xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util"
+>
<!-- https://blogs.msdn.microsoft.com/gremlininthemachine/2006/12/05/msi-wix-and-unicode/ -->
<Product Id="*" Name="${productName}" UpgradeCode="${upgradeCode}" Version="${version}" Language="1033" Codepage="65001" Manufacturer="${manufacturer}">
<Package Compressed="yes" InstallerVersion="500"/>
@@ -26,6 +29,27 @@
[MM-55341][MM-56894] Use `electron-builder` to create the MSI installer, drop support for 32-bit Windows and the NSIS installer (#3028) * Drop 32-bit windows support * Remove unnecessary after build script * Enable MSI build from electron-builder * Copy MSI installers correctly * Change script to `windows-installer` * Revert "Remove unnecessary after build script" This reverts commit 65b1cccb063656916a7d12c440792ad013dff826. * Fix duplicate installers when updating to EXE version * Inject the app-update.yml from the NSIS installer into the MSI, have the MSI uninstall the EXE if it exists * Cleanup old MSI builder, switch actions to use new process * Sign PR builds * Update to use absolute paths * Use env variable paths
2024-05-14 09:07:45 -07:00
<Property Id="ARPPRODUCTICON" Value="${iconId}"/>
{{ } -}}
Fixes for the MSI installer (#3043) * Run uninstaller for EXE synchronously so that it doesn't try to uninstall while also installing * Display error message before running MSI installer to close the application manually
2024-05-28 14:04:13 -07:00
+ <util:CloseApplication
+ Id="closeApplication"
+ Description="Mattermost is still running. Please ensure to manually close before continuing installation."
+ Target="Mattermost.exe"
+ RebootPrompt="no"
+ PromptToContinue="yes"
+ />
+ <CustomAction
+ Id="removeExeInstaller"
+ Directory="APPLICATIONFOLDER"
+ ExeCommand="[APPLICATIONFOLDER]Uninstall ${productName}.exe /S"
+ Execute="immediate"
+ Impersonate="yes"
+ Return="ignore"
+ />
[MM-55341][MM-56894] Use `electron-builder` to create the MSI installer, drop support for 32-bit Windows and the NSIS installer (#3028) * Drop 32-bit windows support * Remove unnecessary after build script * Enable MSI build from electron-builder * Copy MSI installers correctly * Change script to `windows-installer` * Revert "Remove unnecessary after build script" This reverts commit 65b1cccb063656916a7d12c440792ad013dff826. * Fix duplicate installers when updating to EXE version * Inject the app-update.yml from the NSIS installer into the MSI, have the MSI uninstall the EXE if it exists * Cleanup old MSI builder, switch actions to use new process * Sign PR builds * Update to use absolute paths * Use env variable paths
2024-05-14 09:07:45 -07:00
+ <InstallExecuteSequence>
Fixes for the MSI installer (#3043) * Run uninstaller for EXE synchronously so that it doesn't try to uninstall while also installing * Display error message before running MSI installer to close the application manually
2024-05-28 14:04:13 -07:00
+ <Custom Action="WixCloseApplications" Before="InstallValidate"/>
+ <Custom Action="WixCloseApplicationsDeferred" After="InstallInitialize"/>
+ <Custom Action="removeExeInstaller" After="InstallInitialize"/>
[MM-55341][MM-56894] Use `electron-builder` to create the MSI installer, drop support for 32-bit Windows and the NSIS installer (#3028) * Drop 32-bit windows support * Remove unnecessary after build script * Enable MSI build from electron-builder * Copy MSI installers correctly * Change script to `windows-installer` * Revert "Remove unnecessary after build script" This reverts commit 65b1cccb063656916a7d12c440792ad013dff826. * Fix duplicate installers when updating to EXE version * Inject the app-update.yml from the NSIS installer into the MSI, have the MSI uninstall the EXE if it exists * Cleanup old MSI builder, switch actions to use new process * Sign PR builds * Update to use absolute paths * Use env variable paths
2024-05-14 09:07:45 -07:00
+ </InstallExecuteSequence>
+
{{ if (isRunAfterFinish) { }}
<CustomAction Id="runAfterFinish" FileKey="mainExecutable" ExeCommand="" Execute="immediate" Impersonate="yes" Return="asyncNoWait"/>
{{ if (!isAssisted) { }}
Fixes for the MSI installer (#3043) * Run uninstaller for EXE synchronously so that it doesn't try to uninstall while also installing * Display error message before running MSI installer to close the application manually
2024-05-28 14:04:13 -07:00
@@ -42,6 +66,7 @@
[MM-55341][MM-56894] Use `electron-builder` to create the MSI installer, drop support for 32-bit Windows and the NSIS installer (#3028) * Drop 32-bit windows support * Remove unnecessary after build script * Enable MSI build from electron-builder * Copy MSI installers correctly * Change script to `windows-installer` * Revert "Remove unnecessary after build script" This reverts commit 65b1cccb063656916a7d12c440792ad013dff826. * Fix duplicate installers when updating to EXE version * Inject the app-update.yml from the NSIS installer into the MSI, have the MSI uninstall the EXE if it exists * Cleanup old MSI builder, switch actions to use new process * Sign PR builds * Update to use absolute paths * Use env variable paths
2024-05-14 09:07:45 -07:00
<Property Id="ALLUSERS" Secure="yes" Value="2"/>
{{ } -}}
<Property Id="MSIINSTALLPERUSER" Secure="yes" Value="1"/>
+ <Property Id="DISABLEAUTOUPDATE" Value="0"/>
{{ if (isAssisted) { }}
<WixVariable Id="WixUISupportPerUser" Value="1" Overridable="yes"/>
Fixes for the MSI installer (#3043) * Run uninstaller for EXE synchronously so that it doesn't try to uninstall while also installing * Display error message before running MSI installer to close the application manually
2024-05-28 14:04:13 -07:00
@@ -80,6 +105,7 @@
[MM-55341][MM-56894] Use `electron-builder` to create the MSI installer, drop support for 32-bit Windows and the NSIS installer (#3028) * Drop 32-bit windows support * Remove unnecessary after build script * Enable MSI build from electron-builder * Copy MSI installers correctly * Change script to `windows-installer` * Revert "Remove unnecessary after build script" This reverts commit 65b1cccb063656916a7d12c440792ad013dff826. * Fix duplicate installers when updating to EXE version * Inject the app-update.yml from the NSIS installer into the MSI, have the MSI uninstall the EXE if it exists * Cleanup old MSI builder, switch actions to use new process * Sign PR builds * Update to use absolute paths * Use env variable paths
2024-05-14 09:07:45 -07:00
</UI>
{{ } -}}
+ <Directory Id="resourcesDir" Name="APPLICATIONFOLDER:\resources\"/>
<Directory Id="TARGETDIR" Name="SourceDir">
<Directory Id="${programFilesId}">
{{ if (menuCategory) { }}
Fixes for the MSI installer (#3043) * Run uninstaller for EXE synchronously so that it doesn't try to uninstall while also installing * Display error message before running MSI installer to close the application manually
2024-05-28 14:04:13 -07:00
@@ -110,6 +136,10 @@
[MM-55341][MM-56894] Use `electron-builder` to create the MSI installer, drop support for 32-bit Windows and the NSIS installer (#3028) * Drop 32-bit windows support * Remove unnecessary after build script * Enable MSI build from electron-builder * Copy MSI installers correctly * Change script to `windows-installer` * Revert "Remove unnecessary after build script" This reverts commit 65b1cccb063656916a7d12c440792ad013dff826. * Fix duplicate installers when updating to EXE version * Inject the app-update.yml from the NSIS installer into the MSI, have the MSI uninstall the EXE if it exists * Cleanup old MSI builder, switch actions to use new process * Sign PR builds * Update to use absolute paths * Use env variable paths
2024-05-14 09:07:45 -07:00
{{-dirs}}
<ComponentGroup Id="ProductComponents" Directory="APPLICATIONFOLDER">
+ <Component Directory="resourcesDir">
+ <Condition>(NOT ALLUSERS = 1) AND DISABLEAUTOUPDATE = 0</Condition>
+ <File Name="app-update.yml" Source="$(var.appDir)\..\msi-app-update.yml" ReadOnly="yes" KeyPath="yes"/>
+ </Component>
{{-files}}
</ComponentGroup>
</Product>
Reference in a new issue Copy permalink