WiX support for building with VS 2012

The merge modules need to reference VC110 paths.
Use a variable for VC100 versus VC110 so that we don't copy a lot
of boilerplate around.

ticket: 7666 (new)
queue: kfw
tags: pullup
target_version: 1.11.4

diff --git a/src/windows/installer/wix/config.wxi b/src/windows/installer/wix/config.wxi
index afafd3563695991e1ce1d7323e1d1a9ff8afe816..8922d7a1b0c2592c2b6216dd4c39c1c97f4c8ca0 100644 (file)
--- a/src/windows/installer/wix/config.wxi
+++ b/src/windows/installer/wix/config.wxi
@@ -50,6 +50,13 @@
     <?else?>
         <?error Unknown build type?>
     <?endif?>
+    <?ifndef env.VISUALSTUDIOVERSION?>
+        <?define VCVer="100"?>
+    <?elseif $(env.VISUALSTUDIOVERSION) = "11.0"?>
+        <?define VCVer="110"?>
+    <?else?>
+        <?error Unknown MFC version?>
+    <?endif?>
     
     <?define KfwRegRoot="SOFTWARE\MIT\Kerberos"?>
     <?define KfwRegWow6432Root="SOFTWARE\Wow6432Node\MIT\Kerberos"?>

diff --git a/src/windows/installer/wix/files.wxi b/src/windows/installer/wix/files.wxi
index cf07d176cb8297e192886885b0e3e1221573fd18..02cb830150600b50bba3fab536e27c0d962766ef 100644 (file)
--- a/src/windows/installer/wix/files.wxi
+++ b/src/windows/installer/wix/files.wxi
@@ -591,29 +591,29 @@
       <?endif?>
       <?if $(var.Platform) = "x64" ?>
         <?ifndef Debug?>
-          <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"/>
+          <Merge Id="MSVCRT$(var.VCVer)MEM64" DiskId="1" Language="0" src="$(var.CPF)\Merge Modules\Microsoft_VC$(var.VCVer)_CRT_x64.msm"/>
+          <Merge Id="MSVCRT$(var.VCVer)MFC64" DiskId="1" Language="0" src="$(var.CPF)\Merge Modules\Microsoft_VC$(var.VCVer)_MFC_x64.msm"/>
+          <Merge Id="MSVCRT$(var.VCVer)MFL64" DiskId="1" Language="0" src="$(var.CPF)\Merge Modules\Microsoft_VC$(var.VCVer)_MFCLOC_x64.msm"/>
+          <Merge Id="MSVCRT$(var.VCVer)MEM86" DiskId="1" Language="0" src="$(var.CPF)\Merge Modules\Microsoft_VC$(var.VCVer)_CRT_x86.msm"/>
+          <Merge Id="MSVCRT$(var.VCVer)MFC86" DiskId="1" Language="0" src="$(var.CPF)\Merge Modules\Microsoft_VC$(var.VCVer)_MFC_x86.msm"/>
+          <Merge Id="MSVCRT$(var.VCVer)MFL86" DiskId="1" Language="0" src="$(var.CPF)\Merge Modules\Microsoft_VC$(var.VCVer)_MFCLOC_x86.msm"/>
         <?else?>
-          <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"/>
+          <Merge Id="MSVCRT$(var.VCVer)MEM64" DiskId="1" Language="0" src="$(var.CPF)\Merge Modules\Microsoft_VC$(var.VCVer)_DebugCRT_x64.msm"/>
+          <Merge Id="MSVCRT$(var.VCVer)MFC64" DiskId="1" Language="0" src="$(var.CPF)\Merge Modules\Microsoft_VC$(var.VCVer)_DebugMFC_x64.msm"/>
+          <Merge Id="MSVCRT$(var.VCVer)MFL64" DiskId="1" Language="0" src="$(var.CPF)\Merge Modules\Microsoft_VC$(var.VCVer)_MFCLOC_x64.msm"/>
+          <Merge Id="MSVCRT$(var.VCVer)MEM86" DiskId="1" Language="0" src="$(var.CPF)\Merge Modules\Microsoft_VC$(var.VCVer)_DebugCRT_x86.msm"/>
+          <Merge Id="MSVCRT$(var.VCVer)MFC86" DiskId="1" Language="0" src="$(var.CPF)\Merge Modules\Microsoft_VC$(var.VCVer)_DebugMFC_x86.msm"/>
+          <Merge Id="MSVCRT$(var.VCVer)MFL86" DiskId="1" Language="0" src="$(var.CPF)\Merge Modules\Microsoft_VC$(var.VCVer)_MFCLOC_x86.msm"/>
         <?endif?>
       <?else?>
         <?ifndef Debug?>
-          <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"/>
+          <Merge Id="MSVCRT$(var.VCVer)MEM86" DiskId="1" Language="0" src="$(var.CPF)\Merge Modules\Microsoft_VC$(var.VCVer)_CRT_x86.msm"/>
+          <Merge Id="MSVCRT$(var.VCVer)MFC86" DiskId="1" Language="0" src="$(var.CPF)\Merge Modules\Microsoft_VC$(var.VCVer)_MFC_x86.msm"/>
+          <Merge Id="MSVCRT$(var.VCVer)MFL86" DiskId="1" Language="0" src="$(var.CPF)\Merge Modules\Microsoft_VC$(var.VCVer)_MFCLOC_x86.msm"/>
         <?else?>
-          <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"/>
+          <Merge Id="MSVCRT$(var.VCVer)MEM86" DiskId="1" Language="0" src="$(var.CPF)\Merge Modules\Microsoft_VC$(var.VCVer)_DebugCRT_x86.msm"/>
+          <Merge Id="MSVCRT$(var.VCVer)MFC86" DiskId="1" Language="0" src="$(var.CPF)\Merge Modules\Microsoft_VC$(var.VCVer)_DebugMFC_x86.msm"/>
+          <Merge Id="MSVCRT$(var.VCVer)MFL86" DiskId="1" Language="0" src="$(var.CPF)\Merge Modules\Microsoft_VC$(var.VCVer)_MFCLOC_x86.msm"/>
         <?endif?>
       <?endif?>
     <?endif?>

diff --git a/src/windows/installer/wix/runtime.wxi b/src/windows/installer/wix/runtime.wxi
index 23a47a244ec57375776874e30ae07a61a6495c04..ff86e3f54aec179cf28ad7fbfc1908ef3019a168 100644 (file)
--- a/src/windows/installer/wix/runtime.wxi
+++ b/src/windows/installer/wix/runtime.wxi
@@ -2,16 +2,16 @@
 <Include>
     <?ifdef CL1600 ?>
       <?if $(var.Platform) = "x64" ?>
-        <MergeRef Id="MSVCRT100MEM64"/>
-        <MergeRef Id="MSVCRT100MFC64"/>
-        <MergeRef Id="MSVCRT100MFL64"/>
-        <MergeRef Id="MSVCRT100MEM86"/>
-        <MergeRef Id="MSVCRT100MFC86"/>
-        <MergeRef Id="MSVCRT100MFL86"/>
+        <MergeRef Id="MSVCRT$(var.VCVer)MEM64"/>
+        <MergeRef Id="MSVCRT$(var.VCVer)MFC64"/>
+        <MergeRef Id="MSVCRT$(var.VCVer)MFL64"/>
+        <MergeRef Id="MSVCRT$(var.VCVer)MEM86"/>
+        <MergeRef Id="MSVCRT$(var.VCVer)MFC86"/>
+        <MergeRef Id="MSVCRT$(var.VCVer)MFL86"/>
       <?else?>
-        <MergeRef Id="MSVCRT100MEM86"/>
-        <MergeRef Id="MSVCRT100MFC86"/>
-        <MergeRef Id="MSVCRT100MFL86"/>
+        <MergeRef Id="MSVCRT$(var.VCVer)MEM86"/>
+        <MergeRef Id="MSVCRT$(var.VCVer)MFC86"/>
+        <MergeRef Id="MSVCRT$(var.VCVer)MFL86"/>
       <?endif?>
     <?endif?>
-</Include>
\ No newline at end of file
+</Include>