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

Windows: installer package modifications

Browse Source 
Remove third party plugins from installers now that they must be part
of the assemblies.

Add support for thirdparty heimdal-assemblies.wxs and heimdal-policy.wxs
files.

Change-Id: Idb29ebcf39b14ebcd2b01dc8c53b9bb7fbb8eaab
This commit is contained in:
Jeffrey Altman
2013-09-14 23:34:39 -04:00
parent e2b84ee118
commit 1154d5d080
4 changed files with 32 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -189,30 +189,6 @@
</DirectoryRef>
<?ifdef Target32?>
<DirectoryRef Id='PLUGINDIR32'>
<Component Id='comp.Plugin.Reg.32'
Guid='4BC44234-70A4-4CC1-A5AF-4CA76E9F9487' Win64='no'>
<RegistryKey Root='HKLM' Key='Software\Heimdal'>
<RegistryValue Name='plugin_dir' Type='multiString' Action='append'
Value='"[PLUGINDIR32]"' KeyPath='yes' />
</RegistryKey>
</Component>
</DirectoryRef>
<?endif?>
<?ifdef Target64?>
<DirectoryRef Id='PLUGINDIR64'>
<Component Id='comp.Plugin.Reg.64'
Guid='5A99A52E-A4CD-40F8-AFFD-AD61939FC547' Win64='yes'>
<RegistryKey Root='HKLM' Key='Software\Heimdal'>
<RegistryValue Name='plugin_dir' Type='multiString' Action='append'
Value='"[PLUGINDIR64]"' KeyPath='yes' />
</RegistryKey>
</Component>
</DirectoryRef>
<?endif?>
<DirectoryRef Id='TARGETDIR'>
<Directory Id='CommonAppDataFolder' Name='ProgramData'>
<Directory Id='dirCommonKerberos' Name='Kerberos' FileSource='$(var.SrcDir)'>
@@ -305,21 +281,5 @@
</Property>
<?endif?>
<?ifdef LsaCache ?>
<?ifdef Target64?>
<ComponentGroupRef Id='comps.LSACache.64' />
<?else?>
<ComponentGroupRef Id='comps.LSACache.32' />
<?endif?>
<?endif?>
<?ifdef ApiCache ?>
<?ifdef Target64?>
<ComponentGroupRef Id='comps.APICache.64' />
<?else?>
<ComponentGroupRef Id='comps.APICache.32' />
<?endif?>
<?endif?>
</Module>
</Wix>