oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

Windows packaging: install kadmin.exe

Browse Source 
Now that kadmin.exe works on Windows, install it.

Change-Id: I4b5e85386bd6e39ac1a8e01cd6d323c09520da1a
This commit is contained in:
Jeffrey Altman
2014-02-04 23:18:39 -05:00
parent 3e2ca4be37
commit e52c5f2a64
2 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
packages/windows/installer/heimdal-command.wxs
View File

@@ -14,7 +14,7 @@
<?define GuidKvno=2B932C2B-9167-4051-BDF7-A104E9983CE6 ?>
<?define GuidKcpytkt=17734691-7CB3-4E9A-AADC-6D4205795F43 ?>
<?define GuidKdeltkt=3E853905-8CDA-4E14-8EBA-C0C4EEDB811A ?>
<?define GuidKcc=F411A9F1-A186-40CB-B55B-CADBE0166268 ?>
<?define GuidHeimtools=F411A9F1-A186-40CB-B55B-CADBE0166268 ?>
<?define GuidPackage={49114B84-F013-4473-B8FA-E77FAE565C4E} ?>
<?define GuidKerberos={0ECC969D-76EB-474F-9CC5-91AD22944520} ?>
@@ -32,7 +32,7 @@
<?define GuidKvno=4C6015BE-1347-4D12-8841-FF90E0B9D6A8 ?>
<?define GuidKcpytkt=CBCDFC80-601B-4F26-A020-7D1278735B95 ?>
<?define GuidKdeltkt=6450EE72-E472-4709-B457-B579BFB2472B ?>
<?define GuidKcc=11800964-4A5F-466E-B2FE-DD2EFC54DDB9 ?>
<?define GuidHeimtools=11800964-4A5F-466E-B2FE-DD2EFC54DDB9 ?>
<?define GuidPackage={AF31DA8A-4D8C-4248-B685-3D60FE8CA3AE} ?>
<?define GuidKerberos={FC7C866C-4E6A-4C48-A7E2-151C7C86E375} ?>
@@ -157,7 +157,7 @@
</Component>
<Component Id='comp.heimtools'
Guid='$(var.GuidKcc)'
Guid='$(var.GuidHeimtools)'
Win64='$(var.Win64)'>
<File Name='heimtools.exe' KeyPath='yes'>
<CopyFile Id='klist.exe' DestinationName='klist.exe' DestinationProperty='$(var.ToolsBinDir)' />

11
packages/windows/installer/heimdal-installer.wxs
View File

@@ -16,6 +16,7 @@
<?define GuidKcpytkt=17734691-7CB3-4E9A-AADC-6D4205795F43 ?>
<?define GuidKdeltkt=3E853905-8CDA-4E14-8EBA-C0C4EEDB811A ?>
<?define GuidHeimtools=F411A9F1-A186-40CB-B55B-CADBE0166268 ?>
<?define GuidKadmin=E628E9AA-43AB-47EE-8A01-815C027555F2 ?>
<?define ConfigDir=INSTALLDIR64 ?>
@@ -34,7 +35,7 @@
<?define GuidKcpytkt=CBCDFC80-601B-4F26-A020-7D1278735B95 ?>
<?define GuidKdeltkt=6450EE72-E472-4709-B457-B579BFB2472B ?>
<?define GuidHeimtools=11800964-4A5F-466E-B2FE-DD2EFC54DDB9 ?>
<?define GuidGssDll=5F38982B-A325-4A7B-A2FC-EA40314F4D00 ?>
<?define GuidKadmin=B31F9FFC-D588-4A3E-9AEA-C9E9137B08F0 ?>
<?define ConfigDir=INSTALLDIR32 ?>
@@ -203,6 +204,13 @@
</File>
</Component>
<Component Id='comp.kadmin'
Guid='$(var.GuidKadmin)'
Win64='$(var.Win64)'>
<File Name='kadmin.exe' KeyPath='yes' />
<File Name='kadmin.pdb' />
</Component>
<Component Id='comp.Heimdal.chm'
Guid='785F6668-EBDB-4F18-8BEF-F72ECECB43D6'>
<File Source='$(var.DocDir)\heimdal.chm' />
@@ -348,6 +356,7 @@
<ComponentRef Id='comp.ktutil' />
<ComponentRef Id='comp.kvno' />
<ComponentRef Id='comp.heimtools' />
<ComponentRef Id='comp.kadmin' />
<?ifdef MKShim ?>
<?ifdef Target64?>