[ofw] [PATCH] Add Winverbs ND provider to WinOF

[Smith, Stan]

Signed-off-by: stan smith <stan.smith at intel.com>

Revision: 2520
Author: stansmith
Date: 2:03:09 PM, Thursday, October 29, 2009
Message:
[WINOF] Include Winverbs ND provider plus ndinstall.exe for all architectures.
----
Modified : /gen1/trunk/WinOF/WIX/common/ipoib.inc

--- C:/Documents and Settings/scsmith/Local Settings/Temp/ipoib.inc-revBASE.svn000.tmp.inc      Thu Oct 29 14:00:40 2009
+++ C:/Documents and Settings/scsmith/My Documents/openIB-windows/SVN/gen1/trunk/WinOF/WIX/common/ipoib.inc     Wed Oct 28 09:20:00 2009
@@ -47,13 +47,18 @@

       <?endif?>

+      <File Id="ndinstall.exe" Compressed="yes" DiskId="1"
+            LongName="ndinstall.exe" Name="NDINSTAL.EXE"
+            Source="..\bin\net\$(var.ARCH)\ndinstall.exe" />
+
+      <File Id="wvndprov.dll" Compressed="yes" DiskId="1"
+            LongName="wvndprov.dll" Name="wvndprov.DLL"
+            Source="..\bin\net\$(var.ARCH)\wvndprov.dll" />
+
       <?if $(var.ARCHP) != "ia64" ?>
           <File Id="ibndprov.dll" Compressed="yes" DiskId="1"
                 LongName="ibndprov.dll" Name="IBNDPROV.DLL"
                 Source="..\bin\net\$(var.ARCH)\ibndprov.dll" />
-          <File Id="ndinstall.exe" Compressed="yes" DiskId="1"
-                LongName="ndinstall.exe" Name="NDINSTAL.EXE"
-                Source="..\bin\net\$(var.ARCH)\ndinstall.exe" />
       <?endif?>

       <?if $(var.ARCHP) = "x64" ?>
@@ -64,6 +69,9 @@
           <RemoveFile Id='rm64_ibndprov.dll' On='uninstall'
                  Property="System64Folder"
                  Name="ibndpr32.dll" LongName='ibndprov32.dll' />
+          <RemoveFile Id='rm64_wvndprov.dll' On='uninstall'
+                 Property="System64Folder"
+                 Name="wvndpr.dll" LongName='wvndprov.dll' />
           <RemoveFile Id='rm64_ndinstall.exe' On='uninstall'
                  Property="System64Folder"
                  Name="ndinstal.exe" LongName='ndinstall.exe' />
@@ -80,9 +88,12 @@
       <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' />
+      <RemoveFile Id='rm_wvndprov.dll' On='uninstall'
+            Property="SystemFolder"
+            Name="wvndprov.dll" />
+      <RemoveFile Id='rm_ndinstall.exe' On='uninstall'
+            Property="SystemFolder"
+            Name="ndinstal.exe" LongName='ndinstall.exe' />

     </Component>
  </Directory>