[WINOF] Include Winverbs ND provider plus ndinstall.exe for all architectures.
authorstansmith <stansmith@ad392aa1-c5ef-ae45-8dd8-e69d62a5ef86>
Thu, 29 Oct 2009 21:03:09 +0000 (21:03 +0000)
committerstansmith <stansmith@ad392aa1-c5ef-ae45-8dd8-e69d62a5ef86>
Thu, 29 Oct 2009 21:03:09 +0000 (21:03 +0000)
git-svn-id: svn://openib.tc.cornell.edu/gen1/trunk@2520 ad392aa1-c5ef-ae45-8dd8-e69d62a5ef86

WinOF/WIX/common/ipoib.inc

index 7d11e9e..88776c4 100644 (file)
 \r
       <?endif?>\r
 \r
+      <File Id="ndinstall.exe" Compressed="yes" DiskId="1"\r
+            LongName="ndinstall.exe" Name="NDINSTAL.EXE"\r
+            Source="..\bin\net\$(var.ARCH)\ndinstall.exe" />\r
+\r
+      <File Id="wvndprov.dll" Compressed="yes" DiskId="1"\r
+            LongName="wvndprov.dll" Name="wvndprov.DLL"\r
+            Source="..\bin\net\$(var.ARCH)\wvndprov.dll" />\r
+\r
       <?if $(var.ARCHP) != "ia64" ?>\r
           <File Id="ibndprov.dll" Compressed="yes" DiskId="1"\r
                 LongName="ibndprov.dll" Name="IBNDPROV.DLL"\r
                 Source="..\bin\net\$(var.ARCH)\ibndprov.dll" />\r
-          <File Id="ndinstall.exe" Compressed="yes" DiskId="1"\r
-                LongName="ndinstall.exe" Name="NDINSTAL.EXE"\r
-                Source="..\bin\net\$(var.ARCH)\ndinstall.exe" />\r
       <?endif?>\r
 \r
       <?if $(var.ARCHP) = "x64" ?>\r
@@ -64,6 +69,9 @@
           <RemoveFile Id='rm64_ibndprov.dll' On='uninstall'\r
                  Property="System64Folder"\r
                  Name="ibndpr32.dll" LongName='ibndprov32.dll' />\r
+          <RemoveFile Id='rm64_wvndprov.dll' On='uninstall'\r
+                 Property="System64Folder"\r
+                 Name="wvndpr.dll" LongName='wvndprov.dll' />\r
           <RemoveFile Id='rm64_ndinstall.exe' On='uninstall'\r
                  Property="System64Folder"\r
                  Name="ndinstal.exe" LongName='ndinstall.exe' />\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
+      <RemoveFile Id='rm_wvndprov.dll' On='uninstall'\r
+            Property="SystemFolder"\r
+            Name="wvndprov.dll" />\r
+      <RemoveFile Id='rm_ndinstall.exe' On='uninstall'\r
+            Property="SystemFolder"\r
+            Name="ndinstal.exe" LongName='ndinstall.exe' />\r
 \r
     </Component>\r
  </Directory>\r