From 62bd882b574fa65fcef6049c6c6079def95af8c7 Mon Sep 17 00:00:00 2001
From: Jeffrey Altman <jaltman@secure-endpoints.com>
Date: Wed, 25 Sep 2013 09:59:28 -0400
Subject: [PATCH] Revert "Windows: Skip policy assembly for now"

This reverts commit a759e5091f9cfb8921ac42d7b9bf1682c7943b75.

The policy assembly is now skipped on XP from within the policy assembly
itself so it can be safely installed elsewhere.
---
 .../windows/installer/heimdal-installer.wxs   | 26 ++-----------------
 1 file changed, 2 insertions(+), 24 deletions(-)

diff --git a/packages/windows/installer/heimdal-installer.wxs b/packages/windows/installer/heimdal-installer.wxs
index 1c47c986c..77eb2f14c 100644
--- a/packages/windows/installer/heimdal-installer.wxs
+++ b/packages/windows/installer/heimdal-installer.wxs
@@ -87,14 +87,8 @@
       <Merge Id='Heimdal.Assemblies.32' Language='0'
              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'
              SourceFile='$(var.InstDir32)\Heimdal.Policy.msm' />
--->
 
       <Merge Id='Runtime.32' Language='0'
              SourceFile='$(var.RuntimeModule32)' />
@@ -118,14 +112,8 @@
       <Merge Id='Heimdal.Assemblies.64' Language='0'
              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'
              SourceFile='$(var.InstDir64)\Heimdal.Policy.msm' />
--->
 
       <Merge Id='Runtime.64' Language='0'
              SourceFile='$(var.RuntimeModule64)' />
@@ -360,24 +348,14 @@
 
       <?ifdef Target64?>
       <MergeRef Id='Heimdal.Assemblies.64' />
+      <MergeRef Id='Heimdal.Policy.64' />
       <MergeRef Id='Runtime.64' />
       <?else?>
       <MergeRef Id='Heimdal.Assemblies.32' />
+      <MergeRef Id='Heimdal.Policy.32' />
       <MergeRef Id='Runtime.32' />
       <?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 Target64?>
       <!-- If we are building the combined installer, the 32-bit