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

Windows: Make the 32-bit tools install directory customizable.

Browse Source
This commit is contained in:
Asanka C. Herath
2011-06-15 00:48:04 -04:00
parent 3048545de3
commit 8aaf3183ca
2 changed files with 38 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -373,42 +373,62 @@
<ComponentRef Id='comp.kcc' /> <ComponentRef Id='comp.kcc' />
<?ifdef LsaCache ?> <?ifdef LsaCache ?>
<?ifdef Target32?>
<ComponentGroupRef Id='comps.LSACache.32' />
<?endif?>
<?ifdef Target64?> <?ifdef Target64?>
<ComponentGroupRef Id='comps.LSACache.64' /> <ComponentGroupRef Id='comps.LSACache.64' />
<?else?>
<ComponentGroupRef Id='comps.LSACache.32' />
<?endif?> <?endif?>
<?endif?> <?endif?>
<?ifdef ApiCache ?> <?ifdef ApiCache ?>
<?ifdef Target32?>
<ComponentGroupRef Id='comps.APICache.32' />
<?endif?>
<?ifdef Target64?> <?ifdef Target64?>
<ComponentGroupRef Id='comps.APICache.64' /> <ComponentGroupRef Id='comps.APICache.64' />
<?else?>
<ComponentGroupRef Id='comps.APICache.32' />
<?endif?> <?endif?>
<?endif?> <?endif?>
<?ifdef MKShim ?> <?ifdef MKShim ?>
<?ifdef Target32?>
<ComponentGroupRef Id='comp.Heimdal.MKShim.32' />
<?endif?>
<?ifdef Target64?> <?ifdef Target64?>
<ComponentGroupRef Id='comp.Heimdal.MKShim.64' /> <ComponentGroupRef Id='comp.Heimdal.MKShim.64' />
<?else?>
<ComponentGroupRef Id='comp.Heimdal.MKShim.32' />
<?endif?> <?endif?>
<?endif?> <?endif?>
<?ifdef Target32?>
<MergeRef Id='Heimdal.Assemblies.32' />
<MergeRef Id='Heimdal.Policy.32' />
<MergeRef Id='Runtime.32' />
<?endif?>
<?ifdef Target64?> <?ifdef Target64?>
<MergeRef Id='Heimdal.Assemblies.64' /> <MergeRef Id='Heimdal.Assemblies.64' />
<MergeRef Id='Heimdal.Policy.64' /> <MergeRef Id='Heimdal.Policy.64' />
<MergeRef Id='Runtime.64' /> <MergeRef Id='Runtime.64' />
<?else?>
<MergeRef Id='Heimdal.Assemblies.32' />
<MergeRef Id='Heimdal.Policy.32' />
<MergeRef Id='Runtime.32' />
<?endif?>
<?ifdef Target32?>
<?ifdef Target64?>
<!-- If we are building the combined installer, the 32-bit
libraries go into a separate feature. -->
<Feature Id='feature.32BitLibraries'
ConfigurableDirectory='INSTALLDIR32'
Title='!(loc.Fea32BitTitle)'
Description='!(loc.Fea32BitDesc)'
Level='1' TypicalDefault='install' InstallDefault='local'>
<?ifdef LsaCache ?>
<ComponentGroupRef Id='comps.LSACache.32' />
<?endif?>
<?ifdef ApiCache ?>
<ComponentGroupRef Id='comps.APICache.32' />
<?endif?>
<?ifdef MKShim ?>
<ComponentGroupRef Id='comp.Heimdal.MKShim.32' />
<?endif?>
<MergeRef Id='Heimdal.Assemblies.32' />
<MergeRef Id='Heimdal.Policy.32' />
<MergeRef Id='Runtime.32' />
</Feature>
<?endif?>
<?endif?> <?endif?>
</Feature> </Feature>

4
packages/windows/installer/lang/en-us.wxl
View File

@@ -8,6 +8,8 @@
<String Id='Comments'></String> <String Id='Comments'></String>
<String Id='FeaMainTitle'>Heimdal</String> <String Id='FeaMainTitle'>Heimdal</String>
<String Id='FeaMainDesc'>Command line tools and libraries for Heimdal Kerberos</String> <String Id='FeaMainDesc'>Command line tools and libraries for Heimdal Kerberos</String>
<String Id='AdminRequired'>Installation of this package requires elevation.</String> <String Id='Fea32BitTitle'>32-bit tools and libraries</String>
<String Id='Fea32BitDesc'>Compatibility libraries for 32-bit applications</String>
<String Id='AdminRequired'>Installation of this package requires elevation</String>
<String Id='AlreadyInstalled'>A current or newer version of Heimdal is already installed on this machine. Please use the Add/Remove Programs control panel to manage the existing installation.</String> <String Id='AlreadyInstalled'>A current or newer version of Heimdal is already installed on this machine. Please use the Add/Remove Programs control panel to manage the existing installation.</String>
</WixLocalization> </WixLocalization>