github_mirrors/ModSecurity
3
0
Fork 1
mirror of https://github.com/owasp-modsecurity/ModSecurity.git synced 2025-09-29 11:16:33 +03:00
Code Issues Packages Projects Releases Wiki Activity

iis: Adding VC110 files to the Windows installer

Browse Source 
For some reason the DLLs still demands the dependencies of the
VC110 files. Providing those as part of the MSI installer
This commit is contained in:
Felipe "Zimmerle" Costa
2014-02-25 11:46:51 -03:00
committed by Felipe Zimmerle
parent 28d4f9fce1
commit d6dd1f0e94
3 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
iis/installer.wxs
View File

@@ -441,10 +441,13 @@
</Feature>
<Feature Id="VCRedist" Title="Visual C++ 12.0 Runtime" AllowAdvertise="no" Display="hidden" Level="1">
<?if $(var.Win64) = "yes" ?>
<MergeRef Id="VCRedist64" />
<MergeRef Id="VCRedist32" />
<MergeRef Id="VCRedist110_64" />
<MergeRef Id="VCRedist120_64" />
<MergeRef Id="VCRedist110_32" />
<MergeRef Id="VCRedist120_32" />
<?else ?>
<MergeRef Id="VCRedist32" />
<MergeRef Id="VCRedist110_32" />
<MergeRef Id="VCRedist120_32" />
<?endif ?>
</Feature>
<?if $(var.Win64) = "yes" ?>
@@ -641,10 +644,13 @@
<?endif ?>
<DirectoryRef Id="TARGETDIR">
<?if $(var.Win64) = "yes" ?>
<Merge Id="VCRedist64" SourceFile="wix\Microsoft_VC120_CRT_x64.msm" DiskId="1" Language="0" />
<Merge Id="VCRedist32" SourceFile="wix\Microsoft_VC120_CRT_x86.msm" DiskId="1" Language="0" />
<Merge Id="VCRedist120_64" SourceFile="wix\Microsoft_VC120_CRT_x64.msm" DiskId="1" Language="0" />
<Merge Id="VCRedist110_64" SourceFile="wix\Microsoft_VC110_CRT_x64.msm" DiskId="1" Language="0" />
<Merge Id="VCRedist120_32" SourceFile="wix\Microsoft_VC120_CRT_x86.msm" DiskId="1" Language="0" />
<Merge Id="VCRedist110_32" SourceFile="wix\Microsoft_VC110_CRT_x86.msm" DiskId="1" Language="0" />
<?else ?>
<Merge Id="VCRedist32" SourceFile="wix\Microsoft_VC120_CRT_x86.msm" DiskId="1" Language="0" />
<Merge Id="VCRedist120_32" SourceFile="wix\Microsoft_VC120_CRT_x86.msm" DiskId="1" Language="0" />
<Merge Id="VCRedist110_32" SourceFile="wix\Microsoft_VC110_CRT_x86.msm" DiskId="1" Language="0" />
<?endif ?>
</DirectoryRef>
</Product>