summaryrefslogtreecommitdiffstats
path: root/src/windows/installer
diff options
context:
space:
mode:
authorTom Yu <tlyu@mit.edu>2011-12-12 20:46:07 +0000
committerTom Yu <tlyu@mit.edu>2011-12-12 20:46:07 +0000
commit7585d260f0195c223b346877c1ca9aaedd59d0ee (patch)
tree54122ea30f5b7b6d09ba1c6945e60a0593e3240a /src/windows/installer
parent342f2ea2cd0ed0772e864264acb2aaae9c6819fb (diff)
downloadkrb5-7585d260f0195c223b346877c1ca9aaedd59d0ee.tar.gz
krb5-7585d260f0195c223b346877c1ca9aaedd59d0ee.tar.xz
krb5-7585d260f0195c223b346877c1ca9aaedd59d0ee.zip
kfw installer: generate leash shortcuts (desktop and start menu)
...also install xpprof64 Signed-off-by: Kevin Wasserman <kevin.wasserman@painless-security.com> ticket: 7050 git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@25565 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/windows/installer')
-rw-r--r--src/windows/installer/wix/files.wxi15
1 files changed, 10 insertions, 5 deletions
diff --git a/src/windows/installer/wix/files.wxi b/src/windows/installer/wix/files.wxi
index 5f25c5fa5f..9bccfe7a9e 100644
--- a/src/windows/installer/wix/files.wxi
+++ b/src/windows/installer/wix/files.wxi
@@ -25,7 +25,9 @@
-->
<Include xmlns="http://schemas.microsoft.com/wix/2006/wi">
-<Directory Id="TARGETDIR" Name="SourceDir">
+ <Property Id="DISABLEADVTSHORTCUTS" Value="1" />
+ <Directory Id="TARGETDIR" Name="SourceDir">
+ <Directory Id="DesktopFolder" Name="Desktop"/>
<Directory Id="$(var.PISystemFolder)" SourceName="System">
<Component Win64="$(var.Win64)" Id="cmf_kfwlogon_DLL" Guid="$(var.cmf_kfwlogon_DLL_guid)">
<File Id="filekfwlogon_DLL" Name="kfwlogon.dll" KeyPath="yes" DiskId="1" Source="$(var.BinDir)kfwlogon.dll" />
@@ -145,13 +147,16 @@
</Component>
<?if $(var.Platform) = "Intel" ?>
<Component Win64="$(var.Win64)" Id="cmf_leash32_exe" Guid="$(var.cmf_leash32_exe_guid)" DiskId="1">
- <File Id="fil_leash32_exe" Name="leash32.exe" KeyPath="yes" />
- <Registry Id="reg_ts_leash32_0" Root="HKLM" Key="Software\Microsoft\Windows NT\CurrentVersion\Terminal Server\Compatibility\Applications\leash32" Action="createKeyAndRemoveKeyOnUninstall" />
+ <File Id="fil_leash32_exe" Name="leash32.exe" KeyPath="yes">
+ <Shortcut Id="sc_leash32_exe" Advertise="yes" Directory="dirShortcut" Name="Leash Kerberos Ticket Manager.lnk" Arguments="[LEASHAUTOINIT]" />
+ <Shortcut Id="sc_leash32_desktop_exe" Advertise="yes" Directory="DesktopFolder" Name="Leash Kerberos Ticket Manager.lnk" Arguments="[LEASHAUTOINIT]" />
+ </File>
+ <Registry Id="reg_ts_leash32_0" Root="HKLM" Key="Software\Microsoft\Windows NT\CurrentVersion\Terminal Server\Compatibility\Applications\leash32" Action="createKeyAndRemoveKeyOnUninstall" />
<Registry Id="reg_ts_leash32_1" Root="HKLM" Key="Software\Microsoft\Windows NT\CurrentVersion\Terminal Server\Compatibility\Applications\leash32" Name="Flags" Type="integer" Value="1032" />
</Component>
<!-- <Component Win64="$(var.Win64)" Id="csc_leash32_exe" Guid="$(var.csc_leash32_exe_guid)" DiskId="1">
- <Shortcut Id="sc_leash32_exe" Advertise="no" Directory="dirShortcut" Name="Leash Kerberos Ticket Manager.lnk" Arguments="[LEASHAUTOINIT]" Target="[!fil_leash32_exe]" />
+ <CreateFolder Directory="dirShortcut" />
<Condition>USELEASH</Condition>
</Component> -->
@@ -414,7 +419,7 @@
<File Id="fil_krbcc64_lib" Name="krbcc64.lib" />
<File Id="fil_leashw64_lib" Name="leashw64.lib" />
<File Id="fil_wshelp64_lib" Name="wshelp64.lib" />
-<!-- <File Id="fil_xpprof64_lib" Name="xpprof64.lib" /> -->
+ <File Id="fil_xpprof64_lib" Name="xpprof64.lib" />
</Component>
</Directory>
<?endif?>