From 2de056b925cc80982d9a1d1c6e9f7c81ad413d68 Mon Sep 17 00:00:00 2001
From: Kevin Wasserman <kevin.wasserman@painless-security.com>
Date: Fri, 1 Jun 2012 19:29:34 -0400
Subject: Remove psapi.dll from installer

psapi.dll is a standard windows component; no need for kfw to redistribute.

Signed-off-by: Kevin Wasserman <kevin.wasserman@painless-security.com>

ticket: 7263 (new)
queue: kfw
target_version: 1.10.4
tags: pullup
---
 src/windows/installer/wix/features.wxi | 2 --
 src/windows/installer/wix/files.wxi    | 6 +-----
 2 files changed, 1 insertion(+), 7 deletions(-)

(limited to 'src/windows/installer')

diff --git a/src/windows/installer/wix/features.wxi b/src/windows/installer/wix/features.wxi
index fa8c8f0d3d..4fd1d06012 100644
--- a/src/windows/installer/wix/features.wxi
+++ b/src/windows/installer/wix/features.wxi
@@ -116,8 +116,6 @@
             <ComponentRef Id="rcm_leashdll_16" />
             <ComponentRef Id="rcm_leashdll_17" />
             
-            <ComponentRef Id="cmf_psapi_dll" />
-            
             <ComponentRef Id="cmf_krb5_ini" />
             
             <ComponentRef Id="rcm_common" />
diff --git a/src/windows/installer/wix/files.wxi b/src/windows/installer/wix/files.wxi
index a7245e7e45..0d75b988ee 100644
--- a/src/windows/installer/wix/files.wxi
+++ b/src/windows/installer/wix/files.wxi
@@ -331,11 +331,7 @@
 	                    <File Id="fil_mit2ms_pdb" Name="mit2ms.pdb" />
                     </Component>
                 <?endif?>
-                
-                    <Component Win64="$(var.Win64)" Id="cmf_psapi_dll" Guid="877F4DD5-8AE0-451C-8F4D-C27F6F30D221" DiskId="1">
-	                    <File Id="fil_psapi_dll" Name="psapi.dll" src="$(var.SystemDir)psapi.dll" KeyPath="yes" />
-                    </Component>
-                
+
                 </Directory> <!-- /bin -->
                 
                 <Directory Id="dirinc" Name="include" src="$(var.IncDir)">
-- 
cgit