[26207] in CVS-changelog-for-Kerberos-V5
svn rev #25547: trunk/src/windows/installer/wix/
daemon@ATHENA.MIT.EDU (tlyu@mit.edu)
Mon Dec 12 15:45:01 2011
Date: Mon, 12 Dec 2011 15:44:59 -0500
From: tlyu@mit.edu
Message-Id: <201112122044.pBCKixxN004877@drugstore.mit.edu>
To: cvs-krb5@mit.edu
Reply-To: krbdev@mit.edu
Content-Type: multipart/mixed; boundary="===============1205742895=="
Errors-To: cvs-krb5-bounces@mit.edu
--===============1205742895==
http://src.mit.edu/fisheye/changelog/krb5/?cs=25547
Commit By: tlyu
Log Message:
ticket: 7050
subject: kfw installer: use MSVC 2010 merge modules
Signed-off-by: Kevin Wasserman <kevin.wasserman@painless-security.com>
Changed Files:
U trunk/src/windows/installer/wix/config.wxi
U trunk/src/windows/installer/wix/files.wxi
U trunk/src/windows/installer/wix/runtime.wxi
Modified: trunk/src/windows/installer/wix/config.wxi
===================================================================
--- trunk/src/windows/installer/wix/config.wxi 2011-12-12 20:44:56 UTC (rev 25546)
+++ trunk/src/windows/installer/wix/config.wxi 2011-12-12 20:44:59 UTC (rev 25547)
@@ -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?>
Modified: trunk/src/windows/installer/wix/files.wxi
===================================================================
--- trunk/src/windows/installer/wix/files.wxi 2011-12-12 20:44:56 UTC (rev 25546)
+++ trunk/src/windows/installer/wix/files.wxi 2011-12-12 20:44:59 UTC (rev 25547)
@@ -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>
Modified: trunk/src/windows/installer/wix/runtime.wxi
===================================================================
--- trunk/src/windows/installer/wix/runtime.wxi 2011-12-12 20:44:56 UTC (rev 25546)
+++ trunk/src/windows/installer/wix/runtime.wxi 2011-12-12 20:44:59 UTC (rev 25547)
@@ -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
--===============1205742895==
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Content-Disposition: inline
_______________________________________________
cvs-krb5 mailing list
cvs-krb5@mit.edu
https://mailman.mit.edu/mailman/listinfo/cvs-krb5
--===============1205742895==--
