From: Tom Yu <tlyu@mit.edu>
Date: Mon, 12 Dec 2011 20:44:59 +0000 (+0000)
Subject: kfw installer: use MSVC 2010 merge modules
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=e34d9b3462c3415bd84ddfbe15b50a99cbc503c9;p=krb5.git

kfw installer: use MSVC 2010 merge modules

Signed-off-by: Kevin Wasserman <kevin.wasserman@painless-security.com>

ticket: 7050

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@25547 dc483132-0cff-0310-8789-dd5450dbe970
---

diff --git a/src/windows/installer/wix/config.wxi b/src/windows/installer/wix/config.wxi
index 813e1259f..3bb1cc95c 100644
--- a/src/windows/installer/wix/config.wxi
+++ b/src/windows/installer/wix/config.wxi
@@ -30,15 +30,9 @@
     <?include site-local.wxi?>
     
     <!-- Sanity checks -->
-    <!-- <?ifndef var.CL1200?>
-        <?ifndef var.CL1300?>
-            <?ifndef var.CL1310?>
-                <?ifndef var.CL1400?>
-                    <?error Must define one of CL1200, CL1300, CL1310 or CL1400?>
-                <?endif?>
-            <?endif?>
-        <?endif?>
-    <?endif?> -->
+    <?ifndef var.CL1600?>
+        <?error Must define CL1600 (MSVC10.0)?>
+    <?endif?>
 
     <!-- Build type specifications -->
     <?ifndef env.CPU?>
@@ -46,12 +40,11 @@
     <?endif?>
     <?define BinDir="$(env.KRB_INSTALL_DIR)\bin\"?>
     <?define LibDir="$(env.KRB_INSTALL_DIR)\lib\"?>
+    <?define InstallerVersion="300"?>
     <?if $(env.CPU) = "i386"?>
-        <?define InstallerVersion="110"?>
         <?define Platform="Intel"?>
         <?define Win64="no"?>
     <?elseif $(env.CPU) = "AMD64"?>
-        <?define InstallerVersion="200"?>
         <?define Platform="x64"?>
         <?define Win64="yes"?>
     <?else?>
diff --git a/src/windows/installer/wix/files.wxi b/src/windows/installer/wix/files.wxi
index b73a2fd77..200d24f15 100644
--- a/src/windows/installer/wix/files.wxi
+++ b/src/windows/installer/wix/files.wxi
@@ -786,47 +786,35 @@
         <Registry Id="reg_docs20" Root="HKLM" Key="$(var.KfwRegRoot)\Documentation\$(var.VersionString)" Name="PatchLevel" Type="integer" Value="$(var.VersionPatch)" />
     </Component>
 
-    <!-- Shared assembly runtime for VS 2005 -->
-    <?ifdef CL1400?>
-    	<?ifdef env.CommonProgramFiles6432?>
-    	  <?define CPF="$(env.CommonProgramFiles(x86)"?>
-    	<?else?>
-    	  <?define CPF="$(env.CommonProgramFiles)"?>
-    	<?endif?>
-
-    	<?if $(var.Platform) = "x64" ?>
-    		<?ifndef Debug?>
-    			<Merge Id="MSVCRT8MEM" DiskId="1" Language="0" src="$(var.CPF)\Merge Modules\Microsoft_VC80_CRT_x86_x64.msm"/>
-    			<Merge Id="MSVCRT8POL" DiskId="1" Language="0" src="$(var.CPF)\Merge Modules\policy_8_0_Microsoft_VC80_CRT_x86_x64.msm"/>
-    			<Merge Id="MSVCRT8MFC" DiskId="1" Language="0" src="$(var.CPF)\Merge Modules\Microsoft_VC80_MFC_x86_x64.msm"/>
-    			<Merge Id="MSVCRT8PFC" DiskId="1" Language="0" src="$(var.CPF)\Merge Modules\policy_8_0_Microsoft_VC80_MFC_x86_x64.msm"/>
-    			<Merge Id="MSVCRT8MFL" DiskId="1" Language="0" src="$(var.CPF)\Merge Modules\Microsoft_VC80_MFCLOC_x86_x64.msm"/>
-    			<Merge Id="MSVCRT8PFL" DiskId="1" Language="0" src="$(var.CPF)\Merge Modules\policy_8_0_Microsoft_VC80_MFCLOC_x86_x64.msm"/>
-    		<?else?>
-    			<Merge Id="MSVCRT8MEM" DiskId="1" Language="0" src="$(var.CPF)\Merge Modules\Microsoft_VC80_DebugCRT_x86_x64.msm"/>
-    			<Merge Id="MSVCRT8POL" DiskId="1" Language="0" src="$(var.CPF)\Merge Modules\policy_8_0_Microsoft_VC80_DebugCRT_x86_x64.msm"/>
-    			<Merge Id="MSVCRT8MFC" DiskId="1" Language="0" src="$(var.CPF)\Merge Modules\Microsoft_VC80_DebugMFC_x86_x64.msm"/>
-    			<Merge Id="MSVCRT8PFC" DiskId="1" Language="0" src="$(var.CPF)\Merge Modules\policy_8_0_Microsoft_VC80_DebugMFC_x86_x64.msm"/>
-    			<Merge Id="MSVCRT8MFL" DiskId="1" Language="0" src="$(var.CPF)\Merge Modules\Microsoft_VC80_MFCLOC_x86_x64.msm"/>
-    			<Merge Id="MSVCRT8PFL" DiskId="1" Language="0" src="$(var.CPF)\Merge Modules\policy_8_0_Microsoft_VC80_MFCLOC_x86_x64.msm"/>
-    		<?endif?>
-    	<?else?>
-    		<?ifndef Debug?>
-    			<Merge Id="MSVCRT8MEM" DiskId="1" Language="0" src="$(var.CPF)\Merge Modules\Microsoft_VC80_CRT_x86.msm"/>
-    			<Merge Id="MSVCRT8POL" DiskId="1" Language="0" src="$(var.CPF)\Merge Modules\policy_8_0_Microsoft_VC80_CRT_x86.msm"/>
-    			<Merge Id="MSVCRT8MFC" DiskId="1" Language="0" src="$(var.CPF)\Merge Modules\Microsoft_VC80_MFC_x86.msm"/>
-    			<Merge Id="MSVCRT8PFC" DiskId="1" Language="0" src="$(var.CPF)\Merge Modules\policy_8_0_Microsoft_VC80_MFC_x86.msm"/>
-    			<Merge Id="MSVCRT8MFL" DiskId="1" Language="0" src="$(var.CPF)\Merge Modules\Microsoft_VC80_MFCLOC_x86.msm"/>
-    			<Merge Id="MSVCRT8PFL" DiskId="1" Language="0" src="$(var.CPF)\Merge Modules\policy_8_0_Microsoft_VC80_MFCLOC_x86.msm"/>
-    		<?else?>
-    			<Merge Id="MSVCRT8MEM" DiskId="1" Language="0" src="$(var.CPF)\Merge Modules\Microsoft_VC80_DebugCRT_x86.msm"/>
-    			<Merge Id="MSVCRT8POL" DiskId="1" Language="0" src="$(var.CPF)\Merge Modules\policy_8_0_Microsoft_VC80_DebugCRT_x86.msm"/>
-    			<Merge Id="MSVCRT8MFC" DiskId="1" Language="0" src="$(var.CPF)\Merge Modules\Microsoft_VC80_DebugMFC_x86.msm"/>
-    			<Merge Id="MSVCRT8PFC" DiskId="1" Language="0" src="$(var.CPF)\Merge Modules\policy_8_0_Microsoft_VC80_DebugMFC_x86.msm"/>
-    			<Merge Id="MSVCRT8MFL" DiskId="1" Language="0" src="$(var.CPF)\Merge Modules\Microsoft_VC80_MFCLOC_x86.msm"/>
-    			<Merge Id="MSVCRT8PFL" DiskId="1" Language="0" src="$(var.CPF)\Merge Modules\policy_8_0_Microsoft_VC80_MFCLOC_x86.msm"/>
-    		<?endif?>
-    	<?endif?>
+    <!-- Shared assembly runtime for VS 2010 -->
+    <!-- Note that these cause numerous LGHT1055 and ICE82 warnings.  They are unavoidable but innocuous.  -->
+    <?ifdef CL1600?>
+      <?ifdef env.CommonProgramFiles6432?>
+        <?define CPF="$(env.CommonProgramFiles(x86)"?>
+      <?else?>
+        <?define CPF="$(env.CommonProgramFiles)"?>
+      <?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"/>
+        <?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"/>
+        <?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"/>
+        <?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"/>
+        <?endif?>
+      <?endif?>
     <?endif?>
 
 </Directory>
diff --git a/src/windows/installer/wix/runtime.wxi b/src/windows/installer/wix/runtime.wxi
index 7b09fea2c..a5f2163b0 100644
--- a/src/windows/installer/wix/runtime.wxi
+++ b/src/windows/installer/wix/runtime.wxi
@@ -1,90 +1,8 @@
 <?xml version="1.0"?> 
 <Include>
-    <?ifdef CL1400 ?>
-		<MergeRef Id="MSVCRT8MEM"/>
-		<MergeRef Id="MSVCRT8POL"/>
-		<MergeRef Id="MSVCRT8MFC"/>
-		<MergeRef Id="MSVCRT8PFC"/>
-		<MergeRef Id="MSVCRT8MFL"/>
-		<MergeRef Id="MSVCRT8PFL"/>
+    <?ifdef CL1600 ?>
+      <MergeRef Id="MSVCRT100MEM"/>
+      <MergeRef Id="MSVCRT100MFC"/>
+      <MergeRef Id="MSVCRT100MFL"/>
     <?endif?>
-<?ifndef Debug?>
-    <?ifdef CL1310 ?>
-        <?ifdef comment?>
-        <MergeRef Id="mergeVC1310LibMFC" />
-        <MergeRef Id="mergeVC1310LibCRT" />
-        <?else?>
-            <ComponentRef Id="cmf_mfc71_dll" />
-            <ComponentRef Id="cmf_msvcr71_dll" />
-            <ComponentRef Id="cmf_msvcp71_dll" />
-            <ComponentRef Id="cmf_mfc71chs_dll" />
-            <ComponentRef Id="cmf_mfc71cht_dll" />
-            <ComponentRef Id="cmf_mfc71deu_dll" />
-            <ComponentRef Id="cmf_mfc71enu_dll" />
-            <ComponentRef Id="cmf_mfc71esp_dll" />
-            <ComponentRef Id="cmf_mfc71fra_dll" />
-            <ComponentRef Id="cmf_mfc71ita_dll" />
-            <ComponentRef Id="cmf_mfc71jpn_dll" />
-            <ComponentRef Id="cmf_mfc71kor_dll" />
-        <?endif?>
-    <?endif?>
-    <?ifdef CL1300 ?>
-        <?ifdef comment?>
-        <MergeRef Id="mergeVC1300LibMFC" />
-        <MergeRef Id="mergeVC1300LibCRT" />
-        <?else?>
-            <ComponentRef Id="cmf_mfc70_dll" />
-            <ComponentRef Id="cmf_msvcr70_dll" />
-            <ComponentRef Id="cmf_msvcp70_dll" />
-            <ComponentRef Id="cmf_mfc70chs_dll" />
-            <ComponentRef Id="cmf_mfc70cht_dll" />
-            <ComponentRef Id="cmf_mfc70deu_dll" />
-            <ComponentRef Id="cmf_mfc70enu_dll" />
-            <ComponentRef Id="cmf_mfc70esp_dll" />
-            <ComponentRef Id="cmf_mfc70fra_dll" />
-            <ComponentRef Id="cmf_mfc70ita_dll" />
-            <ComponentRef Id="cmf_mfc70jpn_dll" />
-            <ComponentRef Id="cmf_mfc70kor_dll" />
-        <?endif?>
-    <?endif?>
-    <?ifdef CL1200 ?>
-        <ComponentRef Id="cmf_mfc42_dll" />
-        <ComponentRef Id="cmf_msvcp60_dll" />
-        <ComponentRef Id="cmf_msvcrt_dll" />
-    <?endif?>
-<?else?>
-    <?ifdef CL1310 ?>
-        <ComponentRef Id="cmf_mfc71d_dll" />
-        <ComponentRef Id="cmf_msvcr71d_dll" />
-        <ComponentRef Id="cmf_msvcp71d_dll" />
-        <ComponentRef Id="cmf_mfc71chs_dll" />
-        <ComponentRef Id="cmf_mfc71cht_dll" />
-        <ComponentRef Id="cmf_mfc71deu_dll" />
-        <ComponentRef Id="cmf_mfc71enu_dll" />
-        <ComponentRef Id="cmf_mfc71esp_dll" />
-        <ComponentRef Id="cmf_mfc71fra_dll" />
-        <ComponentRef Id="cmf_mfc71ita_dll" />
-        <ComponentRef Id="cmf_mfc71jpn_dll" />
-        <ComponentRef Id="cmf_mfc71kor_dll" />
-    <?endif?>
-    <?ifdef CL1300 ?>
-        <ComponentRef Id="cmf_mfc70d_dll" />
-        <ComponentRef Id="cmf_msvcr70d_dll" />
-        <ComponentRef Id="cmf_msvcp70d_dll" />
-        <ComponentRef Id="cmf_mfc70chs_dll" />
-        <ComponentRef Id="cmf_mfc70cht_dll" />
-        <ComponentRef Id="cmf_mfc70deu_dll" />
-        <ComponentRef Id="cmf_mfc70enu_dll" />
-        <ComponentRef Id="cmf_mfc70esp_dll" />
-        <ComponentRef Id="cmf_mfc70fra_dll" />
-        <ComponentRef Id="cmf_mfc70ita_dll" />
-        <ComponentRef Id="cmf_mfc70jpn_dll" />
-        <ComponentRef Id="cmf_mfc70kor_dll" />
-    <?endif?>
-    <?ifdef CL1200 ?>
-        <ComponentRef Id="cmf_mfc42d_dll" />
-        <ComponentRef Id="cmf_msvcp60d_dll" />
-        <ComponentRef Id="cmf_msvcrtd_dll" />
-    <?endif?>
-<?endif?>
 </Include>
\ No newline at end of file