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

Revert "Windows: Skip policy assembly for now"

Browse Source 
This reverts commit a759e5091f.

The policy assembly is now skipped on XP from within the policy assembly
itself so it can be safely installed elsewhere.
This commit is contained in:
Jeffrey Altman
2013-09-25 09:59:28 -04:00
parent 6ef84fdfe8
commit 62bd882b57
1 changed files with 2 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -87,14 +87,8 @@
<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)' />
@@ -118,14 +112,8 @@
<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)' />
@@ -360,24 +348,14 @@
<?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