From: Asanka Herath <asanka@secure-endpoints.com>
Date: Thu, 21 May 2009 19:08:34 +0000 (+0000)
Subject: DEVEL15-windows-install-wix-vs2008-20090521
X-Git-Tag: openafs-devel-1_5_60~27
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=25a4a0f4ca9bef0b6debbd60d40afbd02c6b6cd9;p=packages%2Fo%2Fopenafs.git

DEVEL15-windows-install-wix-vs2008-20090521

LICENSE MIT

add merge modules for VS2008 RunTime Libraries


(cherry picked from commit 556597af26150041e3b44ec2769ec6c962ab06db)
---

diff --git a/src/WINNT/install/wix/files.wxi b/src/WINNT/install/wix/files.wxi
index 096b6a501..f3590f2d6 100644
--- a/src/WINNT/install/wix/files.wxi
+++ b/src/WINNT/install/wix/files.wxi
@@ -141,8 +141,12 @@
 
                 <!-- Runtime libraries -->
           <?ifndef Debug?>
-			<!-- Note that for AFSVER_CL=1400, the runtime libraries are included via merge modules
-			     at the TARGETDIR level, since we use shared assemblies instead of private assemblies. -->
+
+			<!-- Note that for AFSVER_CL=1400 and 1500, the runtime
+			     libraries are included via merge modules at the
+			     TARGETDIR level, since we use shared assemblies
+			     instead of private assemblies. -->
+
             <?if $(env.AFSVER_CL) = "1310"?>
 				<?ifdef comment?>
 					While we would love to just use the merge modules, they are unfortunately
@@ -1774,5 +1778,48 @@
 				<Merge Id="MSVCRT8PFL" DiskId="1" Language="0" src="$(var.CPF)\Merge Modules\policy_8_0_Microsoft_VC80_MFCLOC_x86.msm"/>
 			<?endif?>
 		<?endif?>
+
+    <?elseif $(env.AFSVER_CL) = "1500"?>
+
+		<?ifdef env.CommonProgramFiles6432?>
+		  <?define CPF="$(env.CommonProgramFiles(x86)"?>
+		<?else?>
+		  <?define CPF="$(env.CommonProgramFiles)"?>
+		<?endif?>
+
+		<?if $(var.Platform) = "x64" ?>
+			<?ifndef Debug?>
+				<Merge Id="MSVCRT9MEM" DiskId="1" Language="0" src="$(var.CPF)\Merge Modules\Microsoft_VC90_CRT_x86_x64.msm"/>
+				<Merge Id="MSVCRT9POL" DiskId="1" Language="0" src="$(var.CPF)\Merge Modules\policy_9_0_Microsoft_VC90_CRT_x86_x64.msm"/>
+				<Merge Id="MSVCRT9MFC" DiskId="1" Language="0" src="$(var.CPF)\Merge Modules\Microsoft_VC90_MFC_x86_x64.msm"/>
+				<Merge Id="MSVCRT9PFC" DiskId="1" Language="0" src="$(var.CPF)\Merge Modules\policy_9_0_Microsoft_VC90_MFC_x86_x64.msm"/>
+				<Merge Id="MSVCRT9MFL" DiskId="1" Language="0" src="$(var.CPF)\Merge Modules\Microsoft_VC90_MFCLOC_x86_x64.msm"/>
+				<Merge Id="MSVCRT9PFL" DiskId="1" Language="0" src="$(var.CPF)\Merge Modules\policy_9_0_Microsoft_VC90_MFCLOC_x86_x64.msm"/>
+			<?else?>
+				<Merge Id="MSVCRT9MEM" DiskId="1" Language="0" src="$(var.CPF)\Merge Modules\Microsoft_VC90_DebugCRT_x86_x64.msm"/>
+				<Merge Id="MSVCRT9POL" DiskId="1" Language="0" src="$(var.CPF)\Merge Modules\policy_9_0_Microsoft_VC90_DebugCRT_x86_x64.msm"/>
+				<Merge Id="MSVCRT9MFC" DiskId="1" Language="0" src="$(var.CPF)\Merge Modules\Microsoft_VC90_DebugMFC_x86_x64.msm"/>
+				<Merge Id="MSVCRT9PFC" DiskId="1" Language="0" src="$(var.CPF)\Merge Modules\policy_9_0_Microsoft_VC90_DebugMFC_x86_x64.msm"/>
+				<Merge Id="MSVCRT9MFL" DiskId="1" Language="0" src="$(var.CPF)\Merge Modules\Microsoft_VC90_MFCLOC_x86_x64.msm"/>
+				<Merge Id="MSVCRT9PFL" DiskId="1" Language="0" src="$(var.CPF)\Merge Modules\policy_9_0_Microsoft_VC90_MFCLOC_x86_x64.msm"/>
+			<?endif?>
+		<?else?>
+			<?ifndef Debug?>
+				<Merge Id="MSVCRT9MEM" DiskId="1" Language="0" src="$(var.CPF)\Merge Modules\Microsoft_VC90_CRT_x86.msm"/>
+				<Merge Id="MSVCRT9POL" DiskId="1" Language="0" src="$(var.CPF)\Merge Modules\policy_9_0_Microsoft_VC90_CRT_x86.msm"/>
+				<Merge Id="MSVCRT9MFC" DiskId="1" Language="0" src="$(var.CPF)\Merge Modules\Microsoft_VC90_MFC_x86.msm"/>
+				<Merge Id="MSVCRT9PFC" DiskId="1" Language="0" src="$(var.CPF)\Merge Modules\policy_9_0_Microsoft_VC90_MFC_x86.msm"/>
+				<Merge Id="MSVCRT9MFL" DiskId="1" Language="0" src="$(var.CPF)\Merge Modules\Microsoft_VC90_MFCLOC_x86.msm"/>
+				<Merge Id="MSVCRT9PFL" DiskId="1" Language="0" src="$(var.CPF)\Merge Modules\policy_9_0_Microsoft_VC90_MFCLOC_x86.msm"/>
+			<?else?>
+				<Merge Id="MSVCRT9MEM" DiskId="1" Language="0" src="$(var.CPF)\Merge Modules\Microsoft_VC90_DebugCRT_x86.msm"/>
+				<Merge Id="MSVCRT9POL" DiskId="1" Language="0" src="$(var.CPF)\Merge Modules\policy_9_0_Microsoft_VC90_DebugCRT_x86.msm"/>
+				<Merge Id="MSVCRT9MFC" DiskId="1" Language="0" src="$(var.CPF)\Merge Modules\Microsoft_VC90_DebugMFC_x86.msm"/>
+				<Merge Id="MSVCRT9PFC" DiskId="1" Language="0" src="$(var.CPF)\Merge Modules\policy_9_0_Microsoft_VC90_DebugMFC_x86.msm"/>
+				<Merge Id="MSVCRT9MFL" DiskId="1" Language="0" src="$(var.CPF)\Merge Modules\Microsoft_VC90_MFCLOC_x86.msm"/>
+				<Merge Id="MSVCRT9PFL" DiskId="1" Language="0" src="$(var.CPF)\Merge Modules\policy_9_0_Microsoft_VC90_MFCLOC_x86.msm"/>
+			<?endif?>
+		<?endif?>
+
 	<?endif?>
 </Include>
diff --git a/src/WINNT/install/wix/runtime.wxi b/src/WINNT/install/wix/runtime.wxi
index a4068c92a..278aa20cb 100644
--- a/src/WINNT/install/wix/runtime.wxi
+++ b/src/WINNT/install/wix/runtime.wxi
@@ -7,6 +7,13 @@
 		<MergeRef Id="MSVCRT8PFC"/>
 		<MergeRef Id="MSVCRT8MFL"/>
 		<MergeRef Id="MSVCRT8PFL"/>
+    <?elseif $(env.AFSVER_CL) = "1500" ?>
+		<MergeRef Id="MSVCRT9MEM"/>
+		<MergeRef Id="MSVCRT9POL"/>
+		<MergeRef Id="MSVCRT9MFC"/>
+		<MergeRef Id="MSVCRT9PFC"/>
+		<MergeRef Id="MSVCRT9MFL"/>
+		<MergeRef Id="MSVCRT9PFL"/>
     <?endif?>
 <?ifndef Debug?>
     <?if $(env.AFSVER_CL) = "1310" ?>