diff options
author | Jeffrey Altman <jaltman@secure-endpoints.com> | 2007-09-05 18:03:13 +0000 |
---|---|---|
committer | Jeffrey Altman <jaltman@secure-endpoints.com> | 2007-09-05 18:03:13 +0000 |
commit | 1e23b1998c87ff0d2c3ea27a2e112532a13d2b6c (patch) | |
tree | 47e9aae451053bdc8d2662095bae31e626c6d897 /src/windows/installer/wix/runtime.wxi | |
parent | 9c243238c6ca6228fde72fa1661d0393a1e08c81 (diff) | |
download | krb5-1e23b1998c87ff0d2c3ea27a2e112532a13d2b6c.tar.gz krb5-1e23b1998c87ff0d2c3ea27a2e112532a13d2b6c.tar.xz krb5-1e23b1998c87ff0d2c3ea27a2e112532a13d2b6c.zip |
MSI installer for 64-bit AMD64
Add support for building 64-bit AMD64 MSI install packages
in addition to 32-bit i386 MSI install packages.
Differences between 32-bit MSI and 64-bit MSI include:
* no krb4 binaries and libraries
* no kclient binaries and libraries
* no krb524 binaries and libraries
* no leash32.exe
* new AMD64 UpgradeCode permits parallel installation with 32-bit MSI
* support for Visual Studio 2005 (VS8, CL1400) merge modules
Open Issues:
* 32-bit MSI installs kfwlogon.dll on AMD64 systems
* 32-bit and 64-bit NetIDMgr.exe as startup. Need to decide
which should be executed by default. Only one can run at
a time.
* Need to make sure that src/windows/build properly configures
the site-local.wxi file for Visual Studio 2005 and platform.
ticket: new
component: windows
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@19922 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/windows/installer/wix/runtime.wxi')
-rw-r--r-- | src/windows/installer/wix/runtime.wxi | 90 |
1 files changed, 90 insertions, 0 deletions
diff --git a/src/windows/installer/wix/runtime.wxi b/src/windows/installer/wix/runtime.wxi new file mode 100644 index 0000000000..13d491b854 --- /dev/null +++ b/src/windows/installer/wix/runtime.wxi @@ -0,0 +1,90 @@ +<?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"/>
+ <?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 |