blakeridgway/supercell-wx
1
0
Fork 0
mirror of https://github.com/ciphervance/supercell-wx.git synced 2025-10-31 18:10:05 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Close Supercell Wx before install

Browse source
This commit is contained in:
Dan Paulat 2024-03-16 17:20:36 -05:00
parent f8c19bc318
commit c164e48c23
2 changed files with 13 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
scwx-qt/scwx-qt.cmake
View file

@ -619,6 +619,8 @@ if (MSVC)
set(CPACK_GENERATOR WIX) set(CPACK_GENERATOR WIX)
set(CPACK_PACKAGE_EXECUTABLES "supercell-wx;Supercell Wx") set(CPACK_PACKAGE_EXECUTABLES "supercell-wx;Supercell Wx")
set(CPACK_WIX_UPGRADE_GUID 36AD0F51-4D4F-4B5D-AB61-94C6B4E4FE1C) set(CPACK_WIX_UPGRADE_GUID 36AD0F51-4D4F-4B5D-AB61-94C6B4E4FE1C)
set(CPACK_WIX_TEMPLATE "${CMAKE_CURRENT_SOURCE_DIR}/wix.template.in")
set(CPACK_WIX_EXTENSIONS WiXUtilExtension)
set(CPACK_INSTALL_CMAKE_PROJECTS set(CPACK_INSTALL_CMAKE_PROJECTS
"${CMAKE_CURRENT_BINARY_DIR};${CMAKE_PROJECT_NAME};supercell-wx;/") "${CMAKE_CURRENT_BINARY_DIR};${CMAKE_PROJECT_NAME};supercell-wx;/")

18
scwx-qt/wix.template.in
View file

@ -2,7 +2,9 @@
<?include "cpack_variables.wxi"?> <?include "cpack_variables.wxi"?>
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi" @CPACK_WIX_CUSTOM_XMLNS_EXPANDED@ <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
xmlns:util="http://schemas.microsoft.com/wix/UtilExtension"
@CPACK_WIX_CUSTOM_XMLNS_EXPANDED@
RequiredVersion="3.6.3303.0"> RequiredVersion="3.6.3303.0">
<Product Id="$(var.CPACK_WIX_PRODUCT_GUID)" <Product Id="$(var.CPACK_WIX_PRODUCT_GUID)"
@ -12,12 +14,7 @@
Manufacturer="$(var.CPACK_PACKAGE_VENDOR)" Manufacturer="$(var.CPACK_PACKAGE_VENDOR)"
UpgradeCode="$(var.CPACK_WIX_UPGRADE_GUID)"> UpgradeCode="$(var.CPACK_WIX_UPGRADE_GUID)">
<Package InstallerVersion="301" Compressed="yes" InstallScope="perMachine"/>
<?if $(var.CPACK_WIX_INSTALL_SCOPE) = "NONE" ?>
<Package InstallerVersion="301" Compressed="yes"/>
<?else?>
<Package InstallerVersion="301" Compressed="yes" InstallScope="$(var.CPACK_WIX_INSTALL_SCOPE)"/>
<?endif?>
<Media Id="1" Cabinet="media1.cab" EmbedCab="yes"/> <Media Id="1" Cabinet="media1.cab" EmbedCab="yes"/>
@ -47,6 +44,13 @@
<UIRef Id="$(var.CPACK_WIX_UI_REF)" /> <UIRef Id="$(var.CPACK_WIX_UI_REF)" />
<UIRef Id="WixUI_ErrorProgressText" /> <UIRef Id="WixUI_ErrorProgressText" />
<util:CloseApplication
Id="CloseSupercellWx"
Target="supercell-wx.exe"
RebootPrompt="no"
PromptToContinue="yes"
Description="Supercell Wx should be closed before continuing the install."/>
<?include "properties.wxi"?> <?include "properties.wxi"?>
<?include "product_fragment.wxi"?> <?include "product_fragment.wxi"?>
</Product> </Product>