diff options
| author | Tom Yu <tlyu@mit.edu> | 2006-09-25 21:16:35 +0000 |
|---|---|---|
| committer | Tom Yu <tlyu@mit.edu> | 2006-09-25 21:16:35 +0000 |
| commit | e0dfdc7c4ec173ab4b0bd22c079ddabc6f1b4d23 (patch) | |
| tree | 53990ec6f616787849fad64d5383791a11143557 | |
| parent | b54d34d5f4378ecab093ef54dd9315c0e8cf6628 (diff) | |
| download | krb5-e0dfdc7c4ec173ab4b0bd22c079ddabc6f1b4d23.zip krb5-e0dfdc7c4ec173ab4b0bd22c079ddabc6f1b4d23.tar.gz krb5-e0dfdc7c4ec173ab4b0bd22c079ddabc6f1b4d23.tar.bz2 | |
pull up r18601 from trunk
r18601@cathode-dark-space: jaltman | 2006-09-21 10:58:40 -0400
ticket: new
subject: wix installer - win2k compatibility for netidmgr
tags: pullup
Install the special win2k version of nidmgr32.dll
on Windows 2000 systems.
ticket: 4309
git-svn-id: svn://anonsvn.mit.edu/krb5/branches/krb5-1-4@18614 dc483132-0cff-0310-8789-dd5450dbe970
| -rw-r--r-- | src/windows/installer/wix/files.wxi | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/windows/installer/wix/files.wxi b/src/windows/installer/wix/files.wxi index ba422bb..08ef9b5 100644 --- a/src/windows/installer/wix/files.wxi +++ b/src/windows/installer/wix/files.wxi @@ -333,7 +333,7 @@ <Condition>VersionNT > 500</Condition> </Component> <Component Id="cmf_nidmgr32_dll_w2k" Guid="33F42D7C-03CE-465F-9E0A-5F486FE64B04" DiskId="1" Transitive="yes"> - <File Id="fil_nidmgr32_dll" LongName="nidmgr32.dll" Name="nidmgr32.dll" KeyPath="yes" src="$(var.BinDir)W2K\nidmgr32.dll" /> + <File Id="fil_nidmgr32_dll_w2k" LongName="nidmgr32.dll" Name="nidmgr32.dll" KeyPath="yes" src="$(var.BinDir)W2K\nidmgr32.dll" /> <Condition>VersionNT <= 500</Condition> </Component> <Component Id="cmf_krb5cred_dll" Guid="27A7723A-F0D9-4F06-892C-54F0AC6014C3" DiskId="1"> @@ -358,12 +358,12 @@ <Condition>VersionNT > 500</Condition> </Component> <Component Id="cmf_netidmgr_exe_w2k" Guid="0F85D4F3-7897-4FE3-8501-AD0C383CCB4F" DiskId="1" Transitive="yes"> - <File Id="fil_netidmgr_exe" LongName="netidmgr.exe" Name="netidmgr.exe" KeyPath="yes" /> - <File Id="fil_netidmgr_chm" LongName="netidmgr.chm" Name="netidmgr.chm" /> - <Registry Id="reg_ts_netidmgr_0" Root="HKLM" Key="Software\Microsoft\Windows NT\CurrentVersion\Terminal Server\Compatibility\Applications\netidmgr" Action="createKeyAndRemoveKeyOnUninstall" /> - <Registry Id="reg_ts_netidmgr_1" Root="HKLM" Key="Software\Microsoft\Windows NT\CurrentVersion\Terminal Server\Compatibility\Applications\netidmgr" Name="Flags" Type="integer" Value="1032" /> - <Shortcut Id="sc_netidmgr_exe" Advertise="no" Directory="dirShortcut" LongName="Network Identity Manager.lnk" Name="netidmgr.lnk" Target="[dirbin]netidmgr.exe" Show="minimized" WorkingDirectory="[dirbin]"/> - <Shortcut Id="sc_netidmgr_chm" Advertise="no" Directory="dirShortcut" LongName="Network Identity Manager Documentation.lnk" Name="netidchm.lnk" Target="[dirbin]netidmgr.chm" WorkingDirectory="[dirbin]"/> + <File Id="fil_netidmgr_exe_w2k" LongName="netidmgr.exe" Name="netidmgr.exe" KeyPath="yes" /> + <File Id="fil_netidmgr_chm_w2k" LongName="netidmgr.chm" Name="netidmgr.chm" /> + <Registry Id="reg_ts_netidmgr_0_w2k" Root="HKLM" Key="Software\Microsoft\Windows NT\CurrentVersion\Terminal Server\Compatibility\Applications\netidmgr" Action="createKeyAndRemoveKeyOnUninstall" /> + <Registry Id="reg_ts_netidmgr_1_w2k" Root="HKLM" Key="Software\Microsoft\Windows NT\CurrentVersion\Terminal Server\Compatibility\Applications\netidmgr" Name="Flags" Type="integer" Value="1032" /> + <Shortcut Id="sc_netidmgr_exe_w2k" Advertise="no" Directory="dirShortcut" LongName="Network Identity Manager.lnk" Name="netidmgr.lnk" Target="[dirbin]netidmgr.exe" Show="minimized" WorkingDirectory="[dirbin]"/> + <Shortcut Id="sc_netidmgr_chm_w2k" Advertise="no" Directory="dirShortcut" LongName="Network Identity Manager Documentation.lnk" Name="netidchm.lnk" Target="[dirbin]netidmgr.chm" WorkingDirectory="[dirbin]"/> <Condition>VersionNT <= 500</Condition> </Component> <!-- /NetIDMgr --> |