From: stansmith <stansmith@ad392aa1-c5ef-ae45-8dd8-e69d62a5ef86>
Date: Tue, 24 Mar 2009 19:56:08 +0000 (+0000)
Subject: [WinOF] remove orphaned files on uninstall
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=059b711cb9ec8308a57faef93ec4a86566791d0f;p=~shefty%2Frdma-win.git

[WinOF] remove orphaned files on uninstall

git-svn-id: svn://openib.tc.cornell.edu/gen1@2047 ad392aa1-c5ef-ae45-8dd8-e69d62a5ef86
---

diff --git a/trunk/WinOF/WIX/wlh/x64/wof.wxs b/trunk/WinOF/WIX/wlh/x64/wof.wxs
index b6909334..63a4cff1 100644
--- a/trunk/WinOF/WIX/wlh/x64/wof.wxs
+++ b/trunk/WinOF/WIX/wlh/x64/wof.wxs
@@ -276,6 +276,16 @@
               <File Id="ib_iou.inf" Compressed="yes" DiskId="1"
                      LongName="ib_iou.inf" Name="IB_IOU.inf"
                      Source="..\bin\HCA\amd64\ib_iou.inf" />
+              <!--
+                 Orphaned install files - remove on uninstall
+                 Here SystemFolder == SysWOW64, System64Folder == System32
+              -->
+              <RemoveFile Id='o64_ibal.dll' On='uninstall'
+                     Property="SystemFolder"
+                     Name="ibal.dll" LongName='ibal.dll' />
+              <RemoveFile Id='o64_complib.dll' On='uninstall'
+                     Property="SystemFolder"
+                     Name="complib.dll" LongName='complib.dll' />
             </Component>
 
             <Component Id="cMthcaDriver"
@@ -801,6 +811,13 @@
               <File Id="ndinstall.exe" Compressed="yes" DiskId="1"
                      LongName="ndinstall.exe" Name="NDINSTAL.EXE"
                      Source="..\bin\net\amd64\ndinstall.exe" />
+              <!-- Orphaned install files - remove on uninstall -->
+              <RemoveFile Id='o32_ibwsd.dll' On='uninstall'
+                     Property="System64Folder"
+                     Name="ibwsd.dll" LongName='ibwsd.dll' />
+              <RemoveFile Id='o64_ibwsd.dll' On='uninstall'
+                     Property="SystemFolder"
+                     Name="ibwsd.dll" LongName='ibwsd.dll' />
             </Component>
           </Directory>
 
diff --git a/trunk/WinOF/WIX/wlh/x86/wof.wxs b/trunk/WinOF/WIX/wlh/x86/wof.wxs
index 0b0bfd2d..9660e393 100644
--- a/trunk/WinOF/WIX/wlh/x86/wof.wxs
+++ b/trunk/WinOF/WIX/wlh/x86/wof.wxs
@@ -259,6 +259,15 @@
                         <File Id="ib_iou.inf" Compressed="yes" DiskId="1"
                               LongName="ib_iou.inf" Name="ib_iou.inf"
                               Source="..\bin\HCA\x86\ib_iou.inf" />
+                        <!--
+                           Orphaned install files - remove on uninstall
+                        -->
+                        <RemoveFile Id='o64_ibal.dll' On='uninstall'
+                               Property="SystemFolder"
+                               Name="ibal.dll" LongName='ibal.dll' />
+                        <RemoveFile Id='o64_complib.dll' On='uninstall'
+                               Property="SystemFolder"
+                               Name="complib.dll" LongName='complib.dll' />
                     </Component>
 
                     <Component Id="cMthcaDriver"
@@ -281,6 +290,10 @@
                         <File Id="mthcaud.dll" Compressed="yes" DiskId="1"
                               LongName="mthcaud.dll" Name="MTHCAUD.DLL"
                               Source="..\bin\HCA\x86\mthcaud.dll" />
+                        <!-- Orphaned install files - remove on uninstall -->
+                        <RemoveFile Id='o32_mthcau.dll' On='uninstall'
+                               Property="SystemFolder"
+                               Name="mthcau.dll" LongName='mthcau.dll' />
                     </Component>
 
                     <Component Id="cConnectXDriver"
@@ -761,6 +774,10 @@
                         <File Id="ndinstall.exe" Compressed="yes" DiskId="1"
                               LongName="ndinstall.exe" Name="NDINSTAL.EXE"
                               Source="..\bin\net\x86\ndinstall.exe" />
+                        <!-- Orphaned install files - remove on uninstall -->
+                        <RemoveFile Id='o32_ibwsd.dll' On='uninstall'
+                               Property="SystemFolder"
+                               Name="ibwsd.dll" LongName='ibwsd.dll' />
                     </Component>
                 </Directory>
 
diff --git a/trunk/WinOF/WIX/wnet/x64/wof.wxs b/trunk/WinOF/WIX/wnet/x64/wof.wxs
index d6ef8f2f..a4cdaa99 100644
--- a/trunk/WinOF/WIX/wnet/x64/wof.wxs
+++ b/trunk/WinOF/WIX/wnet/x64/wof.wxs
@@ -276,6 +276,34 @@
               <File Id="ib_iou.inf" Compressed="yes" DiskId="1"
                      LongName="ib_iou.inf" Name="IB_IOU.inf"
                      Source="..\bin\HCA\amd64\ib_iou.inf" />
+              <!--
+                 Orphaned install files - remove on uninstall
+                 x64 SystemFolder == SysWOW64, System64Folder == System32
+              -->
+              <RemoveFile Id='o64_ibal.dll' On='uninstall'
+                     Property="SystemFolder"
+                     Name="ibal.dll" LongName='ibal.dll' />
+              <RemoveFile Id='o64_ibald.dll' On='uninstall'
+                     Property="SystemFolder"
+                     Name="ibald.dll" LongName='ibald.dll' />
+              <RemoveFile Id='o64_complib.dll' On='uninstall'
+                     Property="SystemFolder"
+                     Name="complib.dll" LongName='complib.dll' />
+              <RemoveFile Id='o64_complibd.dll' On='uninstall'
+                     Property="SystemFolder"
+                     Name="complibd.dll" LongName='complibd.dll' />
+              <RemoveFile Id='o32_ibal.dll' On='uninstall'
+                     Property="System64Folder"
+                     Name="ibal.dll" LongName='ibal.dll' />
+              <RemoveFile Id='o32_ibald.dll' On='uninstall'
+                     Property="System64Folder"
+                     Name="ibald.dll" LongName='ibald.dll' />
+              <RemoveFile Id='o32_complib.dll' On='uninstall'
+                     Property="System64Folder"
+                     Name="complib.dll" LongName='complib.dll' />
+              <RemoveFile Id='o32_complibd.dll' On='uninstall'
+                     Property="System64Folder"
+                     Name="complibd.dll" LongName='complibd.dll' />
             </Component>
 
             <Component Id="cMthcaDriver"
@@ -304,6 +332,13 @@
               <File Id="mthcaud.dll" Compressed="yes" DiskId="1"
                      LongName="mthcaud.dll" Name="MTHCAUD.DLL"
                      Source="..\bin\HCA\amd64\mthcaud.dll" />
+              <!-- Orphaned install files - remove on uninstall -->
+              <RemoveFile Id='o32_mthcau.dll' On='uninstall'
+                     Property="System64Folder"
+                     Name="mthcau.dll" LongName='mthcau.dll' />
+              <RemoveFile Id='o32_mthcaud.dll' On='uninstall'
+                     Property="System64Folder"
+                     Name="mthcaud.dll" LongName='mthcaud.dll' />
             </Component>
 
             <Component Id="cConnectXDriver"
@@ -786,6 +821,19 @@
               <File Id="ndinstall.exe" Compressed="yes" DiskId="1"
                      LongName="ndinstall.exe" Name="NDINSTAL.EXE"
                      Source="..\bin\net\amd64\ndinstall.exe" />
+              <!-- Orphaned install files - remove on uninstall -->
+              <RemoveFile Id='o32_ibwsd.dll' On='uninstall'
+                     Property="System64Folder"
+                     Name="ibwsd.dll" LongName='ibwsd.dll' />
+              <RemoveFile Id='o64_ibwsd.dll' On='uninstall'
+                     Property="SystemFolder"
+                     Name="ibwsd.dll" LongName='ibwsd.dll' />
+              <RemoveFile Id='o64_ibndprov.dll' On='uninstall'
+                     Property="SystemFolder"
+                     Name="ibndprov.dll" LongName='ibndprov.dll' />
+              <RemoveFile Id='o64_ndinstall.exe' On='uninstall'
+                     Property="SystemFolder"
+                     Name="ndinstal.exe" LongName='ndinstall.exe' />
             </Component>
           </Directory>