[OFED] make sure HCA driver files are deleted as uninstall does not cleanup properly...

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

diff --git a/trunk/OFED/WIX/common/hca_filters.inc b/trunk/OFED/WIX/common/hca_filters.inc
index 42a9d83d756c876391167e3c1eb536a0173c783f..7239aa00fccda58d726c1ea3d34b07b6a4637970 100644 (file)
--- a/trunk/OFED/WIX/common/hca_filters.inc
+++ b/trunk/OFED/WIX/common/hca_filters.inc
@@ -70,8 +70,10 @@
              Name="complibd.dll" />\r
 \r
       <RemoveFile Id='$(var.FLTR)rm_ibbus.sys' On='uninstall'\r
-             Property="SystemFolder"\r
-             Name="ibbus.sys" />\r
+             Property="SystemFolder" Name="ibbus.sys" />\r
+\r
+      <RemoveFile Id='$(var.FLTR)rm64_ibbus.sys' On='uninstall'\r
+             Property="System64Folder" Name="ibbus.sys" />\r
 \r
       <?include $(sys.CURRENTDIR)\..\..\common\winverbs_drivers.inc ?> \r
 \r

diff --git a/trunk/OFED/WIX/common/winverbs_drivers.inc b/trunk/OFED/WIX/common/winverbs_drivers.inc
index 2ce4321533a669a33e2b653f266c2ed7e08736de..cb565b4e7c25146dc752ae2483f426d03a5ab6aa 100644 (file)
--- a/trunk/OFED/WIX/common/winverbs_drivers.inc
+++ b/trunk/OFED/WIX/common/winverbs_drivers.inc
@@ -33,9 +33,24 @@
              Property="SystemFolder" Name='winmad.dll' />\r
       <RemoveFile Id='$(var.FLTR)rm_winmadd.dll' On='uninstall'\r
              Property="SystemFolder" Name='winmadd.dll' />\r
-      <RemoveFile Id='$(var.FLTR)rm_winverbs.sys' On='uninstall'\r
+\r
+      <RemoveFile Id='$(var.FLTR)rm64_winverbs.dll' On='uninstall'\r
+             Property="System64Folder" Name='winverbs.dll' />\r
+      <RemoveFile Id='$(var.FLTR)rm64_winverbsd.dll' On='uninstall'\r
+             Property="System64Folder" Name='winverbsd.dll' />\r
+      <RemoveFile Id='$(var.FLTR)rm64_winmad.dll' On='uninstall'\r
+             Property="System64Folder" Name='winmad.dll' />\r
+      <RemoveFile Id='$(var.FLTR)rm64_winmadd.dll' On='uninstall'\r
+             Property="System64Folder" Name='winmadd.dll' />\r
+\r
+      <RemoveFile Id='$(var.FLTR)rm32_winverbs.sys' On='uninstall'\r
              Property="SystemFolder" Name='winverbs.sys' />\r
-      <RemoveFile Id='$(var.FLTR)rm_winmad.sys' On='uninstall'\r
+      <RemoveFile Id='$(var.FLTR)rm32_winmad.sys' On='uninstall'\r
              Property="SystemFolder" Name='winmad.sys' />\r
 \r
+      <RemoveFile Id='$(var.FLTR)rm64_winverbs.sys' On='uninstall'\r
+             Property="System64Folder" Name='winverbs.sys' />\r
+      <RemoveFile Id='$(var.FLTR)rm64_winmad.sys' On='uninstall'\r
+             Property="System64Folder" Name='winmad.sys' />\r
+\r
 </Include>\r