tyler.durden/icinga2
1
0
Fork 0
mirror of https://github.com/Icinga/icinga2.git synced 2025-07-26 07:04:37 +02:00
Code Issues Packages Projects Releases Wiki Activity

Windows: Remove requirement for KB2999226 (VS2015)

Browse Source 
refs #11739
This commit is contained in:
Michael Friedrich 2016-07-06 17:11:21 +02:00
parent a0a5989181
commit 5c4a833116
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
icinga-installer/icinga2.wixpatch.cmake
View File

@ -10,9 +10,12 @@
<Binary Id="icinga2_installer" SourceFile="$<TARGET_FILE:icinga-installer>" /> <Binary Id="icinga2_installer" SourceFile="$<TARGET_FILE:icinga-installer>" />
<InstallExecuteSequence> <InstallExecuteSequence>
<!-- Removed for builds with VS2013, kept intact for VS2015 -->
<!--
<Custom Action='CheckForUCRT' Before='LaunchConditions'> <Custom Action='CheckForUCRT' Before='LaunchConditions'>
<![CDATA[Not REMOVE="ALL" AND Not PREVIOUSFOUND AND UCRTINSTALLED = ""]]> <![CDATA[Not REMOVE="ALL" AND Not PREVIOUSFOUND AND UCRTINSTALLED = ""]]>
</Custom> </Custom>
-->
<Custom Action="XtraUpgradeNSIS" After="InstallInitialize">$CM_CP_sbin.icinga2_installer.exe&gt;2</Custom> <Custom Action="XtraUpgradeNSIS" After="InstallInitialize">$CM_CP_sbin.icinga2_installer.exe&gt;2</Custom>
<Custom Action="XtraInstall" Before="InstallFinalize">$CM_CP_sbin.icinga2_installer.exe&gt;2</Custom> <Custom Action="XtraInstall" Before="InstallFinalize">$CM_CP_sbin.icinga2_installer.exe&gt;2</Custom>
<Custom Action="XtraUninstall" Before="RemoveExistingProducts">$CM_CP_sbin.icinga2_installer.exe=2</Custom> <Custom Action="XtraUninstall" Before="RemoveExistingProducts">$CM_CP_sbin.icinga2_installer.exe=2</Custom>
@ -33,6 +36,8 @@
Value="LaunchIcinga2Wizard">WIXUI_EXITDIALOGOPTIONALCHECKBOX = 1 and NOT Installed</Publish> Value="LaunchIcinga2Wizard">WIXUI_EXITDIALOGOPTIONALCHECKBOX = 1 and NOT Installed</Publish>
</UI> </UI>
<!-- Removed for builds with VS2013, kept intact for VS2015 -->
<!--
<Property Id="UCRTINSTALLED" Secure="yes"> <Property Id="UCRTINSTALLED" Secure="yes">
<DirectorySearch Id="searchSystem2" Path="[SystemFolder]" Depth="0"> <DirectorySearch Id="searchSystem2" Path="[SystemFolder]" Depth="0">
<FileSearch Id="UCRT_FileSearch" <FileSearch Id="UCRT_FileSearch"
@ -42,5 +47,6 @@
</Property> </Property>
<CustomAction Id="CheckForUCRT" Error="Installation cannot continue because the Microsoft Universal C Runtime is not installed. Please see https://support.microsoft.com/en-us/kb/2999226 for more details." /> <CustomAction Id="CheckForUCRT" Error="Installation cannot continue because the Microsoft Universal C Runtime is not installed. Please see https://support.microsoft.com/en-us/kb/2999226 for more details." />
-->
</CPackWiXFragment> </CPackWiXFragment>
</CPackWiXPatch> </CPackWiXPatch>