diff options
| author | Kevin Wasserman <kevin.wasserman@painless-security.com> | 2012-07-26 14:50:40 -0400 |
|---|---|---|
| committer | Ben Kaduk <kaduk@mit.edu> | 2012-08-29 14:50:19 -0400 |
| commit | cd6fce8e66300ab0e62e5a0d3a3f3cf13cbe750f (patch) | |
| tree | 8de5c7582eb6af9bac3858e4b8c0953f2d0dabcc /src | |
| parent | 4382b4a0d536cbefa672cd470b3cc57953028960 (diff) | |
| download | krb5-cd6fce8e66300ab0e62e5a0d3a3f3cf13cbe750f.tar.gz krb5-cd6fce8e66300ab0e62e5a0d3a3f3cf13cbe750f.tar.xz krb5-cd6fce8e66300ab0e62e5a0d3a3f3cf13cbe750f.zip | |
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>
ticket: 7320 (new)
queue: kfw
target_version: 1.10.4
tags: pullup
Diffstat (limited to 'src')
| -rw-r--r-- | src/windows/installer/wix/files.wxi | 30 | ||||
| -rw-r--r-- | src/windows/installer/wix/runtime.wxi | 15 |
2 files changed, 30 insertions, 15 deletions
diff --git a/src/windows/installer/wix/files.wxi b/src/windows/installer/wix/files.wxi index db1fa40efe..ff231be50c 100644 --- 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 a5f2163b05..23a47a244e 100644 --- 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 |