[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 b6909334ce784c9a54d332705e6241944a86754e..63a4cff172f137d161371737791709ccc45402f0 100644 (file)
--- 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"\r
                      LongName="ib_iou.inf" Name="IB_IOU.inf"\r
                      Source="..\bin\HCA\amd64\ib_iou.inf" />\r
+              <!--\r
+                 Orphaned install files - remove on uninstall\r
+                 Here SystemFolder == SysWOW64, System64Folder == System32\r
+              -->\r
+              <RemoveFile Id='o64_ibal.dll' On='uninstall'\r
+                     Property="SystemFolder"\r
+                     Name="ibal.dll" LongName='ibal.dll' />\r
+              <RemoveFile Id='o64_complib.dll' On='uninstall'\r
+                     Property="SystemFolder"\r
+                     Name="complib.dll" LongName='complib.dll' />\r
             </Component>\r
 \r
             <Component Id="cMthcaDriver"\r
@@ -801,6 +811,13 @@
               <File Id="ndinstall.exe" Compressed="yes" DiskId="1"\r
                      LongName="ndinstall.exe" Name="NDINSTAL.EXE"\r
                      Source="..\bin\net\amd64\ndinstall.exe" />\r
+              <!-- Orphaned install files - remove on uninstall -->\r
+              <RemoveFile Id='o32_ibwsd.dll' On='uninstall'\r
+                     Property="System64Folder"\r
+                     Name="ibwsd.dll" LongName='ibwsd.dll' />\r
+              <RemoveFile Id='o64_ibwsd.dll' On='uninstall'\r
+                     Property="SystemFolder"\r
+                     Name="ibwsd.dll" LongName='ibwsd.dll' />\r
             </Component>\r
           </Directory>\r
 \r

diff --git a/trunk/WinOF/WIX/wlh/x86/wof.wxs b/trunk/WinOF/WIX/wlh/x86/wof.wxs
index 0b0bfd2d2b429438a58edfb4f14ed76a36817258..9660e393c22ea467716e7f003ed6eb97121df429 100644 (file)
--- 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"\r
                               LongName="ib_iou.inf" Name="ib_iou.inf"\r
                               Source="..\bin\HCA\x86\ib_iou.inf" />\r
+                        <!--\r
+                           Orphaned install files - remove on uninstall\r
+                        -->\r
+                        <RemoveFile Id='o64_ibal.dll' On='uninstall'\r
+                               Property="SystemFolder"\r
+                               Name="ibal.dll" LongName='ibal.dll' />\r
+                        <RemoveFile Id='o64_complib.dll' On='uninstall'\r
+                               Property="SystemFolder"\r
+                               Name="complib.dll" LongName='complib.dll' />\r
                     </Component>\r
 \r
                     <Component Id="cMthcaDriver"\r
@@ -281,6 +290,10 @@
                         <File Id="mthcaud.dll" Compressed="yes" DiskId="1"\r
                               LongName="mthcaud.dll" Name="MTHCAUD.DLL"\r
                               Source="..\bin\HCA\x86\mthcaud.dll" />\r
+                        <!-- Orphaned install files - remove on uninstall -->\r
+                        <RemoveFile Id='o32_mthcau.dll' On='uninstall'\r
+                               Property="SystemFolder"\r
+                               Name="mthcau.dll" LongName='mthcau.dll' />\r
                     </Component>\r
 \r
                     <Component Id="cConnectXDriver"\r
@@ -761,6 +774,10 @@
                         <File Id="ndinstall.exe" Compressed="yes" DiskId="1"\r
                               LongName="ndinstall.exe" Name="NDINSTAL.EXE"\r
                               Source="..\bin\net\x86\ndinstall.exe" />\r
+                        <!-- Orphaned install files - remove on uninstall -->\r
+                        <RemoveFile Id='o32_ibwsd.dll' On='uninstall'\r
+                               Property="SystemFolder"\r
+                               Name="ibwsd.dll" LongName='ibwsd.dll' />\r
                     </Component>\r
                 </Directory>\r
 \r

diff --git a/trunk/WinOF/WIX/wnet/x64/wof.wxs b/trunk/WinOF/WIX/wnet/x64/wof.wxs
index d6ef8f2fe1ab3ce0b2249728304f6753d1aacef7..a4cdaa99814f981c420c04c62673423563a99344 100644 (file)
--- 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"\r
                      LongName="ib_iou.inf" Name="IB_IOU.inf"\r
                      Source="..\bin\HCA\amd64\ib_iou.inf" />\r
+              <!--\r
+                 Orphaned install files - remove on uninstall\r
+                 x64 SystemFolder == SysWOW64, System64Folder == System32\r
+              -->\r
+              <RemoveFile Id='o64_ibal.dll' On='uninstall'\r
+                     Property="SystemFolder"\r
+                     Name="ibal.dll" LongName='ibal.dll' />\r
+              <RemoveFile Id='o64_ibald.dll' On='uninstall'\r
+                     Property="SystemFolder"\r
+                     Name="ibald.dll" LongName='ibald.dll' />\r
+              <RemoveFile Id='o64_complib.dll' On='uninstall'\r
+                     Property="SystemFolder"\r
+                     Name="complib.dll" LongName='complib.dll' />\r
+              <RemoveFile Id='o64_complibd.dll' On='uninstall'\r
+                     Property="SystemFolder"\r
+                     Name="complibd.dll" LongName='complibd.dll' />\r
+              <RemoveFile Id='o32_ibal.dll' On='uninstall'\r
+                     Property="System64Folder"\r
+                     Name="ibal.dll" LongName='ibal.dll' />\r
+              <RemoveFile Id='o32_ibald.dll' On='uninstall'\r
+                     Property="System64Folder"\r
+                     Name="ibald.dll" LongName='ibald.dll' />\r
+              <RemoveFile Id='o32_complib.dll' On='uninstall'\r
+                     Property="System64Folder"\r
+                     Name="complib.dll" LongName='complib.dll' />\r
+              <RemoveFile Id='o32_complibd.dll' On='uninstall'\r
+                     Property="System64Folder"\r
+                     Name="complibd.dll" LongName='complibd.dll' />\r
             </Component>\r
 \r
             <Component Id="cMthcaDriver"\r
@@ -304,6 +332,13 @@
               <File Id="mthcaud.dll" Compressed="yes" DiskId="1"\r
                      LongName="mthcaud.dll" Name="MTHCAUD.DLL"\r
                      Source="..\bin\HCA\amd64\mthcaud.dll" />\r
+              <!-- Orphaned install files - remove on uninstall -->\r
+              <RemoveFile Id='o32_mthcau.dll' On='uninstall'\r
+                     Property="System64Folder"\r
+                     Name="mthcau.dll" LongName='mthcau.dll' />\r
+              <RemoveFile Id='o32_mthcaud.dll' On='uninstall'\r
+                     Property="System64Folder"\r
+                     Name="mthcaud.dll" LongName='mthcaud.dll' />\r
             </Component>\r
 \r
             <Component Id="cConnectXDriver"\r
@@ -786,6 +821,19 @@
               <File Id="ndinstall.exe" Compressed="yes" DiskId="1"\r
                      LongName="ndinstall.exe" Name="NDINSTAL.EXE"\r
                      Source="..\bin\net\amd64\ndinstall.exe" />\r
+              <!-- Orphaned install files - remove on uninstall -->\r
+              <RemoveFile Id='o32_ibwsd.dll' On='uninstall'\r
+                     Property="System64Folder"\r
+                     Name="ibwsd.dll" LongName='ibwsd.dll' />\r
+              <RemoveFile Id='o64_ibwsd.dll' On='uninstall'\r
+                     Property="SystemFolder"\r
+                     Name="ibwsd.dll" LongName='ibwsd.dll' />\r
+              <RemoveFile Id='o64_ibndprov.dll' On='uninstall'\r
+                     Property="SystemFolder"\r
+                     Name="ibndprov.dll" LongName='ibndprov.dll' />\r
+              <RemoveFile Id='o64_ndinstall.exe' On='uninstall'\r
+                     Property="SystemFolder"\r
+                     Name="ndinstal.exe" LongName='ndinstall.exe' />\r
             </Component>\r
           </Directory>\r
 \r