[OFED] make sure HCA driver files are deleted as uninstall does not cleanup properly...
authorstansmith <stansmith@ad392aa1-c5ef-ae45-8dd8-e69d62a5ef86>
Thu, 18 Mar 2010 18:53:27 +0000 (18:53 +0000)
committerstansmith <stansmith@ad392aa1-c5ef-ae45-8dd8-e69d62a5ef86>
Thu, 18 Mar 2010 18:53:27 +0000 (18:53 +0000)
git-svn-id: svn://openib.tc.cornell.edu/gen1/trunk@2746 ad392aa1-c5ef-ae45-8dd8-e69d62a5ef86

OFED/WIX/common/hca_filters.inc
OFED/WIX/common/winverbs_drivers.inc

index 42a9d83..7239aa0 100644 (file)
              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
index 2ce4321..cb565b4 100644 (file)
              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