Build: Move WIX installer files to release/windows/installer_wix
This allows the files to be re-used between x64 and amd64 builds for Windows. This adds 500 kilobyte of files, but they almost never change, they are required for releases anyway, and having them in the repo solves all sort of synchronization problems. A new graphics is now used, as it was long requested by the UI and release/PR team. Pull Request: https://projects.blender.org/blender/blender/pulls/128588
This commit is contained in:
committed by
Sergey Sharybin
parent
e7747c0d93
commit
33320b50dd
@@ -103,9 +103,9 @@ if(WIN32)
|
||||
TYPE SHA1 UPPER
|
||||
)
|
||||
|
||||
set(CPACK_WIX_TEMPLATE ${LIBDIR}/package/installer_wix/WIX.template)
|
||||
set(CPACK_WIX_UI_BANNER ${LIBDIR}/package/installer_wix/WIX_UI_BANNER.bmp)
|
||||
set(CPACK_WIX_UI_DIALOG ${LIBDIR}/package/installer_wix/WIX_UI_DIALOG.bmp)
|
||||
set(CPACK_WIX_TEMPLATE ${CMAKE_SOURCE_DIR}/release/windows/installer_wix/WIX.template)
|
||||
set(CPACK_WIX_UI_BANNER ${CMAKE_SOURCE_DIR}/release/windows/installer_wix/WIX_UI_BANNER.bmp)
|
||||
set(CPACK_WIX_UI_DIALOG ${CMAKE_SOURCE_DIR}/release/windows/installer_wix/WIX_UI_DIALOG.bmp)
|
||||
|
||||
set(CPACK_WIX_LIGHT_EXTRA_FLAGS -dcl:medium)
|
||||
endif()
|
||||
|
||||
66
release/windows/installer_wix/WIX.template
Normal file
66
release/windows/installer_wix/WIX.template
Normal file
@@ -0,0 +1,66 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
|
||||
<?include "cpack_variables.wxi"?>
|
||||
|
||||
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
|
||||
RequiredVersion="3.6.3303.0">
|
||||
|
||||
<Product Id="$(var.CPACK_WIX_PRODUCT_GUID)"
|
||||
Name="$(var.CPACK_PACKAGE_NAME)"
|
||||
Language="1033"
|
||||
Version="$(var.CPACK_PACKAGE_VERSION)"
|
||||
Manufacturer="$(var.CPACK_PACKAGE_VENDOR)"
|
||||
UpgradeCode="$(var.CPACK_WIX_UPGRADE_GUID)">
|
||||
|
||||
<Package InstallerVersion="301" Compressed="yes"/>
|
||||
|
||||
<Media Id="1" Cabinet="media1.cab" EmbedCab="yes"/>
|
||||
<Condition Message="This application is only supported on Windows 8.1, Windows Server 2016, or higher.">
|
||||
<![CDATA[Installed OR (VersionNT >= 603)]]>
|
||||
</Condition>
|
||||
<MajorUpgrade
|
||||
Schedule="afterInstallInitialize"
|
||||
AllowSameVersionUpgrades="yes"
|
||||
DowngradeErrorMessage="A later version of [ProductName] is already installed. Setup will now exit."/>
|
||||
|
||||
<WixVariable Id="WixUILicenseRtf" Value="$(var.CPACK_WIX_LICENSE_RTF)"/>
|
||||
<Property Id="WIXUI_INSTALLDIR" Value="INSTALL_ROOT"/>
|
||||
|
||||
<?ifdef CPACK_WIX_PRODUCT_ICON?>
|
||||
<Property Id="ARPPRODUCTICON">ProductIcon.ico</Property>
|
||||
<Icon Id="ProductIcon.ico" SourceFile="$(var.CPACK_WIX_PRODUCT_ICON)"/>
|
||||
<?endif?>
|
||||
|
||||
<?ifdef CPACK_WIX_UI_BANNER?>
|
||||
<WixVariable Id="WixUIBannerBmp" Value="$(var.CPACK_WIX_UI_BANNER)"/>
|
||||
<?endif?>
|
||||
|
||||
<?ifdef CPACK_WIX_UI_DIALOG?>
|
||||
<WixVariable Id="WixUIDialogBmp" Value="$(var.CPACK_WIX_UI_DIALOG)"/>
|
||||
<?endif?>
|
||||
|
||||
<FeatureRef Id="ProductFeature"/>
|
||||
|
||||
<UIRef Id="$(var.CPACK_WIX_UI_REF)" />
|
||||
|
||||
<?include "properties.wxi"?>
|
||||
|
||||
<CustomAction Id="RegisterBlender"
|
||||
Impersonate="no"
|
||||
Execute="deferred"
|
||||
FileKey="CM_FP_Blender.blender.exe"
|
||||
ExeCommand=" --register-allusers"
|
||||
Return="ignore" />
|
||||
<CustomAction Id="UnRegisterBlender"
|
||||
Impersonate="no"
|
||||
Execute="deferred"
|
||||
FileKey="CM_FP_Blender.blender.exe"
|
||||
ExeCommand=" --unregister-allusers"
|
||||
Return="ignore" />
|
||||
<InstallExecuteSequence>
|
||||
<Custom Action="RegisterBlender" After="InstallFiles" />
|
||||
<!-- https://stackoverflow.com/questions/320921/how-to-add-a-wix-custom-action-that-happens-only-on-uninstall-via-msi -->
|
||||
<Custom Action="UnRegisterBlender" Before="RemoveFiles">(NOT UPGRADINGPRODUCTCODE) AND (REMOVE="ALL")</Custom>
|
||||
</InstallExecuteSequence>
|
||||
</Product>
|
||||
</Wix>
|
||||
BIN
release/windows/installer_wix/WIX_UI_BANNER.bmp
Normal file
BIN
release/windows/installer_wix/WIX_UI_BANNER.bmp
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 84 KiB |
BIN
release/windows/installer_wix/WIX_UI_DIALOG.bmp
Normal file
BIN
release/windows/installer_wix/WIX_UI_DIALOG.bmp
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 451 KiB |
Reference in New Issue
Block a user