Add both x86 and x64 msm's to x64 installer

Since we have x86 dlls, we need the x86 msm's.

Signed-off-by: Kevin Wasserman <kevin.wasserman@painless-security.com>
(cherry picked from commit cd6fce8e66300ab0e62e5a0d3a3f3cf13cbe750f)

ticket: 7320
sattus: resolved

diff --git a/src/windows/installer/wix/files.wxi b/src/windows/installer/wix/files.wxi
index db1fa40efe07f0f8165d455458f1a7e99ce74265..ff231be50c8f884f788e8e87b60436f18939d321 100644 (file)
--- a/src/windows/installer/wix/files.wxi
+++ b/src/windows/installer/wix/files.wxi
@@ -584,23 +584,29 @@
       <?endif?>
       <?if $(var.Platform) = "x64" ?>
         <?ifndef Debug?>
-          <Merge Id="MSVCRT100MEM" DiskId="1" Language="0" src="$(var.CPF)\Merge Modules\Microsoft_VC100_CRT_x64.msm"/>
-          <Merge Id="MSVCRT100MFC" DiskId="1" Language="0" src="$(var.CPF)\Merge Modules\Microsoft_VC100_MFC_x64.msm"/>
-          <Merge Id="MSVCRT100MFL" DiskId="1" Language="0" src="$(var.CPF)\Merge Modules\Microsoft_VC100_MFCLOC_x64.msm"/>
+          <Merge Id="MSVCRT100MEM64" DiskId="1" Language="0" src="$(var.CPF)\Merge Modules\Microsoft_VC100_CRT_x64.msm"/>
+          <Merge Id="MSVCRT100MFC64" DiskId="1" Language="0" src="$(var.CPF)\Merge Modules\Microsoft_VC100_MFC_x64.msm"/>
+          <Merge Id="MSVCRT100MFL64" DiskId="1" Language="0" src="$(var.CPF)\Merge Modules\Microsoft_VC100_MFCLOC_x64.msm"/>
+          <Merge Id="MSVCRT100MEM86" DiskId="1" Language="0" src="$(var.CPF)\Merge Modules\Microsoft_VC100_CRT_x86.msm"/>
+          <Merge Id="MSVCRT100MFC86" DiskId="1" Language="0" src="$(var.CPF)\Merge Modules\Microsoft_VC100_MFC_x86.msm"/>
+          <Merge Id="MSVCRT100MFL86" DiskId="1" Language="0" src="$(var.CPF)\Merge Modules\Microsoft_VC100_MFCLOC_x86.msm"/>
         <?else?>
-          <Merge Id="MSVCRT100MEM" DiskId="1" Language="0" src="$(var.CPF)\Merge Modules\Microsoft_VC100_DebugCRT_x64.msm"/>
-          <Merge Id="MSVCRT100MFC" DiskId="1" Language="0" src="$(var.CPF)\Merge Modules\Microsoft_VC100_DebugMFC_x64.msm"/>
-          <Merge Id="MSVCRT100MFL" DiskId="1" Language="0" src="$(var.CPF)\Merge Modules\Microsoft_VC100_MFCLOC_x64.msm"/>
+          <Merge Id="MSVCRT100MEM64" DiskId="1" Language="0" src="$(var.CPF)\Merge Modules\Microsoft_VC100_DebugCRT_x64.msm"/>
+          <Merge Id="MSVCRT100MFC64" DiskId="1" Language="0" src="$(var.CPF)\Merge Modules\Microsoft_VC100_DebugMFC_x64.msm"/>
+          <Merge Id="MSVCRT100MFL64" DiskId="1" Language="0" src="$(var.CPF)\Merge Modules\Microsoft_VC100_MFCLOC_x64.msm"/>
+          <Merge Id="MSVCRT100MEM86" DiskId="1" Language="0" src="$(var.CPF)\Merge Modules\Microsoft_VC100_DebugCRT_x86.msm"/>
+          <Merge Id="MSVCRT100MFC86" DiskId="1" Language="0" src="$(var.CPF)\Merge Modules\Microsoft_VC100_DebugMFC_x86.msm"/>
+          <Merge Id="MSVCRT100MFL86" DiskId="1" Language="0" src="$(var.CPF)\Merge Modules\Microsoft_VC100_MFCLOC_x86.msm"/>
         <?endif?>
       <?else?>
         <?ifndef Debug?>
-          <Merge Id="MSVCRT100MEM" DiskId="1" Language="0" src="$(var.CPF)\Merge Modules\Microsoft_VC100_CRT_x86.msm"/>
-          <Merge Id="MSVCRT100MFC" DiskId="1" Language="0" src="$(var.CPF)\Merge Modules\Microsoft_VC100_MFC_x86.msm"/>
-          <Merge Id="MSVCRT100MFL" DiskId="1" Language="0" src="$(var.CPF)\Merge Modules\Microsoft_VC100_MFCLOC_x86.msm"/>
+          <Merge Id="MSVCRT100MEM86" DiskId="1" Language="0" src="$(var.CPF)\Merge Modules\Microsoft_VC100_CRT_x86.msm"/>
+          <Merge Id="MSVCRT100MFC86" DiskId="1" Language="0" src="$(var.CPF)\Merge Modules\Microsoft_VC100_MFC_x86.msm"/>
+          <Merge Id="MSVCRT100MFL86" DiskId="1" Language="0" src="$(var.CPF)\Merge Modules\Microsoft_VC100_MFCLOC_x86.msm"/>
         <?else?>
-          <Merge Id="MSVCRT100MEM" DiskId="1" Language="0" src="$(var.CPF)\Merge Modules\Microsoft_VC100_DebugCRT_x86.msm"/>
-          <Merge Id="MSVCRT100MFC" DiskId="1" Language="0" src="$(var.CPF)\Merge Modules\Microsoft_VC100_DebugMFC_x86.msm"/>
-          <Merge Id="MSVCRT100MFL" DiskId="1" Language="0" src="$(var.CPF)\Merge Modules\Microsoft_VC100_MFCLOC_x86.msm"/>
+          <Merge Id="MSVCRT100MEM86" DiskId="1" Language="0" src="$(var.CPF)\Merge Modules\Microsoft_VC100_DebugCRT_x86.msm"/>
+          <Merge Id="MSVCRT100MFC86" DiskId="1" Language="0" src="$(var.CPF)\Merge Modules\Microsoft_VC100_DebugMFC_x86.msm"/>
+          <Merge Id="MSVCRT100MFL86" DiskId="1" Language="0" src="$(var.CPF)\Merge Modules\Microsoft_VC100_MFCLOC_x86.msm"/>
         <?endif?>
       <?endif?>
     <?endif?>

diff --git a/src/windows/installer/wix/runtime.wxi b/src/windows/installer/wix/runtime.wxi
index a5f2163b058c16d5cabff2f007a5064e57d7fe2f..23a47a244ec57375776874e30ae07a61a6495c04 100644 (file)
--- a/src/windows/installer/wix/runtime.wxi
+++ b/src/windows/installer/wix/runtime.wxi
@@ -1,8 +1,17 @@
 <?xml version="1.0"?> 
 <Include>
     <?ifdef CL1600 ?>
-      <MergeRef Id="MSVCRT100MEM"/>
-      <MergeRef Id="MSVCRT100MFC"/>
-      <MergeRef Id="MSVCRT100MFL"/>
+      <?if $(var.Platform) = "x64" ?>
+        <MergeRef Id="MSVCRT100MEM64"/>
+        <MergeRef Id="MSVCRT100MFC64"/>
+        <MergeRef Id="MSVCRT100MFL64"/>
+        <MergeRef Id="MSVCRT100MEM86"/>
+        <MergeRef Id="MSVCRT100MFC86"/>
+        <MergeRef Id="MSVCRT100MFL86"/>
+      <?else?>
+        <MergeRef Id="MSVCRT100MEM86"/>
+        <MergeRef Id="MSVCRT100MFC86"/>
+        <MergeRef Id="MSVCRT100MFL86"/>
+      <?endif?>
     <?endif?>
 </Include>
\ No newline at end of file