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

Windows: Skip policy assembly for now

Browse Source 
On XP there is a bug which prevents two installers from including a
policy assembly of the same name.  Policy Assembly names are

  <Product>.<Major>.<Minor>

For now do not install the policy assembly until we have a work around
for XP or a method of conditionally not installing the policy on XP.

Change-Id: If92bea3c625e6124eb64c2bcc3e5008a58f04404
This commit is contained in:
Jeffrey Altman
2013-09-24 15:03:14 -04:00
parent 2ccdebdacc
commit a759e5091f
1 changed files with 24 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -87,8 +87,14 @@
<Merge Id='Heimdal.Assemblies.32' Language='0' <Merge Id='Heimdal.Assemblies.32' Language='0'
SourceFile='$(var.InstDir32)\Heimdal.msm' /> SourceFile='$(var.InstDir32)\Heimdal.msm' />
<!--
Until we have a work around for this bug on XP
http://sourceforge.net/p/wix/bugs/2034/
We need to punt on installing policy assemblies.
<Merge Id='Heimdal.Policy.32' Language='0' <Merge Id='Heimdal.Policy.32' Language='0'
SourceFile='$(var.InstDir32)\Heimdal.Policy.msm' /> SourceFile='$(var.InstDir32)\Heimdal.Policy.msm' />
-->
<Merge Id='Runtime.32' Language='0' <Merge Id='Runtime.32' Language='0'
SourceFile='$(var.RuntimeModule32)' /> SourceFile='$(var.RuntimeModule32)' />
@@ -112,8 +118,14 @@
<Merge Id='Heimdal.Assemblies.64' Language='0' <Merge Id='Heimdal.Assemblies.64' Language='0'
SourceFile='$(var.InstDir64)\Heimdal.msm' /> SourceFile='$(var.InstDir64)\Heimdal.msm' />
<!--
Until we have a work around for this bug on XP
http://sourceforge.net/p/wix/bugs/2034/
We need to punt on installing policy assemblies.
<Merge Id='Heimdal.Policy.64' Language='0' <Merge Id='Heimdal.Policy.64' Language='0'
SourceFile='$(var.InstDir64)\Heimdal.Policy.msm' /> SourceFile='$(var.InstDir64)\Heimdal.Policy.msm' />
-->
<Merge Id='Runtime.64' Language='0' <Merge Id='Runtime.64' Language='0'
SourceFile='$(var.RuntimeModule64)' /> SourceFile='$(var.RuntimeModule64)' />
@@ -348,14 +360,24 @@
<?ifdef Target64?> <?ifdef Target64?>
<MergeRef Id='Heimdal.Assemblies.64' /> <MergeRef Id='Heimdal.Assemblies.64' />
<MergeRef Id='Heimdal.Policy.64' />
<MergeRef Id='Runtime.64' /> <MergeRef Id='Runtime.64' />
<?else?> <?else?>
<MergeRef Id='Heimdal.Assemblies.32' /> <MergeRef Id='Heimdal.Assemblies.32' />
<MergeRef Id='Heimdal.Policy.32' />
<MergeRef Id='Runtime.32' /> <MergeRef Id='Runtime.32' />
<?endif?> <?endif?>
<!--
Until we have a work around for this bug on XP
http://sourceforge.net/p/wix/bugs/2034/
We need to punt on installing policy assemblies.
<?ifdef Target64?>
<MergeRef Id='Heimdal.Policy.64' />
<?else?>
<MergeRef Id='Heimdal.Policy.32' />
<?endif?>
-->
<?ifdef Target32?> <?ifdef Target32?>
<?ifdef Target64?> <?ifdef Target64?>
<!-- If we are building the combined installer, the 32-bit <!-- If we are building the combined installer, the 32-bit