griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Installer: Windows: Various tweaks and updates to the installer

Browse Source 
1 - Add an option to open up the fund.blender.org website at the end of
the install process.

2 - Use blender launcher to register blender in order to prevent a black
dialog box flashing onto the screen.

3- Since registering blender can take a bit, add a progress text during
registration

4- during installation on windows 10+ the installer displayed
`Copying new files File: [1], Directory: [9], Size [6]` fixed to just display
`Copying new files`

Pull Request: https://projects.blender.org/blender/blender/pulls/130762
This commit is contained in:
Ray Molenkamp
2024-12-10 08:41:04 +01:00
committed by Thomas Dinges
parent 95b9281de1
commit cab0dadbe3
1 changed files with 20 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
release/windows/installer_wix/WIX.template
View File

@@ -44,18 +44,33 @@
<UIRef Id="$(var.CPACK_WIX_UI_REF)" />
<?include "properties.wxi"?>
<UI>
<Publish Dialog="ExitDialog"
Control="Finish"
Event="DoAction"
Value="LaunchBrowser">WIXUI_EXITDIALOGOPTIONALCHECKBOX = 1 and NOT Installed</Publish>
<ProgressText Action="RegisterBlender">Registering Blender</ProgressText>
</UI>
<Property Id="WIXUI_EXITDIALOGOPTIONALCHECKBOXTEXT" Value="Learn how to support Blender" />
<Property Id="WIXUI_EXITDIALOGOPTIONALCHECKBOX" Value="1" />
<UIRef Id="WixUI_ErrorProgressText" />
<CustomAction Id="LaunchBrowser"
ExeCommand="explorer.exe &quot;https://fund.blender.org/?utm_source=blender-$(var.CPACK_PACKAGE_VERSION)-installer-msi&quot;"
Directory="INSTALL_ROOT"
Return="asyncNoWait" >
REMOVE="ALL"
</CustomAction>
<CustomAction Id="RegisterBlender"
Impersonate="no"
Execute="deferred"
FileKey="CM_FP_Blender.blender.exe"
ExeCommand=" --register-allusers"
FileKey="CM_FP_Blender.blender_launcher.exe"
ExeCommand="--register-allusers"
Return="ignore" />
<CustomAction Id="UnRegisterBlender"
Impersonate="no"
Execute="deferred"
FileKey="CM_FP_Blender.blender.exe"
ExeCommand=" --unregister-allusers"
FileKey="CM_FP_Blender.blender_launcher.exe"
ExeCommand="--unregister-allusers"
Return="ignore" />
<InstallExecuteSequence>
<Custom Action="RegisterBlender" After="InstallFiles" />