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

Windows: Make Heimdal a single assembly

Browse Source
This commit is contained in:
Asanka C. Herath
2010-11-18 00:50:29 -05:00
parent a4136a53af
commit 8432f850ed
11 changed files with 13 additions and 168 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
packages/windows/installer/heimdal-assemblies.wxs
View File

@@ -33,27 +33,15 @@
AssemblyManifest="id.Heimdal.Kerberos.manifest" />
<File Name="com_err.dll" />
<File Name="heimntlm.dll" />
<File Name="gssapi.dll" />
<File Name="heimdal.pdb" />
<File Name="com_err.pdb" />
<File Name="heimntlm.pdb" />
<File Name="gssapi.pdb" />
<File Name="Heimdal.Kerberos.cat" />
<File Name="Heimdal.Kerberos.manifest" Id="id.Heimdal.Kerberos.manifest" />
</Component>
</Directory>
<Directory Id="dir.Heimdal.GSSAPI" Name="Heimdal.GSSAPI"
FileSource="$(var.BinDir)\Heimdal.GSSAPI">
<Component Id="comp.Heimdal.GSSAPI"
Guid="$(var.GuidGSSAPI)"
Win64="$(var.Win64)">
<File Name="gssapi.dll" KeyPath="yes" Assembly="win32"
AssemblyManifest="id.Heimdal.GSSAPI.manifest" />
<File Name="gssapi.pdb" />
<File Name="Heimdal.GSSAPI.cat" />
<File Name="Heimdal.GSSAPI.manifest" Id="id.Heimdal.GSSAPI.manifest" />
</Component>
</Directory>
</Directory>
</Module>

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

@@ -116,19 +116,6 @@
assemblies.
-->
<Directory Id='dir.policy.Heimdal.GSSAPI'
Name='$(var.PolPrefix).Heimdal.GSSAPI'
FileSource='$(var.BinDir)\$(var.PolPrefix).Heimdal.GSSAPI'>
<Component Id='comp.policy.Heimdal.GSSAPI'
Guid='$(var.GuidPolGSSAPI)'
Win64='$(var.Win64)'>
<File Name='$(var.Version).pol' KeyPath='yes' Assembly='win32'
Id='policy.Kerberos' AssemblyManifest='policy.Kerberos' />
<File Name='$(var.Version).cat' Id='policy.Kerberos.cat' />
</Component>
</Directory>
<Directory Id='dir.policy.Heimdal.Kerberos'
Name='$(var.PolPrefix).Heimdal.Kerberos'
FileSource='$(var.BinDir)\$(var.PolPrefix).Heimdal.Kerberos'>
@@ -314,7 +301,6 @@
<ComponentRef Id='comp.Plugin.Reg' />
<ComponentRef Id='comp.policy.Heimdal.Kerberos' />
<ComponentRef Id='comp.policy.Heimdal.GSSAPI' />
<MergeRef Id='Heimdal.Assemblies' />
<MergeRef Id='Runtime' />