krb5 commit: WiX support for building with VS 2012
Benjamin Kaduk
kaduk at MIT.EDU
Fri Jun 28 13:10:44 EDT 2013
https://github.com/krb5/krb5/commit/03b2650337de03e2cd54896c2e86b0f76e1491fe
commit 03b2650337de03e2cd54896c2e86b0f76e1491fe
Author: Ben Kaduk <kaduk at mit.edu>
Date: Wed Jun 26 15:11:37 2013 -0400
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
src/windows/installer/wix/config.wxi | 7 ++++++
src/windows/installer/wix/files.wxi | 36 ++++++++++++++++----------------
src/windows/installer/wix/runtime.wxi | 20 +++++++++---------
3 files changed, 35 insertions(+), 28 deletions(-)
diff --git a/src/windows/installer/wix/config.wxi b/src/windows/installer/wix/config.wxi
index afafd35..8922d7a 100644
--- 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 cf07d17..02cb830 100644
--- 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 23a47a2..ff86e3f 100644
--- 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>
More information about the cvs-krb5
mailing list