[WinOF] support ND on all architectures. Even though ia64 is not technically supporte...

ND is a selectable install feature; netipoib.inf always installs the base ND files. For WinSvr-2008 'ndinstall.exe -i' is auto-run, all other OS/arch flavors no auto-run.

Winverbs is a selectable install feature; off by default.

CustomActions.vbs - HCA install has changed to be simpler for the common case, a single HCA, by installing PCI\VEN_15B3 thus allowing the .inf file to deal with matching the correct Device ID.
For multiple mixed HCA installs (mthca & mlx4), VEN_15B3 is not unique, so the install reverts to the previous WinOF 1.1 install method of installing by device ID; with a small optimization being applied.
The 1.1 install method was to traverse a list of DeviceIDs installing until success or EOL; once for mlx4 and then again for mthca. The optimization is to query and install for the resident DeviceID. The idea is to optimize for success instead of accepting install failures until the resident DeviceID is found.
Additionally the installer doesn't have to hard-core ConnectX DeviceIDs, although mthca DeviceIDs are hard coded - I believe mthca DeviceIDs are not likely to be changing. The method is for mlx4, verify the DeviceID is not mthca and then install (future proof).

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

diff --git a/branches/WinOF/WIX/CustomActions.vbs b/branches/WinOF/WIX/CustomActions.vbs
index 55f74e4f5db3af88d5ab917aac9db7062efc1fb6..443f8e3ed58a3c4c08a59fe89c7fabdb3ebc7765 100644 (file)
--- a/branches/WinOF/WIX/CustomActions.vbs
+++ b/branches/WinOF/WIX/CustomActions.vbs
@@ -246,16 +246,27 @@ Function RemoveDriverFiles()
     \r
     FileDelete(sSYS32 & "ibal.dll")\r
     FileDelete(sSYS32 & "ibald.dll")\r
+    FileDelete(sSYS32 & "ibal32.dll")\r
+    FileDelete(sSYS32 & "ibal32d.dll")\r
     FileDelete(sSYS32 & "complib.dll")\r
     FileDelete(sSYS32 & "complibd.dll")\r
+    FileDelete(sSYS32 & "cl32.dll")\r
+    FileDelete(sSYS32 & "cl32d.dll")\r
     FileDelete(sSYS32 & "mthcau.dll")\r
     FileDelete(sSYS32 & "mthcaud.dll")\r
+    FileDelete(sSYS32 & "mthca32.dll")\r
+    FileDelete(sSYS32 & "mthca32d.dll")\r
     FileDelete(sSYS32 & "mlx4u.dll")\r
     FileDelete(sSYS32 & "mlx4ud.dll")\r
+    FileDelete(sSYS32 & "mlx4u32.dll")\r
+    FileDelete(sSYS32 & "mlx4u32d.dll")\r
     FileDelete(sSYS32 & "ibsrp.dll")\r
     FileDelete(sSYS32 & "ibsrpd.dll")\r
     FileDelete(sSYS32 & "IbInstaller.dll")\r
     FileDelete(sSYS32 & "ibwsd.dll")\r
+    FileDelete(sSYS32 & "ibndprov.dll")\r
+    FileDelete(sSYS32 & "ibndprov32.dll")\r
+    FileDelete(sSYS32 & "ndinstall.exe")\r
 \r
     If (MTARCH <> "x86") Then\r
                FileDelete(sSYSWOW64 & "ibal.dll")\r
@@ -573,7 +584,40 @@ End Function
 \r
 '------------------------------------------------------------------------\r
 \r
+' Find PCI devices using devcon findall.\r
 \r
+Function Find_PCI_devs(exe,tag)\r
+    Dim cmd\r
+\r
+       Set WshShell = CreateObject("WScript.Shell")\r
+\r
+       cmd = exe & " findall * | find """ & tag & """"\r
+       Set connExec = WshShell.Exec(cmd)\r
+    If Err Then\r
+        msgbox "Shell.Exec err: " & cmd\r
+        Exit Function\r
+    End if\r
+\r
+       Find_PCI_devs = split(connExec.StdOut.ReadAll, vbCrLF)\r
+\r
+End Function\r
+\r
+\r
+Function IsInfiniHost(ID)\r
+    Dim dID\r
+       HCAs = Array("5A44","5A45","6278","6279","6282","5E8C","5E8D","6274","6275")\r
+\r
+    For each dID in HCAs\r
+        If dID = ID Then\r
+            IsInfiniHost = 1\r
+'msgbox "match ID " & ID & " dID " & dID\r
+            Exit Function\r
+        End if\r
+       Next\r
+'msgbox "NO match ID " & ID \r
+    IsInfiniHost = 0\r
+\r
+End Function\r
 \r
 \r
 ''''''''''' Driver Install ''''''''''''\r
@@ -613,10 +657,10 @@ Function DriverInstall()
 \r
     devmanEXE = sInstalldir & "IBcore\devman.exe "\r
     devmanEXE1 = "..\IBcore\devman.exe "\r
-    devman =    "cmd.exe /c cd " & sInstalldir & "IBcore & devman.exe "\r
-    devmanNET = "cmd.exe /c cd " & sInstalldir & "net & " & devmanEXE1\r
-    devmanQL =  "cmd.exe /c cd " & sInstalldir & "qlgcvnic & " & devmanEXE1\r
-    devmanSRP = "cmd.exe /c cd " & sInstalldir & "SRP & " & devmanEXE1\r
+    devman =    "cmd.exe /c cd /d " & sInstalldir & "IBcore & devman.exe "\r
+    devmanNET = "cmd.exe /c cd /d " & sInstalldir & "net & " & devmanEXE1\r
+    devmanQL =  "cmd.exe /c cd /d " & sInstalldir & "qlgcvnic & " & devmanEXE1\r
+    devmanSRP = "cmd.exe /c cd /d " & sInstalldir & "SRP & " & devmanEXE1\r
 \r
     Set WshShell = CreateObject("WScript.Shell")\r
     Set fso = CreateObject("Scripting.FileSystemObject")\r
@@ -644,69 +688,113 @@ Function DriverInstall()
     DrvInstalled = false\r
        IBbusGUID = "{94f41ced-78eb-407c-b5df-958040af0fd8}"\r
 \r
-    ' ConnectX (mlx4) HCA?\r
+       ' what HCAs are selected to install?\r
+       have_mlx4 = 0\r
+       have_mthca = 0\r
 \r
-    If fso.FileExists(sInstalldir & "IBcore\mlx4_hca.inf") Then\r
+       If fso.FileExists(sInstalldir & "IBcore\mlx4_hca.inf") Then\r
+               have_mlx4 = 1\r
+       End If\r
 \r
-               ' WORKAROUND - force load ibbus driver\r
-        cmd = devman & "install ib_bus.inf {94f41ced-78eb-407c-b5df-958040af0fd8}"\r
-        Return = WshShell.Run (cmd,0,true)\r
-               ' END_WORKAROUND\r
+       If fso.FileExists(sInstalldir & "IBcore\mthca.inf") Then\r
+               have_mthca = 1\r
+       End If\r
 \r
-               Xdevs = Array("6340","634A","6354","6732","673C","0191")\r
+       have_mixed_HCAs = 0\r
+       If have_mthca AND have_mlx4 Then\r
+               have_mixed_HCAs = 1\r
+       End If\r
+\r
+    ' Need to install ConnectX (mlx4) HCA driver?\r
 \r
-        For each dev in Xdevs\r
-                       mlxdev = """PCI\VEN_15B3&DEV_" & dev & """"\r
-                       cmd = devman & "update mlx4_bus.inf " & mlxdev\r
+    If have_mlx4 Then\r
+               ' if not mixed HCA types, then install based on Vendor ID\r
+               If have_mixed_HCAs = 0 Then\r
+                       cmd = devman & "install mlx4_bus.inf PCI\VEN_15B3"\r
                        Return = WshShell.Run (cmd,0,true)\r
-            If Return = 0 Then\r
-                DrvInstalled = true\r
-                Exit For\r
-            End If\r
-               Next\r
+               If Return = 0 Then\r
+                               DrvInstalled = true\r
+                       End If\r
+               Else\r
+                       ' install mlx4_bus, be specific as VEN_15B3 is not unique between\r
+                       ' mlx4 and InfiniHost (mthca) devices.\r
+\r
+                       dev_list = Find_PCI_devs(devman,"VEN_15B3")\r
+                       cmd = "No matching mlx4 Device IDs found?"\r
+               For each Dev in dev_list\r
+                               If Dev <> "" Then\r
+                                       mlxdev = Left(Dev,(Instr(dev,"SUBSYS")-2))\r
+                                       DevID = Right(mlxdev,4)\r
+                                       If IsInfiniHost( DevID ) = 0 Then\r
+                                               cmd = devman & "install mlx4_bus.inf """ & mlxdev & """"\r
+                                               Return = WshShell.Run (cmd,0,true)\r
+' msgbox "rc " & Return & " " & cmd\r
+                               If Return = 0 Then\r
+                                       DrvInstalled = true\r
+                                       Exit For\r
+                               End If\r
+                                       End if\r
+                               End if\r
+                       Next\r
+               End if\r
 \r
                If DrvInstalled <> true Then\r
-            msgbox "HCA Install failed - mlx4_bus.inf PCI\VEN_15B3&DEV_*"\r
+            msgbox "ConnectX HCA Install failed (" & Return & ") - " & cmd\r
                        Return = WshShell.Run (devman & "remove " & IBbusGUID,0,true)\r
             DriverInstall=ERROR_INSTALL_FAILURE\r
             Exit Function\r
                End if\r
 \r
-        cmd = devman & "update mlx4_hca.inf MLX4\CONNECTX_HCA"\r
+        cmd = devman & "install mlx4_hca.inf MLX4\CONNECTX_HCA"\r
         Return = WshShell.Run (cmd,0,true)\r
         ' Display error number and description if applicable\r
         If Err Then ShowError\r
         If Return <> 0 Then\r
-            msgbox "HCA Install - update mlx4_hca.inf MLX4\CONNECTX_HCA Ret=" _\r
+            msgbox "HCA Install - mlx4_hca.inf MLX4\CONNECTX_HCA Ret=" _\r
                      & Return & " Err=" & Err\r
             DriverInstall=ERROR_INSTALL_FAILURE\r
             ' cleanup device database.\r
             Return = WshShell.Run (devman & "remove " & mlxdev, 0, true)\r
                        Return = WshShell.Run (devman & "remove " & IBbusGUID,0,true)\r
             Exit Function\r
-        End if\r
-    End if\r
-\r
-    ' InfiniHost HCA (mthca)?\r
+        End If\r
+    End If\r
 \r
-    If fso.FileExists(sInstalldir & "IBcore\mthca.inf") Then\r
+    ' Need an InfiniHost (mthca) HCA driver?\r
 \r
+    If have_mthca Then\r
                DrvInstalled = false\r
-\r
-               devs = Array("5A44","5A45","6278","6279","6282","5E8C","5E8D",_\r
-                                        "6274","6275")\r
-        For each dev in devs\r
-                       idev = """PCI\VEN_15B3&DEV_" & dev & """"\r
-            cmd = devman & "update mthca.inf " & idev\r
-            Return = WshShell.Run (cmd,0,true)\r
-            If Return = 0 Then\r
-                DrvInstalled = true\r
-                Exit For\r
-            End If\r
-        Next\r
+               ' if not mixed HCA types, then install based on Vendor ID\r
+               If have_mixed_HCAs = 0 Then\r
+               cmd = devman & "install mthca.inf PCI\VEN_15B3"\r
+               Return = WshShell.Run (cmd,0,true)\r
+               If Return = 0 Then\r
+               DrvInstalled = true\r
+                       End If\r
+               Else\r
+                       ' install InfiniHost (mthca), be specific as VEN_15B3 is not unique\r
+                       ' between mlx4 and InfiniHost (mthca) devices.\r
+               dev_list = Find_PCI_devs(devman,"VEN_15B3")\r
+                       cmd = "No InfiniHost Device IDs found?"\r
+               For each dev in dev_list\r
+                               If dev <> "" Then\r
+                                       idev = Left(dev,(Instr(dev,"SUBSYS")-2))\r
+                                       DevID = Right(idev,4)\r
+                                       If IsInfiniHost( DevID ) = 1 Then\r
+                               cmd = devman & "install mthca.inf """ & idev & """"\r
+                               Return = WshShell.Run (cmd,0,true)\r
+                               If Return = 0 Then\r
+                                       DrvInstalled = true\r
+                                       Exit For\r
+                               End If\r
+                                       End if\r
+                               End If\r
+               Next\r
+               End If\r
 \r
                If DrvInstalled <> true Then\r
-            msgbox "HCA Install failed - mthca.inf PCI\VEN_15B3&DEV_*"\r
+            msgbox "InfiniHost(mthca) HCA Install failed (" & Return & _\r
+                                       ") - " & cmd\r
             ' cleanup device database.\r
                        Return = WshShell.Run (devman & "remove " & IBbusGUID,0,true)\r
             DriverInstall=ERROR_INSTALL_FAILURE\r
@@ -734,7 +822,7 @@ Function DriverInstall()
 \r
     If fso.FileExists(sInstalldir & "qlgcvnic\netvnic.inf") OR _\r
        fso.FileExists(sInstalldir & "SRP\ib_srp.inf") Then\r
-       rc = WshShell.Run (devman & "update ib_bus.inf IBA\IB_IOU",0,true)\r
+       rc = WshShell.Run (devman & "install ib_iou.inf IBA\IB_IOU",0,true)\r
        If Err Then ShowError\r
     end if\r
 \r
@@ -743,7 +831,7 @@ Function DriverInstall()
         devID = "IBA\V00066AP00000030"\r
         Err.clear\r
         Return = WshShell.Run (devmanQL & "disable " & devID, 0, true)\r
-        Return = WshShell.Run (devmanQL & "update netvnic.inf " & devID,0,true)\r
+        Return = WshShell.Run (devmanQL & "install netvnic.inf " & devID,0,true)\r
                ' Display error number and description if applicable\r
         If Err Then ShowErr2("qlgcvnic\qlgcvnic.sys")\r
         Return = WshShell.Run (devmanQL & "enable " & devID, 0, true)\r
@@ -756,7 +844,7 @@ Function DriverInstall()
         'InfiniBand SRP Miniport: IBA\C0100C609EP0108 or IBA\CFF00C609EP0108\r
         ' one driver handles all three.\r
         devID = "IBA\V00066AP00000038"\r
-        Return = WshShell.Run (devmanSRP & "update ib_srp.inf " & devID,0,true)\r
+        Return = WshShell.Run (devmanSRP & "install ib_srp.inf " & devID,0,true)\r
         ' Display error number and description if applicable\r
         If Err Then ShowErr2("SRP\ib_srp.inf")\r
     End if\r
@@ -927,13 +1015,15 @@ Function Uninstall_IB_Devices(sInstalldir)
       Return = WshShell.Run (devmanDAAT & "IBA\IPOIB\*", 0, true)\r
       Return = WshShell.Run (devmanRMAT & "IBA\IPOIB\*", 0, true)\r
 \r
-      ' Remove HCAs\r
-      ' Return = WshShell.Run (devman & "disable PCI\VEN_15B3*", 0, true)\r
-      ' Return = WshShell.Run (devman & "remove PCI\VEN_15B3*", 0, true)\r
+      ' Disable & Remove HCAs\r
 \r
       Return = WshShell.Run (devmanDAAT & "PCI\VEN_15B3*", 0, true)\r
       Return = WshShell.Run (devmanRMAT & "PCI\VEN_15B3*", 0, true)\r
-      If Err Then ShowError\r
+\r
+      ' ibbus GUID\r
+      Return = WshShell.Run (devman & "remove {94F41CED-78EB-407C-B5DF-958040AF0FD8",0,true)\r
+      Return = WshShell.Run (devmanRMAT & "ROOT\INFINIBANDCONTROLLER\*",0,true)\r
+      Return = WshShell.Run (devmanRMAT & "MLX4\CONNECTX_HCA\*", 0, true)\r
 \r
       ' Remove InfiniBand Bus/Fabric class driver\r
 \r
@@ -967,15 +1057,16 @@ Sub DriverUninstall()
       ' otherwise, remove the service: ND (Network Direct) then WinSock Direct.\r
 \r
       If (Session.Property("VersionNT") <> 501) Then\r
-          if fso.FileExists(sInstalldir & "ndinstall.exe") Then\r
-             Return = WshShell.Run ("cmd.exe /c cd " & sInstalldir & _\r
-                                 " & ndinstall.exe -r", 0, true)\r
-          End If\r
           if fso.FileExists(sInstalldir & "installsp.exe") Then\r
              Return = WshShell.Run ("cmd.exe /c cd " & sInstalldir & _\r
                                  " & installsp.exe -r", 0, true)\r
           End If\r
       End If\r
+\r
+      if fso.FileExists(sInstalldir & "net\ndinstall.exe") Then\r
+          Return = WshShell.Run ("cmd.exe /c cd " & sInstalldir & _\r
+                                 " & net\ndinstall.exe -r", 0, true)\r
+      End If\r
       \r
       ' stop the openSM service in case it was started.\r
       Return = WshShell.Run ("cmd.exe /c sc.exe stop opensm", 0, true)\r
@@ -1041,9 +1132,6 @@ End Sub
 ' Enable WSD if installsp.exe was installed (feature Winsock direct selected).\r
 ' For Windows XP, this CustomAction should not be called as WSD is not\r
 ' supported on XP.\r
-' ND (Network Direct) is closely bound to WSD and follows the same support\r
-' rules. If the WSD feature is selected (default is selected, except for XP)\r
-' then installsp.exe & ndinstall.exe will be present. Enable WSD & ND.\r
 \r
 Sub WSDEnable()\r
       Dim sInstalldir, WshShell, fso\r
@@ -1060,13 +1148,27 @@ Sub WSDEnable()
       End If\r
       If Err Then ShowError\r
 \r
-      ' Start the Network Direct Service.\r
-      If fso.FileExists(sInstalldir & "ndinstall.exe") Then\r
-          ' install the Network Direct Service\r
-         Return = WshShell.Run ("cmd.exe /c cd " & sInstalldir _\r
-                                 & " & ndinstall.exe -i", 0, true)\r
-      End If\r
-      If Err Then ShowError\r
+End Sub\r
+\r
+\r
+' This sub will only be called if the feature ND start was selected.\r
+' See WIX src file - ND_start\r
+\r
+Sub ND_StartMeUp()\r
+      Dim sInstalldir, WshShell, fso\r
+\r
+      sInstalldir = Session.Property("INSTALLDIR")\r
+\r
+      Set WshShell = CreateObject("WScript.Shell")\r
+      Set fso = CreateObject("Scripting.FileSystemObject")\r
+\r
+    ' Start the Network Direct Service if installed\r
+\r
+    If fso.FileExists(sInstalldir & "net\ndinstall.exe") Then\r
+        Return = WshShell.Run ("cmd.exe /c cd " & sInstalldir _\r
+                               & " & net\ndinstall.exe -i", 0, true)\r
+        If Err Then ShowErr2("ND service install failed")\r
+    End If\r
 \r
 End Sub\r
 \r

diff --git a/branches/WinOF/WIX/wlh/ia64/wof.wxs b/branches/WinOF/WIX/wlh/ia64/wof.wxs
index 8bb3bf6c320d17ad01440e376adaa92a90001a6e..194c674699baa71bd73b4d30ec56641637afcd02 100644 (file)
--- a/branches/WinOF/WIX/wlh/ia64/wof.wxs
+++ b/branches/WinOF/WIX/wlh/ia64/wof.wxs
@@ -271,6 +271,12 @@
               <File Id="ibiou.sys" Compressed="yes" DiskId="1"\r
                      LongName="ibiou.sys" Name="IBIOU.SYS"\r
                      Source="..\bin\HCA\ia64\ibiou.sys" />\r
+              <File Id="ib_iou.cat" Compressed="yes" DiskId="1"\r
+                     LongName="ib_iou.cat" Name="IB_IOU.cat"\r
+                     Source="..\bin\HCA\ia64\ib_iou.cat" />\r
+              <File Id="ib_iou.inf" Compressed="yes" DiskId="1"\r
+                     LongName="ib_iou.inf" Name="IB_IOU.inf"\r
+                     Source="..\bin\HCA\ia64\ib_iou.inf" />\r
             </Component>\r
 \r
             <Component Id="cMthcaDriver"\r
@@ -412,6 +418,106 @@ End Remove -->
             </Directory>\r
           </Directory>\r
 \r
+          <Directory Id="wvDir" Name="WinVerbs">\r
+             <Component Id="cWinVerbsKernel"\r
+                       Guid="F5FA1491-E2D2-4f22-9549-07C61F86BFEB">\r
+               <CreateFolder />\r
+\r
+               <File Id="winverbs.inf" Compressed="yes" DiskId="1"\r
+                     LongName="winverbs.inf" Name="winverbs.INF"\r
+                     Source="..\bin\HCA\ia64\winverbs.inf" />\r
+               <File Id="winverbs.sys" Compressed="yes" DiskId="1"\r
+                     LongName="winverbs.sys" Name="winverbs.sys"\r
+                     Source="..\bin\HCA\ia64\winverbs.sys" />\r
+               <File Id="winverbs.cat" Compressed="yes" DiskId="1"\r
+                     LongName="winverbs.cat" Name="winverbs.cat"\r
+                     Source="..\bin\HCA\ia64\winverbs.cat" />\r
+               <File Id="winverbs.dll" Compressed="yes" DiskId="1"\r
+                     LongName="winverbs.dll" Name="winvrbs.dll"\r
+                     Source="..\bin\HCA\ia64\winverbs.dll" />\r
+               <File Id="winverbsd.dll" Compressed="yes" DiskId="1"\r
+                     LongName="winverbsd.dll" Name="winvrbsd.dll"\r
+                     Source="..\bin\HCA\ia64\winverbsd.dll" />\r
+             </Component>\r
+\r
+             <Component Id="cWinVerbsUser"\r
+                       Guid="20916BB0-5E16-49bb-BE9F-3A202D760E72">\r
+   \r
+               <File Id="winverbs.lib" Compressed="yes" DiskId="1"\r
+                     LongName="winverbs.lib" Name="winverbs.lib"\r
+                     Source="..\bin\HCA\ia64\winverbs.lib" />\r
+               <CopyFile Id="dupWverbs.lib" FileId="winverbs.lib"\r
+                     DestinationName="winverbs.lib"\r
+                     DestinationProperty="WindowsFolder" />\r
+   \r
+               <File Id="winverbsd.lib" Compressed="yes" DiskId="1"\r
+                     LongName="winverbsd.lib" Name="winvrbsd.lib"\r
+                     Source="..\bin\HCA\ia64\winverbsd.lib" />\r
+   \r
+               <File Id="libibverbs.dll" Compressed="yes" DiskId="1"\r
+                     LongName="libibverbs.dll" Name="ibverbs.dll"\r
+                     Source="..\bin\HCA\ia64\libibverbs.dll" />\r
+               <CopyFile Id="dupLibibv.dll" FileId="libibverbs.dll"\r
+                     DestinationName="ibverbs.dll"\r
+                     DestinationLongName="libibverbs.dll"\r
+                     DestinationProperty="WindowsFolder" />\r
+   \r
+               <File Id="libibverbs.lib" Compressed="yes" DiskId="1"\r
+                     LongName="libibverbs.lib" Name="ibverbs.lib"\r
+                     Source="..\bin\HCA\ia64\libibverbs.lib" />\r
+               <CopyFile Id="dupLibibv.lib" FileId="libibverbs.lib"\r
+                     DestinationName="ibverbs.lib"\r
+                     DestinationLongName="libibverbs.lib"\r
+                     DestinationProperty="WindowsFolder" />\r
+   \r
+               <File Id="libibverbsd.dll" Compressed="yes" DiskId="1"\r
+                     LongName="libibverbsd.dll" Name="ibverbsd.dll"\r
+                     Source="..\bin\HCA\ia64\libibverbsd.dll" />\r
+   \r
+               <File Id="libibverbsd.lib" Compressed="yes" DiskId="1"\r
+                     LongName="libibverbsd.lib" Name="ibverbsd.lib"\r
+                     Source="..\bin\HCA\ia64\libibverbsd.lib" />\r
+             </Component>\r
+          </Directory>\r
+\r
+          <Component Id="cWinVerbsUApps"\r
+                    Guid="ECAB2829-AE65-4ef8-8214-9A89E5BBDB9A">\r
+\r
+            <File Id="ibv_asyncwatch.exe" Compressed="yes" DiskId="1"\r
+                  LongName="ibv_asyncwatch.exe" Name="asyncwat.exe"\r
+                  Source="..\bin\tools\ia64\release\ibv_asyncwatch.exe" />\r
+            <File Id="ibv_devinfo.exe" Compressed="yes" DiskId="1"\r
+                  LongName="ibv_devinfo.exe" Name="devinfo.exe"\r
+                  Source="..\bin\tools\ia64\release\ibv_devinfo.exe" />\r
+            <File Id="ibv_rc_pingpong.exe" Compressed="yes" DiskId="1"\r
+                  LongName="ibv_rc_pingpong.exe" Name="ibv_rc_p.exe"\r
+                  Source="..\bin\tools\ia64\release\ibv_rc_pingpong.exe" />\r
+            <File Id="ibv_read_bw.exe" Compressed="yes" DiskId="1"\r
+                  LongName="ibv_read_bw.exe" Name="readbw.exe"\r
+                  Source="..\bin\tools\ia64\release\ibv_read_bw.exe" />\r
+            <File Id="ibv_read_lat.exe" Compressed="yes" DiskId="1"\r
+                  LongName="ibv_read_lat.exe" Name="readlat.exe"\r
+                  Source="..\bin\tools\ia64\release\ibv_read_lat.exe" />\r
+            <File Id="ibv_send_bw.exe" Compressed="yes" DiskId="1"\r
+                  LongName="ibv_send_bw.exe" Name="send_bw.exe"\r
+                  Source="..\bin\tools\ia64\release\ibv_send_bw.exe" />\r
+            <File Id="ibv_send_lat.exe" Compressed="yes" DiskId="1"\r
+                  LongName="ibv_send_lat.exe" Name="send_lat.exe"\r
+                  Source="..\bin\tools\ia64\release\ibv_send_lat.exe" />\r
+            <File Id="ibv_uc_pingpong.exe" Compressed="yes" DiskId="1"\r
+                  LongName="ibv_uc_pingpong.exe" Name="uc_ping.exe"\r
+                  Source="..\bin\tools\ia64\release\ibv_uc_pingpong.exe" />\r
+            <File Id="ibv_ud_pingpong.exe" Compressed="yes" DiskId="1"\r
+                  LongName="ibv_ud_pingpong.exe" Name="ud_ping.exe"\r
+                  Source="..\bin\tools\ia64\release\ibv_ud_pingpong.exe" />\r
+            <File Id="ibv_write_bw.exe" Compressed="yes" DiskId="1"\r
+                  LongName="ibv_write_bw.exe" Name="write_bw.exe"\r
+                  Source="..\bin\tools\ia64\release\ibv_write_bw.exe" />\r
+            <File Id="ibv_write_lat.exe" Compressed="yes" DiskId="1"\r
+                  LongName="ibv_write_lat.exe" Name="writelat.exe"\r
+                  Source="..\bin\tools\ia64\release\ibv_write_lat.exe" />\r
+          </Component>\r
+\r
           <Directory Id="ipoibDir" Name="net">\r
             <Component Id="IPoIB" Guid="18CC13CC-0D29-4B88-8F03-854CE0C6AF94">\r
               <CreateFolder />\r
@@ -439,6 +545,9 @@ End Remove -->
               <File Id="ibndprov32.dll" Compressed="yes" DiskId="1"\r
                      LongName="ibndprov32.dll" Name="IBNDPR32.DLL"\r
                      Source="..\bin\net\ia64\ibndprov32.dll" />\r
+              <File Id="ndinstall.exe" Compressed="yes" DiskId="1"\r
+                     LongName="ndinstall.exe" Name="NDINSTAL.EXE"\r
+                     Source="..\bin\net\ia64\ndinstall.exe" />\r
             </Component>\r
           </Directory>\r
 \r
@@ -448,6 +557,11 @@ End Remove -->
                      LongName="installsp.exe" Name="INSTALL.EXE"\r
                      Source="..\bin\net\ia64\installsp.exe" />\r
           </Component>\r
+<!-- when ND works for ia64\r
+          <Component Id="cNetworkDirect"\r
+                           Guid="F3BA9E15-E532-4b8c-BB0C-E8C1CC0EEF3F">\r
+          </Component>\r
+-->\r
 \r
           <Component Id="cDAPL1RT" Guid="A49F1ECC-14E4-4310-9F37-BEB7B00243A9">\r
               <File Id="dapl32.dll" Compressed="yes" DiskId="1"\r
@@ -1132,6 +1246,15 @@ End Remove -->
       <ComponentRef Id="OpenSMservice" />\r
     </Feature>\r
 \r
+    <Feature Id="fWV" Title="WinVerbs"\r
+        Description="OFED verbs API for Windows"\r
+        Display="expand" Level="2" ConfigurableDirectory="INSTALLDIR"\r
+        AllowAdvertise="no" InstallDefault="local" Absent="allow">\r
+        <ComponentRef Id="cWinVerbsKernel" />\r
+        <ComponentRef Id="cWinVerbsUser" />\r
+        <ComponentRef Id="cWinVerbsUApps" />\r
+    </Feature>\r
+\r
     <Feature Id="fIPoIB" Title="IPoIB" Level="1"\r
          Description="Internet Protocols over InfiniBand" Display="expand"\r
          ConfigurableDirectory="INSTALLDIR"\r
@@ -1148,6 +1271,15 @@ End Remove -->
       <ComponentRef Id="WinsockDirect" />\r
     </Feature>\r
 \r
+<!-- when ND on ia64 works\r
+    <Feature Id="fND" Title="Network Direct"\r
+        Description="Network Direct Enabled"\r
+        Display="expand" Level="2" ConfigurableDirectory="INSTALLDIR"\r
+        AllowAdvertise="no" InstallDefault="local" Absent="allow">\r
+        <ComponentRef Id="cNetworkDirect" />\r
+        <Condition Level="201"> IPOIB_EXISTS </Condition> \r
+    </Feature>\r
+-->\r
     <Feature Id="fDAPL" Title="DAPL" Description="DAT/DAPL over InfiniBand"\r
          Display="collapse" Level="1" ConfigurableDirectory="INSTALLDIR"\r
          AllowAdvertise='no' InstallDefault='local' Absent='allow'>\r
@@ -1251,12 +1383,15 @@ End Remove -->
     <CustomAction Id='DriverUninstall' BinaryKey='CA'\r
          VBScriptCall='DriverUninstall' Return='check' />\r
 \r
-    <CustomAction Id='WSD_start' BinaryKey='CA'\r
+    <CustomAction Id='WSDStart' BinaryKey='CA'\r
          VBScriptCall='WSDEnable' Return='check' />\r
 \r
     <CustomAction Id="OpenSM_start" BinaryKey="CA"\r
          VBScriptCall="OpenSM_StartMeUp" Return="check" />\r
 \r
+    <CustomAction Id="ND_start" BinaryKey="CA"\r
+         VBScriptCall="ND_StartMeUp" Return="check" />\r
+\r
     <CustomAction Id='HammerTime' BinaryKey='CA'\r
          VBScriptCall='HammerTime' Return='check' />\r
 \r
@@ -1277,13 +1412,16 @@ End Remove -->
        <Custom Action="DriverInstall" After='PatchFiles'>\r
                Not Installed</Custom>\r
 \r
-       <Custom Action="WSD_start" After='InstallFinalize'>\r
+       <Custom Action="WSDStart" After='InstallFinalize'>\r
                Not Installed</Custom>\r
 \r
-       <Custom Action="OpenSM_start" After="WSD_start">\r
-          ($OpenSM_Service_enabled = 3) AND  Not Installed </Custom>\r
+       <Custom Action="OpenSM_start" After="WSDStart">\r
+          ($OpenSM_Service_enabled = 3) AND Not Installed </Custom>\r
+\r
+       <Custom Action="ND_start" After="OpenSM_start">\r
+          ($cNetworkDirect = 3) AND Not Installed </Custom>\r
 \r
-       <Custom Action="BcastRegChanged" After="OpenSM_start">\r
+       <Custom Action="BcastRegChanged" After="ND_start">\r
                Not Installed</Custom>\r
 \r
        <!--> REMOVE ONLY </!-->\r

diff --git a/branches/WinOF/WIX/wlh/x64/wof.wxs b/branches/WinOF/WIX/wlh/x64/wof.wxs
index fbe8a8fa37098663e17391400b67d6990ceae748..7de34129d2b7f250cf2201c3bfda61c4714835a6 100644 (file)
--- a/branches/WinOF/WIX/wlh/x64/wof.wxs
+++ b/branches/WinOF/WIX/wlh/x64/wof.wxs
@@ -273,6 +273,12 @@
               <File Id="ibiou.sys" Compressed="yes" DiskId="1"\r
                      LongName="ibiou.sys" Name="IBIOU.SYS"\r
                      Source="..\bin\HCA\amd64\ibiou.sys" />\r
+              <File Id="ib_iou.cat" Compressed="yes" DiskId="1"\r
+                     LongName="ib_iou.cat" Name="IB_IOU.cat"\r
+                     Source="..\bin\HCA\amd64\ib_iou.cat" />\r
+              <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
             </Component>\r
 \r
             <Component Id="cMthcaDriver"\r
@@ -439,6 +445,106 @@
             </Directory>\r
           </Directory>\r
      \r
+          <Directory Id="wvDir" Name="WinVerbs">\r
+             <Component Id="cWinVerbsKernel"\r
+                       Guid="F5FA1491-E2D2-4f22-9549-07C61F86BFEB">\r
+               <CreateFolder />\r
+\r
+               <File Id="winverbs.inf" Compressed="yes" DiskId="1"\r
+                     LongName="winverbs.inf" Name="winverbs.INF"\r
+                     Source="..\bin\HCA\amd64\winverbs.inf" />\r
+               <File Id="winverbs.sys" Compressed="yes" DiskId="1"\r
+                     LongName="winverbs.sys" Name="winverbs.sys"\r
+                     Source="..\bin\HCA\amd64\winverbs.sys" />\r
+               <File Id="winverbs.cat" Compressed="yes" DiskId="1"\r
+                     LongName="winverbs.cat" Name="winverbs.cat"\r
+                     Source="..\bin\HCA\amd64\winverbs.cat" />\r
+               <File Id="winverbs.dll" Compressed="yes" DiskId="1"\r
+                     LongName="winverbs.dll" Name="winvrbs.dll"\r
+                     Source="..\bin\HCA\amd64\winverbs.dll" />\r
+               <File Id="winverbsd.dll" Compressed="yes" DiskId="1"\r
+                     LongName="winverbsd.dll" Name="winvrbsd.dll"\r
+                     Source="..\bin\HCA\amd64\winverbsd.dll" />\r
+             </Component>\r
+\r
+             <Component Id="cWinVerbsUser"\r
+                       Guid="20916BB0-5E16-49bb-BE9F-3A202D760E72">\r
+\r
+               <File Id="winverbs.lib" Compressed="yes" DiskId="1"\r
+                     LongName="winverbs.lib" Name="winverbs.lib"\r
+                     Source="..\bin\HCA\amd64\winverbs.lib" />\r
+               <CopyFile Id="dupWverbs.lib" FileId="winverbs.lib"\r
+                     DestinationName="winverbs.lib"\r
+                     DestinationProperty="WindowsFolder" />\r
+\r
+               <File Id="winverbsd.lib" Compressed="yes" DiskId="1"\r
+                     LongName="winverbsd.lib" Name="winvrbsd.lib"\r
+                     Source="..\bin\HCA\amd64\winverbsd.lib" />\r
+\r
+               <File Id="libibverbs.dll" Compressed="yes" DiskId="1"\r
+                     LongName="libibverbs.dll" Name="ibverbs.dll"\r
+                     Source="..\bin\HCA\amd64\libibverbs.dll" />\r
+               <CopyFile Id="dupLibibv.dll" FileId="libibverbs.dll"\r
+                     DestinationName="ibverbs.dll"\r
+                     DestinationLongName="libibverbs.dll"\r
+                     DestinationProperty="WindowsFolder" />\r
+\r
+               <File Id="libibverbs.lib" Compressed="yes" DiskId="1"\r
+                     LongName="libibverbs.lib" Name="ibverbs.lib"\r
+                     Source="..\bin\HCA\amd64\libibverbs.lib" />\r
+               <CopyFile Id="dupLibibv.lib" FileId="libibverbs.lib"\r
+                     DestinationName="ibverbs.lib"\r
+                     DestinationLongName="libibverbs.lib"\r
+                     DestinationProperty="WindowsFolder" />\r
+\r
+               <File Id="libibverbsd.dll" Compressed="yes" DiskId="1"\r
+                     LongName="libibverbsd.dll" Name="ibverbsd.dll"\r
+                     Source="..\bin\HCA\amd64\libibverbsd.dll" />\r
+\r
+               <File Id="libibverbsd.lib" Compressed="yes" DiskId="1"\r
+                     LongName="libibverbsd.lib" Name="ibverbsd.lib"\r
+                     Source="..\bin\HCA\amd64\libibverbsd.lib" />\r
+             </Component>\r
+          </Directory>\r
+\r
+          <Component Id="cWinVerbsUApps"\r
+                    Guid="ECAB2829-AE65-4ef8-8214-9A89E5BBDB9A">\r
+\r
+            <File Id="ibv_asyncwatch.exe" Compressed="yes" DiskId="1"\r
+                  LongName="ibv_asyncwatch.exe" Name="asyncwat.exe"\r
+                  Source="..\bin\tools\amd64\release\ibv_asyncwatch.exe" />\r
+            <File Id="ibv_devinfo.exe" Compressed="yes" DiskId="1"\r
+                  LongName="ibv_devinfo.exe" Name="devinfo.exe"\r
+                  Source="..\bin\tools\amd64\release\ibv_devinfo.exe" />\r
+            <File Id="ibv_rc_pingpong.exe" Compressed="yes" DiskId="1"\r
+                  LongName="ibv_rc_pingpong.exe" Name="ibv_rc_p.exe"\r
+                  Source="..\bin\tools\amd64\release\ibv_rc_pingpong.exe" />\r
+            <File Id="ibv_read_bw.exe" Compressed="yes" DiskId="1"\r
+                  LongName="ibv_read_bw.exe" Name="readbw.exe"\r
+                  Source="..\bin\tools\amd64\release\ibv_read_bw.exe" />\r
+            <File Id="ibv_read_lat.exe" Compressed="yes" DiskId="1"\r
+                  LongName="ibv_read_lat.exe" Name="readlat.exe"\r
+                  Source="..\bin\tools\amd64\release\ibv_read_lat.exe" />\r
+            <File Id="ibv_send_bw.exe" Compressed="yes" DiskId="1"\r
+                  LongName="ibv_send_bw.exe" Name="send_bw.exe"\r
+                  Source="..\bin\tools\amd64\release\ibv_send_bw.exe" />\r
+            <File Id="ibv_send_lat.exe" Compressed="yes" DiskId="1"\r
+                  LongName="ibv_send_lat.exe" Name="send_lat.exe"\r
+                  Source="..\bin\tools\amd64\release\ibv_send_lat.exe" />\r
+            <File Id="ibv_uc_pingpong.exe" Compressed="yes" DiskId="1"\r
+                  LongName="ibv_uc_pingpong.exe" Name="uc_ping.exe"\r
+                  Source="..\bin\tools\amd64\release\ibv_uc_pingpong.exe" />\r
+            <File Id="ibv_ud_pingpong.exe" Compressed="yes" DiskId="1"\r
+                  LongName="ibv_ud_pingpong.exe" Name="ud_ping.exe"\r
+                  Source="..\bin\tools\amd64\release\ibv_ud_pingpong.exe" />\r
+            <File Id="ibv_write_bw.exe" Compressed="yes" DiskId="1"\r
+                  LongName="ibv_write_bw.exe" Name="write_bw.exe"\r
+                  Source="..\bin\tools\amd64\release\ibv_write_bw.exe" />\r
+            <File Id="ibv_write_lat.exe" Compressed="yes" DiskId="1"\r
+                  LongName="ibv_write_lat.exe" Name="writelat.exe"\r
+                  Source="..\bin\tools\amd64\release\ibv_write_lat.exe" />\r
+          </Component>\r
+\r
           <Directory Id="ipoibDir" Name="net">\r
             <Component Id="IPoIB" Guid="18CC13CC-0D29-4B88-8F03-854CE0C6AF94">\r
               <CreateFolder />\r
@@ -466,6 +572,9 @@
               <File Id="ibndprov32.dll" Compressed="yes" DiskId="1"\r
                      LongName="ibndprov32.dll" Name="IBNDPR32.DLL"\r
                      Source="..\bin\net\amd64\ibndprov32.dll" />\r
+              <File Id="ndinstall.exe" Compressed="yes" DiskId="1"\r
+                     LongName="ndinstall.exe" Name="NDINSTAL.EXE"\r
+                     Source="..\bin\net\amd64\ndinstall.exe" />\r
             </Component>\r
           </Directory>\r
 \r
@@ -474,9 +583,10 @@
             <File Id="installsp.exe" Compressed="yes" DiskId="1"\r
                      LongName="installsp.exe" Name="INSTALL.EXE"\r
                      Source="..\bin\net\amd64\installsp.exe" />\r
-            <File Id="ndinstall.exe" Compressed="yes" DiskId="1"\r
-                     LongName="ndinstall.exe" Name="NDINSTAL.EXE"\r
-                     Source="..\bin\net\amd64\ndinstall.exe" />\r
+          </Component>\r
+\r
+          <Component Id="cNetworkDirect"\r
+                     Guid="F3BA9E15-E532-4b8c-BB0C-E8C1CC0EEF3F">\r
           </Component>\r
 \r
           <Component Id="cDAPL1RT" Guid="A49F1ECC-14E4-4310-9F37-BEB7B00243A9">\r
@@ -1167,6 +1277,15 @@
       <ComponentRef Id="OpenSMservice" />\r
     </Feature>\r
 \r
+    <Feature Id="fWV" Title="WinVerbs"\r
+        Description="OFED verbs API for Windows"\r
+        Display="expand" Level="2" ConfigurableDirectory="INSTALLDIR"\r
+        AllowAdvertise="no" InstallDefault="local" Absent="allow">\r
+        <ComponentRef Id="cWinVerbsKernel" />\r
+        <ComponentRef Id="cWinVerbsUser" />\r
+        <ComponentRef Id="cWinVerbsUApps" />\r
+    </Feature>\r
+\r
     <Feature Id="fIPoIB" Title="IPoIB" Level="1"\r
          Description="Internet Protocols over InfiniBand" Display="expand"\r
          ConfigurableDirectory="INSTALLDIR"\r
@@ -1183,6 +1302,14 @@
       <ComponentRef Id="WinsockDirect" />\r
     </Feature>\r
 \r
+    <Feature Id="fND" Title="Network Direct"\r
+        Description="Network Direct Enabled"\r
+        Display="expand" Level="1" ConfigurableDirectory="INSTALLDIR"\r
+        AllowAdvertise="no" InstallDefault="local" Absent="allow">\r
+        <ComponentRef Id="cNetworkDirect" />\r
+        <Condition Level="201"> IPOIB_EXISTS </Condition>\r
+    </Feature>\r
+\r
     <Feature Id="fDAPL" Title="DAPL" Description="DAT+DAPL over InfiniBand"\r
          Display="collapse" Level="1" ConfigurableDirectory="INSTALLDIR"\r
          AllowAdvertise='no' InstallDefault='local' Absent='allow'>\r
@@ -1286,12 +1413,15 @@
     <CustomAction Id='DriverUninstall' BinaryKey='CA'\r
          VBScriptCall='DriverUninstall' Return='check' />\r
 \r
-    <CustomAction Id='WSD_start' BinaryKey='CA'\r
+    <CustomAction Id='WSDStart' BinaryKey='CA'\r
          VBScriptCall='WSDEnable' Return='check' />\r
 \r
     <CustomAction Id="OpenSM_start" BinaryKey="CA"\r
          VBScriptCall="OpenSM_StartMeUp" Return="check" />\r
  \r
+    <CustomAction Id="ND_start" BinaryKey="CA"\r
+         VBScriptCall="ND_StartMeUp" Return="check" />\r
+\r
     <CustomAction Id='HammerTime' BinaryKey='CA'\r
          VBScriptCall='HammerTime' Return='check' />\r
 \r
@@ -1312,13 +1442,16 @@
        <Custom Action="DriverInstall" After='PatchFiles'>\r
                Not Installed</Custom>\r
 \r
-       <Custom Action="WSD_start" After='InstallFinalize'>\r
+       <Custom Action="WSDStart" After='InstallFinalize'>\r
                Not Installed</Custom>\r
 \r
-       <Custom Action="OpenSM_start" After="WSD_start">\r
+       <Custom Action="OpenSM_start" After="WSDStart">\r
           ($OpenSM_Service_enabled = 3) AND  Not Installed </Custom>\r
 \r
-       <Custom Action="BcastRegChanged" After="OpenSM_start">\r
+       <Custom Action="ND_start" After="OpenSM_start">\r
+          ($cNetworkDirect = 3) AND  Not Installed </Custom>\r
+\r
+       <Custom Action="BcastRegChanged" After="ND_start">\r
            Not Installed</Custom>\r
 \r
        <!--> REMOVE ONLY </!-->\r

diff --git a/branches/WinOF/WIX/wlh/x86/wof.wxs b/branches/WinOF/WIX/wlh/x86/wof.wxs
index a8c63976de9336ed0a32389daf14ad00bb94e69c..3fbda2c3da562d422a2494c5c56fdaa8e5491332 100644 (file)
--- a/branches/WinOF/WIX/wlh/x86/wof.wxs
+++ b/branches/WinOF/WIX/wlh/x86/wof.wxs
@@ -245,6 +245,12 @@
                         <File Id="ibiou.sys" Compressed="yes" DiskId="1"\r
                               LongName="ibiou.sys" Name="IBIOU.SYS"\r
                               Source="..\bin\HCA\x86\ibiou.sys" />\r
+                        <File Id="ib_iou.cat" Compressed="yes" DiskId="1"\r
+                              LongName="ib_iou.cat" Name="IB_iou.cat"\r
+                              Source="..\bin\HCA\x86\ib_iou.cat" />\r
+                        <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
                     </Component>\r
 \r
                     <Component Id="cMthcaDriver"\r
@@ -389,6 +395,106 @@
                   </Directory>\r
                 </Directory>\r
 \r
+                <Directory Id="wvDir" Name="WinVerbs">\r
+                   <Component Id="cWinVerbsKernel"\r
+                             Guid="F5FA1491-E2D2-4f22-9549-07C61F86BFEB">\r
+                     <CreateFolder />\r
+\r
+                     <File Id="winverbs.inf" Compressed="yes" DiskId="1"\r
+                           LongName="winverbs.inf" Name="winverbs.INF"\r
+                           Source="..\bin\HCA\x86\winverbs.inf" />\r
+                     <File Id="winverbs.sys" Compressed="yes" DiskId="1"\r
+                           LongName="winverbs.sys" Name="winverbs.sys"\r
+                           Source="..\bin\HCA\x86\winverbs.sys" />\r
+                     <File Id="winverbs.cat" Compressed="yes" DiskId="1"\r
+                           LongName="winverbs.cat" Name="winverbs.cat"\r
+                           Source="..\bin\HCA\x86\winverbs.cat" />\r
+                     <File Id="winverbs.dll" Compressed="yes" DiskId="1"\r
+                           LongName="winverbs.dll" Name="winvrbs.dll"\r
+                           Source="..\bin\HCA\x86\winverbs.dll" />\r
+                     <File Id="winverbsd.dll" Compressed="yes" DiskId="1"\r
+                           LongName="winverbsd.dll" Name="winvrbsd.dll"\r
+                           Source="..\bin\HCA\x86\winverbsd.dll" />\r
+                   </Component>\r
+\r
+                   <Component Id="cWinVerbsUser"\r
+                             Guid="20916BB0-5E16-49bb-BE9F-3A202D760E72">\r
+\r
+                     <File Id="winverbs.lib" Compressed="yes" DiskId="1"\r
+                           LongName="winverbs.lib" Name="winverbs.lib"\r
+                           Source="..\bin\HCA\x86\winverbs.lib" />\r
+                     <CopyFile Id="dupWverbs.lib" FileId="winverbs.lib"\r
+                           DestinationName="winverbs.lib"\r
+                           DestinationProperty="WindowsFolder" />\r
+\r
+                     <File Id="winverbsd.lib" Compressed="yes" DiskId="1"\r
+                           LongName="winverbsd.lib" Name="winvrbsd.lib"\r
+                           Source="..\bin\HCA\x86\winverbsd.lib" />\r
+\r
+                     <File Id="libibverbs.dll" Compressed="yes" DiskId="1"\r
+                           LongName="libibverbs.dll" Name="ibverbs.dll"\r
+                           Source="..\bin\HCA\x86\libibverbs.dll" />\r
+                     <CopyFile Id="dupLibibv.dll" FileId="libibverbs.dll"\r
+                           DestinationName="ibverbs.dll"\r
+                           DestinationLongName="libibverbs.dll"\r
+                           DestinationProperty="WindowsFolder" />\r
+\r
+                     <File Id="libibverbs.lib" Compressed="yes" DiskId="1"\r
+                           LongName="libibverbs.lib" Name="ibverbs.lib"\r
+                           Source="..\bin\HCA\x86\libibverbs.lib" />\r
+                     <CopyFile Id="dupLibibv.lib" FileId="libibverbs.lib"\r
+                           DestinationName="ibverbs.lib"\r
+                           DestinationLongName="libibverbs.lib"\r
+                           DestinationProperty="WindowsFolder" />\r
+\r
+                     <File Id="libibverbsd.dll" Compressed="yes" DiskId="1"\r
+                           LongName="libibverbsd.dll" Name="ibverbsd.dll"\r
+                           Source="..\bin\HCA\x86\libibverbsd.dll" />\r
+\r
+                     <File Id="libibverbsd.lib" Compressed="yes" DiskId="1"\r
+                           LongName="libibverbsd.lib" Name="ibverbsd.lib"\r
+                           Source="..\bin\HCA\x86\libibverbsd.lib" />\r
+                   </Component>\r
+                </Directory>\r
+\r
+                <Component Id="cWinVerbsUApps"\r
+                          Guid="ECAB2829-AE65-4ef8-8214-9A89E5BBDB9A">\r
+\r
+                  <File Id="ibv_asyncwatch.exe" Compressed="yes" DiskId="1"\r
+                        LongName="ibv_asyncwatch.exe" Name="asyncwat.exe"\r
+                        Source="..\bin\tools\x86\release\ibv_asyncwatch.exe" />\r
+                  <File Id="ibv_devinfo.exe" Compressed="yes" DiskId="1"\r
+                        LongName="ibv_devinfo.exe" Name="devinfo.exe"\r
+                        Source="..\bin\tools\x86\release\ibv_devinfo.exe" />\r
+                  <File Id="ibv_rc_pingpong.exe" Compressed="yes" DiskId="1"\r
+                        LongName="ibv_rc_pingpong.exe" Name="ibv_rc_p.exe"\r
+                        Source="..\bin\tools\x86\release\ibv_rc_pingpong.exe" />\r
+                  <File Id="ibv_read_bw.exe" Compressed="yes" DiskId="1"\r
+                        LongName="ibv_read_bw.exe" Name="readbw.exe"\r
+                        Source="..\bin\tools\x86\release\ibv_read_bw.exe" />\r
+                  <File Id="ibv_read_lat.exe" Compressed="yes" DiskId="1"\r
+                        LongName="ibv_read_lat.exe" Name="readlat.exe"\r
+                        Source="..\bin\tools\x86\release\ibv_read_lat.exe" />\r
+                  <File Id="ibv_send_bw.exe" Compressed="yes" DiskId="1"\r
+                        LongName="ibv_send_bw.exe" Name="send_bw.exe"\r
+                        Source="..\bin\tools\x86\release\ibv_send_bw.exe" />\r
+                  <File Id="ibv_send_lat.exe" Compressed="yes" DiskId="1"\r
+                        LongName="ibv_send_lat.exe" Name="send_lat.exe"\r
+                        Source="..\bin\tools\x86\release\ibv_send_lat.exe" />\r
+                  <File Id="ibv_uc_pingpong.exe" Compressed="yes" DiskId="1"\r
+                        LongName="ibv_uc_pingpong.exe" Name="uc_ping.exe"\r
+                        Source="..\bin\tools\x86\release\ibv_uc_pingpong.exe" />\r
+                  <File Id="ibv_ud_pingpong.exe" Compressed="yes" DiskId="1"\r
+                        LongName="ibv_ud_pingpong.exe" Name="ud_ping.exe"\r
+                        Source="..\bin\tools\x86\release\ibv_ud_pingpong.exe" />\r
+                  <File Id="ibv_write_bw.exe" Compressed="yes" DiskId="1"\r
+                        LongName="ibv_write_bw.exe" Name="write_bw.exe"\r
+                        Source="..\bin\tools\x86\release\ibv_write_bw.exe" />\r
+                  <File Id="ibv_write_lat.exe" Compressed="yes" DiskId="1"\r
+                        LongName="ibv_write_lat.exe" Name="writelat.exe"\r
+                        Source="..\bin\tools\x86\release\ibv_write_lat.exe" />\r
+                </Component>\r
+\r
                 <Directory Id="ipoibDir" Name="net">\r
                     <Component Id="IPoIB"\r
                                Guid="18CC13CC-0D29-4B88-8F03-854CE0C6AF94">\r
@@ -408,6 +514,9 @@
                         <File Id="ibndprov.dll" Compressed="yes" DiskId="1"\r
                               LongName="ibndprov.dll" Name="IBNDPROV.DLL"\r
                               Source="..\bin\net\x86\ibndprov.dll" />\r
+                        <File Id="ndinstall.exe" Compressed="yes" DiskId="1"\r
+                              LongName="ndinstall.exe" Name="NDINSTAL.EXE"\r
+                              Source="..\bin\net\x86\ndinstall.exe" />\r
                     </Component>\r
                 </Directory>\r
 \r
@@ -416,9 +525,10 @@
                     <File Id="installsp.exe" Compressed="yes" DiskId="1"\r
                               LongName="installsp.exe" Name="INSTALL.EXE"\r
                               Source="..\bin\net\x86\installsp.exe" />\r
-                    <File Id="ndinstall.exe" Compressed="yes" DiskId="1"\r
-                              LongName="ndinstall.exe" Name="NDINSTAL.EXE"\r
-                              Source="..\bin\net\x86\ndinstall.exe" />\r
+                </Component>\r
+\r
+                <Component Id="cNetworkDirect"\r
+                           Guid="F3BA9E15-E532-4b8c-BB0C-E8C1CC0EEF3F">\r
                 </Component>\r
 \r
                 <Component Id="cDAPL1RT"\r
@@ -1057,6 +1167,15 @@
         <ComponentRef Id="OpenSMservice" />\r
     </Feature>\r
 \r
+    <Feature Id="fWV" Title="WinVerbs"\r
+        Description="OFED verbs API for Windows"\r
+        Display="expand" Level="2" ConfigurableDirectory="INSTALLDIR"\r
+        AllowAdvertise="no" InstallDefault="local" Absent="allow">\r
+        <ComponentRef Id="cWinVerbsKernel" />\r
+        <ComponentRef Id="cWinVerbsUser" />\r
+        <ComponentRef Id="cWinVerbsUApps" />\r
+    </Feature>\r
+\r
     <Feature Id="fIPoIB" Title="IPoIB" Level="1"\r
         Description="Internet Protocols over InfiniBand" Display="expand"\r
         ConfigurableDirectory="INSTALLDIR" AllowAdvertise="no"\r
@@ -1072,6 +1191,13 @@
         <ComponentRef Id="WinsockDirect" />\r
     </Feature>\r
 \r
+    <Feature Id="fND" Title="Network Direct"\r
+        Description="Network Direct Enabled"\r
+        Display="expand" Level="2" ConfigurableDirectory="INSTALLDIR"\r
+        AllowAdvertise="no" InstallDefault="local" Absent="allow">\r
+        <ComponentRef Id="cNetworkDirect" />\r
+    </Feature>\r
+\r
     <Feature Id="fDAPL" Title="DAPL" Description="DAT/DAPL over InfiniBand"\r
         Display="collapse" Level="1" ConfigurableDirectory="INSTALLDIR"\r
         AllowAdvertise="no" InstallDefault="local" Absent="allow">\r
@@ -1179,12 +1305,15 @@
     <CustomAction Id="DriverUninstall" BinaryKey="CA"\r
          VBScriptCall="DriverUninstall" Return="check" />\r
 \r
-    <CustomAction Id="WSD_start" BinaryKey="CA"\r
+    <CustomAction Id="WSDStart" BinaryKey="CA"\r
          VBScriptCall="WSDEnable" Return="check" />\r
 \r
     <CustomAction Id="OpenSM_start" BinaryKey="CA"\r
          VBScriptCall="OpenSM_StartMeUp" Return="check" />\r
 \r
+    <CustomAction Id="ND_start" BinaryKey="CA"\r
+         VBScriptCall="ND_StartMeUp" Return="check" />\r
+\r
     <CustomAction Id="HammerTime" BinaryKey="CA"\r
          VBScriptCall="HammerTime" Return="check" />\r
 \r
@@ -1204,13 +1333,16 @@
 \r
        <Custom Action="DriverInstall" After="PatchFiles"> Not Installed</Custom>\r
 \r
-       <Custom Action="WSD_start" After="InstallFinalize">\r
+       <Custom Action="WSDStart" After="InstallFinalize">\r
            Not Installed</Custom>\r
 \r
-       <Custom Action="OpenSM_start" After="WSD_start">\r
+       <Custom Action="OpenSM_start" After="WSDStart">\r
           ($OpenSM_Service_enabled = 3) AND  Not Installed </Custom>\r
 \r
-       <Custom Action="BcastRegChanged" After="OpenSM_start">\r
+       <Custom Action="ND_start" After="OpenSM_start">\r
+          ($cNetworkDirect = 3) AND  Not Installed </Custom>\r
+\r
+       <Custom Action="BcastRegChanged" After="ND_start">\r
            Not Installed</Custom>\r
 \r
        <!--> REMOVE ONLY </!-->\r

diff --git a/branches/WinOF/WIX/wnet/ia64/wof.wxs b/branches/WinOF/WIX/wnet/ia64/wof.wxs
index f0c64051d2c164004ba67463d7730753d5a24574..a7e2be5d2bab600ea80e0a02c13d9009969bb11d 100644 (file)
--- a/branches/WinOF/WIX/wnet/ia64/wof.wxs
+++ b/branches/WinOF/WIX/wnet/ia64/wof.wxs
@@ -272,6 +272,12 @@
               <File Id="ibiou.sys" Compressed="yes" DiskId="1"\r
                      LongName="ibiou.sys" Name="IBIOU.SYS"\r
                      Source="..\bin\HCA\ia64\ibiou.sys" />\r
+              <File Id="ib_iou.cat" Compressed="yes" DiskId="1"\r
+                     LongName="ib_iou.cat" Name="IB_iou.cat"\r
+                     Source="..\bin\HCA\ia64\ib_iou.cat" />\r
+              <File Id="ib_iou.inf" Compressed="yes" DiskId="1"\r
+                     LongName="ib_iou.inf" Name="IB_iou.inf"\r
+                     Source="..\bin\HCA\ia64\ib_iou.inf" />\r
             </Component>\r
 \r
             <Component Id="cMthcaDriver"\r
@@ -416,6 +422,106 @@ End Remove -->
             </Directory>\r
           </Directory>\r
 \r
+          <Directory Id="wvDir" Name="WinVerbs">\r
+             <Component Id="cWinVerbsKernel"\r
+                       Guid="F5FA1491-E2D2-4f22-9549-07C61F86BFEB">\r
+               <CreateFolder />\r
+\r
+               <File Id="winverbs.inf" Compressed="yes" DiskId="1"\r
+                     LongName="winverbs.inf" Name="winverbs.INF"\r
+                     Source="..\bin\HCA\ia64\winverbs.inf" />\r
+               <File Id="winverbs.sys" Compressed="yes" DiskId="1"\r
+                     LongName="winverbs.sys" Name="winverbs.sys"\r
+                     Source="..\bin\HCA\ia64\winverbs.sys" />\r
+               <File Id="winverbs.cat" Compressed="yes" DiskId="1"\r
+                     LongName="winverbs.cat" Name="winverbs.cat"\r
+                     Source="..\bin\HCA\ia64\winverbs.cat" />\r
+               <File Id="winverbs.dll" Compressed="yes" DiskId="1"\r
+                     LongName="winverbs.dll" Name="winvrbs.dll"\r
+                     Source="..\bin\HCA\ia64\winverbs.dll" />\r
+               <File Id="winverbsd.dll" Compressed="yes" DiskId="1"\r
+                     LongName="winverbsd.dll" Name="winvrbsd.dll"\r
+                     Source="..\bin\HCA\ia64\winverbsd.dll" />\r
+             </Component>\r
+\r
+             <Component Id="cWinVerbsUser"\r
+                       Guid="20916BB0-5E16-49bb-BE9F-3A202D760E72">\r
+\r
+               <File Id="winverbs.lib" Compressed="yes" DiskId="1"\r
+                     LongName="winverbs.lib" Name="winverbs.lib"\r
+                     Source="..\bin\HCA\ia64\winverbs.lib" />\r
+               <CopyFile Id="dupWverbs.lib" FileId="winverbs.lib"\r
+                     DestinationName="winverbs.lib"\r
+                     DestinationProperty="WindowsFolder" />\r
+\r
+               <File Id="winverbsd.lib" Compressed="yes" DiskId="1"\r
+                     LongName="winverbsd.lib" Name="winvrbsd.lib"\r
+                     Source="..\bin\HCA\ia64\winverbsd.lib" />\r
+\r
+               <File Id="libibverbs.dll" Compressed="yes" DiskId="1"\r
+                     LongName="libibverbs.dll" Name="ibverbs.dll"\r
+                     Source="..\bin\HCA\ia64\libibverbs.dll" />\r
+               <CopyFile Id="dupLibibv.dll" FileId="libibverbs.dll"\r
+                     DestinationName="ibverbs.dll"\r
+                     DestinationLongName="libibverbs.dll"\r
+                     DestinationProperty="WindowsFolder" />\r
+\r
+               <File Id="libibverbs.lib" Compressed="yes" DiskId="1"\r
+                     LongName="libibverbs.lib" Name="ibverbs.lib"\r
+                     Source="..\bin\HCA\ia64\libibverbs.lib" />\r
+               <CopyFile Id="dupLibibv.lib" FileId="libibverbs.lib"\r
+                     DestinationName="ibverbs.lib"\r
+                     DestinationLongName="libibverbs.lib"\r
+                     DestinationProperty="WindowsFolder" />\r
+\r
+               <File Id="libibverbsd.dll" Compressed="yes" DiskId="1"\r
+                     LongName="libibverbsd.dll" Name="ibverbsd.dll"\r
+                     Source="..\bin\HCA\ia64\libibverbsd.dll" />\r
+\r
+               <File Id="libibverbsd.lib" Compressed="yes" DiskId="1"\r
+                     LongName="libibverbsd.lib" Name="ibverbsd.lib"\r
+                     Source="..\bin\HCA\ia64\libibverbsd.lib" />\r
+             </Component>\r
+          </Directory>\r
+\r
+          <Component Id="cWinVerbsUApps"\r
+                    Guid="ECAB2829-AE65-4ef8-8214-9A89E5BBDB9A">\r
+\r
+            <File Id="ibv_asyncwatch.exe" Compressed="yes" DiskId="1"\r
+                  LongName="ibv_asyncwatch.exe" Name="asyncwat.exe"\r
+                  Source="..\bin\tools\ia64\release\ibv_asyncwatch.exe" />\r
+            <File Id="ibv_devinfo.exe" Compressed="yes" DiskId="1"\r
+                  LongName="ibv_devinfo.exe" Name="devinfo.exe"\r
+                  Source="..\bin\tools\ia64\release\ibv_devinfo.exe" />\r
+            <File Id="ibv_rc_pingpong.exe" Compressed="yes" DiskId="1"\r
+                  LongName="ibv_rc_pingpong.exe" Name="ibv_rc_p.exe"\r
+                  Source="..\bin\tools\ia64\release\ibv_rc_pingpong.exe" />\r
+            <File Id="ibv_read_bw.exe" Compressed="yes" DiskId="1"\r
+                  LongName="ibv_read_bw.exe" Name="readbw.exe"\r
+                  Source="..\bin\tools\ia64\release\ibv_read_bw.exe" />\r
+            <File Id="ibv_read_lat.exe" Compressed="yes" DiskId="1"\r
+                  LongName="ibv_read_lat.exe" Name="readlat.exe"\r
+                  Source="..\bin\tools\ia64\release\ibv_read_lat.exe" />\r
+            <File Id="ibv_send_bw.exe" Compressed="yes" DiskId="1"\r
+                  LongName="ibv_send_bw.exe" Name="send_bw.exe"\r
+                  Source="..\bin\tools\ia64\release\ibv_send_bw.exe" />\r
+            <File Id="ibv_send_lat.exe" Compressed="yes" DiskId="1"\r
+                  LongName="ibv_send_lat.exe" Name="send_lat.exe"\r
+                  Source="..\bin\tools\ia64\release\ibv_send_lat.exe" />\r
+            <File Id="ibv_uc_pingpong.exe" Compressed="yes" DiskId="1"\r
+                  LongName="ibv_uc_pingpong.exe" Name="uc_ping.exe"\r
+                  Source="..\bin\tools\ia64\release\ibv_uc_pingpong.exe" />\r
+            <File Id="ibv_ud_pingpong.exe" Compressed="yes" DiskId="1"\r
+                  LongName="ibv_ud_pingpong.exe" Name="ud_ping.exe"\r
+                  Source="..\bin\tools\ia64\release\ibv_ud_pingpong.exe" />\r
+            <File Id="ibv_write_bw.exe" Compressed="yes" DiskId="1"\r
+                  LongName="ibv_write_bw.exe" Name="write_bw.exe"\r
+                  Source="..\bin\tools\ia64\release\ibv_write_bw.exe" />\r
+            <File Id="ibv_write_lat.exe" Compressed="yes" DiskId="1"\r
+                  LongName="ibv_write_lat.exe" Name="writelat.exe"\r
+                  Source="..\bin\tools\ia64\release\ibv_write_lat.exe" />\r
+          </Component>\r
+\r
           <Directory Id="ipoibDir" Name="net">\r
             <Component Id="IPoIB" Guid="18CC13CC-0D29-4B88-8F03-854CE0C6AF94">\r
               <CreateFolder />\r
@@ -443,6 +549,9 @@ End Remove -->
               <File Id="ibndprov32.dll" Compressed="yes" DiskId="1"\r
                      LongName="ibndprov32.dll" Name="IBNDPR32.DLL"\r
                      Source="..\bin\net\ia64\ibndprov32.dll" />\r
+             <File Id="ndinstall.exe" Compressed="yes" DiskId="1"\r
+                      LongName="ndinstall.exe" Name="NDINSTAL.EXE"\r
+                      Source="..\bin\net\ia64\ndinstall.exe" />\r
             </Component>\r
           </Directory>\r
 \r
@@ -452,7 +561,11 @@ End Remove -->
                      LongName="installsp.exe" Name="INSTALL.EXE"\r
                      Source="..\bin\net\ia64\installsp.exe" />\r
           </Component>\r
-\r
+<!-- when ND works for ia64\r
+          <Component Id="cNetworkDirect"\r
+                     Guid="F3BA9E15-E532-4b8c-BB0C-E8C1CC0EEF3F">\r
+          </Component>\r
+-->\r
           <Component Id="cDAPL1RT" Guid="A49F1ECC-14E4-4310-9F37-BEB7B00243A9">\r
               <File Id="dapl32.dll" Compressed="yes" DiskId="1"\r
                      LongName="dapl32.dll" Name="DAPL32.DLL"\r
@@ -1136,6 +1249,15 @@ End Remove -->
       <ComponentRef Id="OpenSMservice" />\r
     </Feature>\r
 \r
+    <Feature Id="fWV" Title="WinVerbs"\r
+        Description="OFED verbs API for Windows"\r
+        Display="expand" Level="2" ConfigurableDirectory="INSTALLDIR"\r
+        AllowAdvertise="no" InstallDefault="local" Absent="allow">\r
+        <ComponentRef Id="cWinVerbsKernel" />\r
+        <ComponentRef Id="cWinVerbsUser" />\r
+        <ComponentRef Id="cWinVerbsUApps" />\r
+    </Feature>\r
+\r
     <Feature Id="fIPoIB" Title="IPoIB" Level="1"\r
          Description="Internet Protocols over InfiniBand" Display="expand"\r
          ConfigurableDirectory="INSTALLDIR"\r
@@ -1152,6 +1274,14 @@ End Remove -->
       <ComponentRef Id="WinsockDirect" />\r
     </Feature>\r
 \r
+<!-- when ND on ia64 works.\r
+    <Feature Id="fND" Title="Network Direct"\r
+        Description="Network Direct Enabled"\r
+        Display="expand" Level="2" ConfigurableDirectory="INSTALLDIR"\r
+        AllowAdvertise="no" InstallDefault="local" Absent="allow">\r
+        <ComponentRef Id="cNetworkDirect" />\r
+    </Feature>\r
+-->\r
     <Feature Id="fDAPL" Title="DAPL" Description="DAT/DAPL over InfiniBand"\r
          Display="collapse" Level="1" ConfigurableDirectory="INSTALLDIR"\r
          AllowAdvertise='no' InstallDefault='local' Absent='allow'>\r
@@ -1255,12 +1385,15 @@ End Remove -->
     <CustomAction Id='DriverUninstall' BinaryKey='CA'\r
          VBScriptCall='DriverUninstall' Return='check' />\r
 \r
-    <CustomAction Id='WSD_start' BinaryKey='CA'\r
+    <CustomAction Id='WSDStart' BinaryKey='CA'\r
          VBScriptCall='WSDEnable' Return='check' />\r
 \r
     <CustomAction Id="OpenSM_start" BinaryKey="CA"\r
          VBScriptCall="OpenSM_StartMeUp" Return="check" />\r
 \r
+    <CustomAction Id="ND_start" BinaryKey="CA"\r
+         VBScriptCall="ND_StartMeUp" Return="check" />\r
+\r
     <CustomAction Id='HammerTime' BinaryKey='CA'\r
          VBScriptCall='HammerTime' Return='check' />\r
 \r
@@ -1281,13 +1414,16 @@ End Remove -->
        <Custom Action="DriverInstall" After='PatchFiles'>\r
                Not Installed</Custom>\r
 \r
-       <Custom Action="WSD_start" After='InstallFinalize'>\r
+       <Custom Action="WSDStart" After='InstallFinalize'>\r
                Not Installed</Custom>\r
 \r
-       <Custom Action="OpenSM_start" After="WSD_start">\r
+       <Custom Action="OpenSM_start" After="WSDStart">\r
           ($OpenSM_Service_enabled = 3) AND  Not Installed </Custom>\r
 \r
-       <Custom Action="BcastRegChanged" After="OpenSM_start">\r
+       <Custom Action="ND_start" After="OpenSM_start">\r
+          ($cNetworkDirect = 3) AND Not Installed </Custom>\r
+\r
+       <Custom Action="BcastRegChanged" After="ND_start">\r
                Not Installed</Custom>\r
 \r
        <!--> REMOVE ONLY </!-->\r

diff --git a/branches/WinOF/WIX/wnet/x64/wof.wxs b/branches/WinOF/WIX/wnet/x64/wof.wxs
index 0dbd31639a997d029acd665c06e02bc9802c318e..de6b1cb739f4037f230331a61ce45402175b3171 100644 (file)
--- a/branches/WinOF/WIX/wnet/x64/wof.wxs
+++ b/branches/WinOF/WIX/wnet/x64/wof.wxs
@@ -273,6 +273,12 @@
               <File Id="ibiou.sys" Compressed="yes" DiskId="1"\r
                      LongName="ibiou.sys" Name="IBIOU.SYS"\r
                      Source="..\bin\HCA\amd64\ibiou.sys" />\r
+              <File Id="ib_iou.cat" Compressed="yes" DiskId="1"\r
+                     LongName="ib_iou.cat" Name="IB_iou.cat"\r
+                     Source="..\bin\HCA\amd64\ib_iou.cat" />\r
+              <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
             </Component>\r
 \r
             <Component Id="cMthcaDriver"\r
@@ -439,6 +445,106 @@
             </Directory>\r
           </Directory>\r
      \r
+          <Directory Id="wvDir" Name="WinVerbs">\r
+             <Component Id="cWinVerbsKernel"\r
+                       Guid="F5FA1491-E2D2-4f22-9549-07C61F86BFEB">\r
+               <CreateFolder />\r
+\r
+               <File Id="winverbs.inf" Compressed="yes" DiskId="1"\r
+                     LongName="winverbs.inf" Name="winverbs.INF"\r
+                     Source="..\bin\HCA\amd64\winverbs.inf" />\r
+               <File Id="winverbs.sys" Compressed="yes" DiskId="1"\r
+                     LongName="winverbs.sys" Name="winverbs.sys"\r
+                     Source="..\bin\HCA\amd64\winverbs.sys" />\r
+               <File Id="winverbs.cat" Compressed="yes" DiskId="1"\r
+                     LongName="winverbs.cat" Name="winverbs.cat"\r
+                     Source="..\bin\HCA\amd64\winverbs.cat" />\r
+               <File Id="winverbs.dll" Compressed="yes" DiskId="1"\r
+                     LongName="winverbs.dll" Name="winvrbs.dll"\r
+                     Source="..\bin\HCA\amd64\winverbs.dll" />\r
+               <File Id="winverbsd.dll" Compressed="yes" DiskId="1"\r
+                     LongName="winverbsd.dll" Name="winvrbsd.dll"\r
+                     Source="..\bin\HCA\amd64\winverbsd.dll" />\r
+             </Component>\r
+\r
+             <Component Id="cWinVerbsUser"\r
+                       Guid="20916BB0-5E16-49bb-BE9F-3A202D760E72">\r
+\r
+               <File Id="winverbs.lib" Compressed="yes" DiskId="1"\r
+                     LongName="winverbs.lib" Name="winverbs.lib"\r
+                     Source="..\bin\HCA\amd64\winverbs.lib" />\r
+               <CopyFile Id="dupWverbs.lib" FileId="winverbs.lib"\r
+                     DestinationName="winverbs.lib"\r
+                     DestinationProperty="WindowsFolder" />\r
+\r
+               <File Id="winverbsd.lib" Compressed="yes" DiskId="1"\r
+                     LongName="winverbsd.lib" Name="winvrbsd.lib"\r
+                     Source="..\bin\HCA\amd64\winverbsd.lib" />\r
+\r
+               <File Id="libibverbs.dll" Compressed="yes" DiskId="1"\r
+                     LongName="libibverbs.dll" Name="ibverbs.dll"\r
+                     Source="..\bin\HCA\amd64\libibverbs.dll" />\r
+               <CopyFile Id="dupLibibv.dll" FileId="libibverbs.dll"\r
+                     DestinationName="ibverbs.dll"\r
+                     DestinationLongName="libibverbs.dll"\r
+                     DestinationProperty="WindowsFolder" />\r
+\r
+               <File Id="libibverbs.lib" Compressed="yes" DiskId="1"\r
+                     LongName="libibverbs.lib" Name="ibverbs.lib"\r
+                     Source="..\bin\HCA\amd64\libibverbs.lib" />\r
+               <CopyFile Id="dupLibibv.lib" FileId="libibverbs.lib"\r
+                     DestinationName="ibverbs.lib"\r
+                     DestinationLongName="libibverbs.lib"\r
+                     DestinationProperty="WindowsFolder" />\r
+\r
+               <File Id="libibverbsd.dll" Compressed="yes" DiskId="1"\r
+                     LongName="libibverbsd.dll" Name="ibverbsd.dll"\r
+                     Source="..\bin\HCA\amd64\libibverbsd.dll" />\r
+\r
+               <File Id="libibverbsd.lib" Compressed="yes" DiskId="1"\r
+                     LongName="libibverbsd.lib" Name="ibverbsd.lib"\r
+                     Source="..\bin\HCA\amd64\libibverbsd.lib" />\r
+             </Component>\r
+          </Directory>\r
+\r
+          <Component Id="cWinVerbsUApps"\r
+                    Guid="ECAB2829-AE65-4ef8-8214-9A89E5BBDB9A">\r
+\r
+            <File Id="ibv_asyncwatch.exe" Compressed="yes" DiskId="1"\r
+                  LongName="ibv_asyncwatch.exe" Name="asyncwat.exe"\r
+                  Source="..\bin\tools\amd64\release\ibv_asyncwatch.exe" />\r
+            <File Id="ibv_devinfo.exe" Compressed="yes" DiskId="1"\r
+                  LongName="ibv_devinfo.exe" Name="devinfo.exe"\r
+                  Source="..\bin\tools\amd64\release\ibv_devinfo.exe" />\r
+            <File Id="ibv_rc_pingpong.exe" Compressed="yes" DiskId="1"\r
+                  LongName="ibv_rc_pingpong.exe" Name="ibv_rc_p.exe"\r
+                  Source="..\bin\tools\amd64\release\ibv_rc_pingpong.exe" />\r
+            <File Id="ibv_read_bw.exe" Compressed="yes" DiskId="1"\r
+                  LongName="ibv_read_bw.exe" Name="readbw.exe"\r
+                  Source="..\bin\tools\amd64\release\ibv_read_bw.exe" />\r
+            <File Id="ibv_read_lat.exe" Compressed="yes" DiskId="1"\r
+                  LongName="ibv_read_lat.exe" Name="readlat.exe"\r
+                  Source="..\bin\tools\amd64\release\ibv_read_lat.exe" />\r
+            <File Id="ibv_send_bw.exe" Compressed="yes" DiskId="1"\r
+                  LongName="ibv_send_bw.exe" Name="send_bw.exe"\r
+                  Source="..\bin\tools\amd64\release\ibv_send_bw.exe" />\r
+            <File Id="ibv_send_lat.exe" Compressed="yes" DiskId="1"\r
+                  LongName="ibv_send_lat.exe" Name="send_lat.exe"\r
+                  Source="..\bin\tools\amd64\release\ibv_send_lat.exe" />\r
+            <File Id="ibv_uc_pingpong.exe" Compressed="yes" DiskId="1"\r
+                  LongName="ibv_uc_pingpong.exe" Name="uc_ping.exe"\r
+                  Source="..\bin\tools\amd64\release\ibv_uc_pingpong.exe" />\r
+            <File Id="ibv_ud_pingpong.exe" Compressed="yes" DiskId="1"\r
+                  LongName="ibv_ud_pingpong.exe" Name="ud_ping.exe"\r
+                  Source="..\bin\tools\amd64\release\ibv_ud_pingpong.exe" />\r
+            <File Id="ibv_write_bw.exe" Compressed="yes" DiskId="1"\r
+                  LongName="ibv_write_bw.exe" Name="write_bw.exe"\r
+                  Source="..\bin\tools\amd64\release\ibv_write_bw.exe" />\r
+            <File Id="ibv_write_lat.exe" Compressed="yes" DiskId="1"\r
+                  LongName="ibv_write_lat.exe" Name="writelat.exe"\r
+                  Source="..\bin\tools\amd64\release\ibv_write_lat.exe" />\r
+          </Component>\r
+\r
           <Directory Id="ipoibDir" Name="net">\r
             <Component Id="IPoIB" Guid="18CC13CC-0D29-4B88-8F03-854CE0C6AF94">\r
               <CreateFolder />\r
@@ -466,6 +572,9 @@
               <File Id="ibndprov32.dll" Compressed="yes" DiskId="1"\r
                      LongName="ibndprov32.dll" Name="IBNDPR32.DLL"\r
                      Source="..\bin\net\amd64\ibndprov32.dll" />\r
+              <File Id="ndinstall.exe" Compressed="yes" DiskId="1"\r
+                     LongName="ndinstall.exe" Name="NDINSTAL.EXE"\r
+                     Source="..\bin\net\amd64\ndinstall.exe" />\r
             </Component>\r
           </Directory>\r
 \r
@@ -474,9 +583,10 @@
             <File Id="installsp.exe" Compressed="yes" DiskId="1"\r
                      LongName="installsp.exe" Name="INSTALL.EXE"\r
                      Source="..\bin\net\amd64\installsp.exe" />\r
-            <File Id="ndinstall.exe" Compressed="yes" DiskId="1"\r
-                     LongName="ndinstall.exe" Name="INSTALL.EXE"\r
-                     Source="..\bin\net\amd64\ndinstall.exe" />\r
+          </Component>\r
+\r
+          <Component Id="cNetworkDirect"\r
+                     Guid="F3BA9E15-E532-4b8c-BB0C-E8C1CC0EEF3F">\r
           </Component>\r
 \r
           <Component Id="cDAPL1RT" Guid="A49F1ECC-14E4-4310-9F37-BEB7B00243A9">\r
@@ -1167,6 +1277,15 @@
       <ComponentRef Id="OpenSMservice" />\r
     </Feature>\r
 \r
+    <Feature Id="fWV" Title="WinVerbs"\r
+        Description="OFED verbs API for Windows"\r
+        Display="expand" Level="2" ConfigurableDirectory="INSTALLDIR"\r
+        AllowAdvertise="no" InstallDefault="local" Absent="allow">\r
+        <ComponentRef Id="cWinVerbsKernel" />\r
+        <ComponentRef Id="cWinVerbsUser" />\r
+        <ComponentRef Id="cWinVerbsUApps" />\r
+    </Feature>\r
+\r
     <Feature Id="fIPoIB" Title="IPoIB" Level="1"\r
          Description="Internet Protocols over InfiniBand" Display="expand"\r
          ConfigurableDirectory="INSTALLDIR"\r
@@ -1183,6 +1302,13 @@
       <ComponentRef Id="WinsockDirect" />\r
     </Feature>\r
 \r
+    <Feature Id="fND" Title="Network Direct"\r
+        Description="Network Direct Enabled"\r
+        Display="expand" Level="2" ConfigurableDirectory="INSTALLDIR"\r
+        AllowAdvertise="no" InstallDefault="local" Absent="allow">\r
+        <ComponentRef Id="cNetworkDirect" />\r
+    </Feature>\r
+\r
     <Feature Id="fDAPL" Title="DAPL" Description="DAT+DAPL over InfiniBand"\r
          Display="collapse" Level="1" ConfigurableDirectory="INSTALLDIR"\r
          AllowAdvertise='no' InstallDefault='local' Absent='allow'>\r
@@ -1286,12 +1412,15 @@
     <CustomAction Id='DriverUninstall' BinaryKey='CA'\r
          VBScriptCall='DriverUninstall' Return='check' />\r
 \r
-    <CustomAction Id='WSD_start' BinaryKey='CA'\r
+    <CustomAction Id='WSDStart' BinaryKey='CA'\r
          VBScriptCall='WSDEnable' Return='check' />\r
 \r
     <CustomAction Id="OpenSM_start" BinaryKey="CA"\r
          VBScriptCall="OpenSM_StartMeUp" Return="check" />\r
  \r
+    <CustomAction Id="ND_start" BinaryKey="CA"\r
+         VBScriptCall="ND_StartMeUp" Return="check" />\r
+\r
     <CustomAction Id='HammerTime' BinaryKey='CA'\r
          VBScriptCall='HammerTime' Return='check' />\r
 \r
@@ -1312,13 +1441,16 @@
        <Custom Action="DriverInstall" After='PatchFiles'>\r
                Not Installed</Custom>\r
 \r
-       <Custom Action="WSD_start" After='InstallFinalize'>\r
+       <Custom Action="WSDStart" After='InstallFinalize'>\r
                Not Installed</Custom>\r
 \r
-       <Custom Action="OpenSM_start" After="WSD_start">\r
-          ($OpenSM_Service_enabled = 3) AND  Not Installed </Custom>\r
+       <Custom Action="OpenSM_start" After="WSDStart">\r
+          ($OpenSM_Service_enabled = 3) AND Not Installed </Custom>\r
+\r
+       <Custom Action="ND_start" After="OpenSM_start">\r
+          ($cNetworkDirect = 3) AND Not Installed </Custom>\r
 \r
-       <Custom Action="BcastRegChanged" After="OpenSM_start">\r
+       <Custom Action="BcastRegChanged" After="ND_start">\r
            Not Installed</Custom>\r
 \r
        <!--> REMOVE ONLY </!-->\r

diff --git a/branches/WinOF/WIX/wnet/x86/wof.wxs b/branches/WinOF/WIX/wnet/x86/wof.wxs
index b8167ccac20bdaad06c69bf674e4d7cb464696ad..17db41218756ecb443a01de9172e662a16d059e0 100644 (file)
--- a/branches/WinOF/WIX/wnet/x86/wof.wxs
+++ b/branches/WinOF/WIX/wnet/x86/wof.wxs
@@ -245,6 +245,12 @@
                         <File Id="ibiou.sys" Compressed="yes" DiskId="1"\r
                               LongName="ibiou.sys" Name="IBIOU.SYS"\r
                               Source="..\bin\HCA\x86\ibiou.sys" />\r
+                        <File Id="ib_iou.cat" Compressed="yes" DiskId="1"\r
+                              LongName="ib_iou.cat" Name="IB_iou.cat"\r
+                              Source="..\bin\HCA\x86\ib_iou.cat" />\r
+                        <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
                     </Component>\r
 \r
                     <Component Id="cMthcaDriver"\r
@@ -389,6 +395,106 @@
                   </Directory>\r
                 </Directory>\r
 \r
+                <Directory Id="wvDir" Name="WinVerbs">\r
+                   <Component Id="cWinVerbsKernel"\r
+                             Guid="F5FA1491-E2D2-4f22-9549-07C61F86BFEB">\r
+                     <CreateFolder />\r
+\r
+                     <File Id="winverbs.inf" Compressed="yes" DiskId="1"\r
+                           LongName="winverbs.inf" Name="winverbs.INF"\r
+                           Source="..\bin\HCA\x86\winverbs.inf" />\r
+                     <File Id="winverbs.sys" Compressed="yes" DiskId="1"\r
+                           LongName="winverbs.sys" Name="winverbs.sys"\r
+                           Source="..\bin\HCA\x86\winverbs.sys" />\r
+                     <File Id="winverbs.cat" Compressed="yes" DiskId="1"\r
+                           LongName="winverbs.cat" Name="winverbs.cat"\r
+                           Source="..\bin\HCA\x86\winverbs.cat" />\r
+                     <File Id="winverbs.dll" Compressed="yes" DiskId="1"\r
+                           LongName="winverbs.dll" Name="winvrbs.dll"\r
+                           Source="..\bin\HCA\x86\winverbs.dll" />\r
+                     <File Id="winverbsd.dll" Compressed="yes" DiskId="1"\r
+                           LongName="winverbsd.dll" Name="winvrbsd.dll"\r
+                           Source="..\bin\HCA\x86\winverbsd.dll" />\r
+                   </Component>\r
+\r
+                   <Component Id="cWinVerbsUser"\r
+                             Guid="20916BB0-5E16-49bb-BE9F-3A202D760E72">\r
+\r
+                     <File Id="winverbs.lib" Compressed="yes" DiskId="1"\r
+                           LongName="winverbs.lib" Name="winverbs.lib"\r
+                           Source="..\bin\HCA\x86\winverbs.lib" />\r
+                     <CopyFile Id="dupWverbs.lib" FileId="winverbs.lib"\r
+                           DestinationName="winverbs.lib"\r
+                           DestinationProperty="WindowsFolder" />\r
+\r
+                     <File Id="winverbsd.lib" Compressed="yes" DiskId="1"\r
+                           LongName="winverbsd.lib" Name="winvrbsd.lib"\r
+                           Source="..\bin\HCA\x86\winverbsd.lib" />\r
+\r
+                     <File Id="libibverbs.dll" Compressed="yes" DiskId="1"\r
+                           LongName="libibverbs.dll" Name="ibverbs.dll"\r
+                           Source="..\bin\HCA\x86\libibverbs.dll" />\r
+                     <CopyFile Id="dupLibibv.dll" FileId="libibverbs.dll"\r
+                           DestinationName="ibverbs.dll"\r
+                           DestinationLongName="libibverbs.dll"\r
+                           DestinationProperty="WindowsFolder" />\r
+\r
+                     <File Id="libibverbs.lib" Compressed="yes" DiskId="1"\r
+                           LongName="libibverbs.lib" Name="ibverbs.lib"\r
+                           Source="..\bin\HCA\x86\libibverbs.lib" />\r
+                     <CopyFile Id="dupLibibv.lib" FileId="libibverbs.lib"\r
+                           DestinationName="ibverbs.lib"\r
+                           DestinationLongName="libibverbs.lib"\r
+                           DestinationProperty="WindowsFolder" />\r
+\r
+                     <File Id="libibverbsd.dll" Compressed="yes" DiskId="1"\r
+                           LongName="libibverbsd.dll" Name="ibverbsd.dll"\r
+                           Source="..\bin\HCA\x86\libibverbsd.dll" />\r
+\r
+                     <File Id="libibverbsd.lib" Compressed="yes" DiskId="1"\r
+                           LongName="libibverbsd.lib" Name="ibverbsd.lib"\r
+                           Source="..\bin\HCA\x86\libibverbsd.lib" />\r
+                   </Component>\r
+                </Directory>\r
+\r
+                <Component Id="cWinVerbsUApps"\r
+                          Guid="ECAB2829-AE65-4ef8-8214-9A89E5BBDB9A">\r
+\r
+                  <File Id="ibv_asyncwatch.exe" Compressed="yes" DiskId="1"\r
+                        LongName="ibv_asyncwatch.exe" Name="asyncwat.exe"\r
+                        Source="..\bin\tools\x86\release\ibv_asyncwatch.exe" />\r
+                  <File Id="ibv_devinfo.exe" Compressed="yes" DiskId="1"\r
+                        LongName="ibv_devinfo.exe" Name="devinfo.exe"\r
+                        Source="..\bin\tools\x86\release\ibv_devinfo.exe" />\r
+                  <File Id="ibv_rc_pingpong.exe" Compressed="yes" DiskId="1"\r
+                        LongName="ibv_rc_pingpong.exe" Name="ibv_rc_p.exe"\r
+                        Source="..\bin\tools\x86\release\ibv_rc_pingpong.exe" />\r
+                  <File Id="ibv_read_bw.exe" Compressed="yes" DiskId="1"\r
+                        LongName="ibv_read_bw.exe" Name="readbw.exe"\r
+                        Source="..\bin\tools\x86\release\ibv_read_bw.exe" />\r
+                  <File Id="ibv_read_lat.exe" Compressed="yes" DiskId="1"\r
+                        LongName="ibv_read_lat.exe" Name="readlat.exe"\r
+                        Source="..\bin\tools\x86\release\ibv_read_lat.exe" />\r
+                  <File Id="ibv_send_bw.exe" Compressed="yes" DiskId="1"\r
+                        LongName="ibv_send_bw.exe" Name="send_bw.exe"\r
+                        Source="..\bin\tools\x86\release\ibv_send_bw.exe" />\r
+                  <File Id="ibv_send_lat.exe" Compressed="yes" DiskId="1"\r
+                        LongName="ibv_send_lat.exe" Name="send_lat.exe"\r
+                        Source="..\bin\tools\x86\release\ibv_send_lat.exe" />\r
+                  <File Id="ibv_uc_pingpong.exe" Compressed="yes" DiskId="1"\r
+                        LongName="ibv_uc_pingpong.exe" Name="uc_ping.exe"\r
+                        Source="..\bin\tools\x86\release\ibv_uc_pingpong.exe" />\r
+                  <File Id="ibv_ud_pingpong.exe" Compressed="yes" DiskId="1"\r
+                        LongName="ibv_ud_pingpong.exe" Name="ud_ping.exe"\r
+                        Source="..\bin\tools\x86\release\ibv_ud_pingpong.exe" />\r
+                  <File Id="ibv_write_bw.exe" Compressed="yes" DiskId="1"\r
+                        LongName="ibv_write_bw.exe" Name="write_bw.exe"\r
+                        Source="..\bin\tools\x86\release\ibv_write_bw.exe" />\r
+                  <File Id="ibv_write_lat.exe" Compressed="yes" DiskId="1"\r
+                        LongName="ibv_write_lat.exe" Name="writelat.exe"\r
+                        Source="..\bin\tools\x86\release\ibv_write_lat.exe" />\r
+                </Component>\r
+\r
                 <Directory Id="ipoibDir" Name="net">\r
                     <Component Id="IPoIB"\r
                                Guid="18CC13CC-0D29-4B88-8F03-854CE0C6AF94">\r
@@ -408,6 +514,9 @@
                         <File Id="ibndprov.dll" Compressed="yes" DiskId="1"\r
                               LongName="ibndprov.dll" Name="IBNDPROV.DLL"\r
                               Source="..\bin\net\x86\ibndprov.dll" />\r
+                        <File Id="ndinstall.exe" Compressed="yes" DiskId="1"\r
+                              LongName="ndinstall.exe" Name="NDINSTAL.EXE"\r
+                              Source="..\bin\net\x86\ndinstall.exe" />\r
                     </Component>\r
                 </Directory>\r
 \r
@@ -416,9 +525,10 @@
                     <File Id="installsp.exe" Compressed="yes" DiskId="1"\r
                               LongName="installsp.exe" Name="INSTALL.EXE"\r
                               Source="..\bin\net\x86\installsp.exe" />\r
-                    <File Id="ndinstall.exe" Compressed="yes" DiskId="1"\r
-                              LongName="ndinstall.exe" Name="NDINSTAL.EXE"\r
-                              Source="..\bin\net\x86\ndinstall.exe" />\r
+                </Component>\r
+\r
+                <Component Id="cNetworkDirect"\r
+                           Guid="F3BA9E15-E532-4b8c-BB0C-E8C1CC0EEF3F">\r
                 </Component>\r
 \r
                 <Component Id="cDAPL1RT"\r
@@ -1057,6 +1167,15 @@
         <ComponentRef Id="OpenSMservice" />\r
     </Feature>\r
 \r
+    <Feature Id="fWV" Title="WinVerbs"\r
+        Description="OFED verbs API for Windows"\r
+        Display="expand" Level="2" ConfigurableDirectory="INSTALLDIR"\r
+        AllowAdvertise="no" InstallDefault="local" Absent="allow">\r
+        <ComponentRef Id="cWinVerbsKernel" />\r
+        <ComponentRef Id="cWinVerbsUser" />\r
+        <ComponentRef Id="cWinVerbsUApps" />\r
+    </Feature>\r
+\r
     <Feature Id="fIPoIB" Title="IPoIB" Level="1"\r
         Description="Internet Protocols over InfiniBand" Display="expand"\r
         ConfigurableDirectory="INSTALLDIR" AllowAdvertise="no"\r
@@ -1072,6 +1191,13 @@
         <ComponentRef Id="WinsockDirect" />\r
     </Feature>\r
 \r
+    <Feature Id="fND" Title="Network Direct"\r
+        Description="Network Direct Enabled"\r
+        Display="expand" Level="2" ConfigurableDirectory="INSTALLDIR"\r
+        AllowAdvertise="no" InstallDefault="local" Absent="allow">\r
+        <ComponentRef Id="cNetworkDirect" />\r
+    </Feature>\r
+\r
     <Feature Id="fDAPL" Title="DAPL" Description="DAT/DAPL over InfiniBand"\r
         Display="collapse" Level="1" ConfigurableDirectory="INSTALLDIR"\r
         AllowAdvertise="no" InstallDefault="local" Absent="allow">\r
@@ -1179,12 +1305,15 @@
     <CustomAction Id="DriverUninstall" BinaryKey="CA"\r
          VBScriptCall="DriverUninstall" Return="check" />\r
 \r
-    <CustomAction Id="WSD_start" BinaryKey="CA"\r
+    <CustomAction Id="WSDStart" BinaryKey="CA"\r
          VBScriptCall="WSDEnable" Return="check" />\r
 \r
     <CustomAction Id="OpenSM_start" BinaryKey="CA"\r
          VBScriptCall="OpenSM_StartMeUp" Return="check" />\r
 \r
+    <CustomAction Id="ND_start" BinaryKey="CA"\r
+         VBScriptCall="ND_StartMeUp" Return="check" />\r
+\r
     <CustomAction Id="HammerTime" BinaryKey="CA"\r
          VBScriptCall="HammerTime" Return="check" />\r
 \r
@@ -1204,13 +1333,16 @@
 \r
        <Custom Action="DriverInstall" After="PatchFiles"> Not Installed</Custom>\r
 \r
-       <Custom Action="WSD_start" After="InstallFinalize">\r
+       <Custom Action="WSDStart" After="InstallFinalize">\r
            Not Installed</Custom>\r
 \r
-       <Custom Action="OpenSM_start" After="WSD_start">\r
-          ($OpenSM_Service_enabled = 3) AND  Not Installed </Custom>\r
+       <Custom Action="OpenSM_start" After="WSDStart">\r
+          ($OpenSM_Service_enabled = 3) AND Not Installed </Custom>\r
+\r
+       <Custom Action="ND_start" After="OpenSM_start">\r
+          ($cNetworkDirect = 3) AND Not Installed </Custom>\r
 \r
-       <Custom Action="BcastRegChanged" After="OpenSM_start">\r
+       <Custom Action="BcastRegChanged" After="ND_start">\r
            Not Installed</Custom>\r
 \r
        <!--> REMOVE ONLY </!-->\r

diff --git a/branches/WinOF/WIX/wxp/x86/wof.wxs b/branches/WinOF/WIX/wxp/x86/wof.wxs
index a0df7b63a0e22af89fe9b7834278db23cbbcfa17..a715f80fab288edcd4750ce7ac062e57773aabf0 100644 (file)
--- a/branches/WinOF/WIX/wxp/x86/wof.wxs
+++ b/branches/WinOF/WIX/wxp/x86/wof.wxs
@@ -245,6 +245,12 @@
                         <File Id="ibiou.sys" Compressed="yes" DiskId="1"\r
                               LongName="ibiou.sys" Name="IBIOU.SYS"\r
                               Source="..\bin\HCA\x86\ibiou.sys" />\r
+                        <File Id="ib_iou.cat" Compressed="yes" DiskId="1"\r
+                              LongName="ib_iou.cat" Name="IB_iou.cat"\r
+                              Source="..\bin\HCA\x86\ib_iou.cat" />\r
+                        <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
                     </Component>\r
 \r
                     <Component Id="cMthcaDriver"\r
@@ -382,6 +388,106 @@
                   </Directory>\r
                 </Directory>\r
 \r
+                <Directory Id="wvDir" Name="WinVerbs">\r
+                   <Component Id="cWinVerbsKernel"\r
+                             Guid="F5FA1491-E2D2-4f22-9549-07C61F86BFEB">\r
+                     <CreateFolder />\r
+\r
+                     <File Id="winverbs.inf" Compressed="yes" DiskId="1"\r
+                           LongName="winverbs.inf" Name="winverbs.INF"\r
+                           Source="..\bin\HCA\x86\winverbs.inf" />\r
+                     <File Id="winverbs.sys" Compressed="yes" DiskId="1"\r
+                           LongName="winverbs.sys" Name="winverbs.sys"\r
+                           Source="..\bin\HCA\x86\winverbs.sys" />\r
+                     <File Id="winverbs.cat" Compressed="yes" DiskId="1"\r
+                           LongName="winverbs.cat" Name="winverbs.cat"\r
+                           Source="..\bin\HCA\x86\winverbs.cat" />\r
+                     <File Id="winverbs.dll" Compressed="yes" DiskId="1"\r
+                           LongName="winverbs.dll" Name="winvrbs.dll"\r
+                           Source="..\bin\HCA\x86\winverbs.dll" />\r
+                     <File Id="winverbsd.dll" Compressed="yes" DiskId="1"\r
+                           LongName="winverbsd.dll" Name="winvrbsd.dll"\r
+                           Source="..\bin\HCA\x86\winverbsd.dll" />\r
+                   </Component>\r
+\r
+                   <Component Id="cWinVerbsUser"\r
+                             Guid="20916BB0-5E16-49bb-BE9F-3A202D760E72">\r
+\r
+                     <File Id="winverbs.lib" Compressed="yes" DiskId="1"\r
+                           LongName="winverbs.lib" Name="winverbs.lib"\r
+                           Source="..\bin\HCA\x86\winverbs.lib" />\r
+                     <CopyFile Id="dupWverbs.lib" FileId="winverbs.lib"\r
+                           DestinationName="winverbs.lib"\r
+                           DestinationProperty="WindowsFolder" />\r
+\r
+                     <File Id="winverbsd.lib" Compressed="yes" DiskId="1"\r
+                           LongName="winverbsd.lib" Name="winvrbsd.lib"\r
+                           Source="..\bin\HCA\x86\winverbsd.lib" />\r
+\r
+                     <File Id="libibverbs.dll" Compressed="yes" DiskId="1"\r
+                           LongName="libibverbs.dll" Name="ibverbs.dll"\r
+                           Source="..\bin\HCA\x86\libibverbs.dll" />\r
+                     <CopyFile Id="dupLibibv.dll" FileId="libibverbs.dll"\r
+                           DestinationName="ibverbs.dll"\r
+                           DestinationLongName="libibverbs.dll"\r
+                           DestinationProperty="WindowsFolder" />\r
+\r
+                     <File Id="libibverbs.lib" Compressed="yes" DiskId="1"\r
+                           LongName="libibverbs.lib" Name="ibverbs.lib"\r
+                           Source="..\bin\HCA\x86\libibverbs.lib" />\r
+                     <CopyFile Id="dupLibibv.lib" FileId="libibverbs.lib"\r
+                           DestinationName="ibverbs.lib"\r
+                           DestinationLongName="libibverbs.lib"\r
+                           DestinationProperty="WindowsFolder" />\r
+\r
+                     <File Id="libibverbsd.dll" Compressed="yes" DiskId="1"\r
+                           LongName="libibverbsd.dll" Name="ibverbsd.dll"\r
+                           Source="..\bin\HCA\x86\libibverbsd.dll" />\r
+\r
+                     <File Id="libibverbsd.lib" Compressed="yes" DiskId="1"\r
+                           LongName="libibverbsd.lib" Name="ibverbsd.lib"\r
+                           Source="..\bin\HCA\x86\libibverbsd.lib" />\r
+                   </Component>\r
+                </Directory>\r
+\r
+                <Component Id="cWinVerbsUApps"\r
+                          Guid="ECAB2829-AE65-4ef8-8214-9A89E5BBDB9A">\r
+\r
+                  <File Id="ibv_asyncwatch.exe" Compressed="yes" DiskId="1"\r
+                        LongName="ibv_asyncwatch.exe" Name="asyncwat.exe"\r
+                        Source="..\bin\tools\x86\release\ibv_asyncwatch.exe" />\r
+                  <File Id="ibv_devinfo.exe" Compressed="yes" DiskId="1"\r
+                        LongName="ibv_devinfo.exe" Name="devinfo.exe"\r
+                        Source="..\bin\tools\x86\release\ibv_devinfo.exe" />\r
+                  <File Id="ibv_rc_pingpong.exe" Compressed="yes" DiskId="1"\r
+                        LongName="ibv_rc_pingpong.exe" Name="ibv_rc_p.exe"\r
+                        Source="..\bin\tools\x86\release\ibv_rc_pingpong.exe" />\r
+                  <File Id="ibv_read_bw.exe" Compressed="yes" DiskId="1"\r
+                        LongName="ibv_read_bw.exe" Name="readbw.exe"\r
+                        Source="..\bin\tools\x86\release\ibv_read_bw.exe" />\r
+                  <File Id="ibv_read_lat.exe" Compressed="yes" DiskId="1"\r
+                        LongName="ibv_read_lat.exe" Name="readlat.exe"\r
+                        Source="..\bin\tools\x86\release\ibv_read_lat.exe" />\r
+                  <File Id="ibv_send_bw.exe" Compressed="yes" DiskId="1"\r
+                        LongName="ibv_send_bw.exe" Name="send_bw.exe"\r
+                        Source="..\bin\tools\x86\release\ibv_send_bw.exe" />\r
+                  <File Id="ibv_send_lat.exe" Compressed="yes" DiskId="1"\r
+                        LongName="ibv_send_lat.exe" Name="send_lat.exe"\r
+                        Source="..\bin\tools\x86\release\ibv_send_lat.exe" />\r
+                  <File Id="ibv_uc_pingpong.exe" Compressed="yes" DiskId="1"\r
+                        LongName="ibv_uc_pingpong.exe" Name="uc_ping.exe"\r
+                        Source="..\bin\tools\x86\release\ibv_uc_pingpong.exe" />\r
+                  <File Id="ibv_ud_pingpong.exe" Compressed="yes" DiskId="1"\r
+                        LongName="ibv_ud_pingpong.exe" Name="ud_ping.exe"\r
+                        Source="..\bin\tools\x86\release\ibv_ud_pingpong.exe" />\r
+                  <File Id="ibv_write_bw.exe" Compressed="yes" DiskId="1"\r
+                        LongName="ibv_write_bw.exe" Name="write_bw.exe"\r
+                        Source="..\bin\tools\x86\release\ibv_write_bw.exe" />\r
+                  <File Id="ibv_write_lat.exe" Compressed="yes" DiskId="1"\r
+                        LongName="ibv_write_lat.exe" Name="writelat.exe"\r
+                        Source="..\bin\tools\x86\release\ibv_write_lat.exe" />\r
+                </Component>\r
+\r
                 <Directory Id="ipoibDir" Name="net">\r
                     <Component Id="IPoIB"\r
                                Guid="18CC13CC-0D29-4B88-8F03-854CE0C6AF94">\r
@@ -401,6 +507,12 @@
                               LongName="ibwsd.dll" Name="IBWSD.DLL"\r
                               Source="..\bin\net\x86\ibwsd.dll" />\r
 -->\r
+                        <File Id="ibndprov.dll" Compressed="yes" DiskId="1"\r
+                              LongName="ibndprov.dll" Name="IBNDPROV.DLL"\r
+                              Source="..\bin\net\x86\ibndprov.dll" />\r
+                        <File Id="ndinstall.exe" Compressed="yes" DiskId="1"\r
+                              LongName="ndinstall.exe" Name="NDINSTAL.EXE"\r
+                              Source="..\bin\net\x86\ndinstall.exe" />\r
                     </Component>\r
                 </Directory>\r
 \r
@@ -412,6 +524,9 @@
                               Source="..\bin\net\x86\installsp.exe" />\r
                 </Component>\r
 -->\r
+                <Component Id="cNetworkDirect"\r
+                           Guid="F3BA9E15-E532-4b8c-BB0C-E8C1CC0EEF3F">\r
+                </Component>\r
 \r
                 <Component Id="cDAPL1RT"\r
                            Guid="A49F1ECC-14E4-4310-9F37-BEB7B00243A9">\r
@@ -1051,6 +1166,15 @@
         <ComponentRef Id="OpenSMservice" />\r
     </Feature>\r
 \r
+    <Feature Id="fWV" Title="WinVerbs"\r
+        Description="OFED verbs API for Windows"\r
+        Display="expand" Level="2" ConfigurableDirectory="INSTALLDIR"\r
+        AllowAdvertise="no" InstallDefault="local" Absent="allow">\r
+        <ComponentRef Id="cWinVerbsKernel" />\r
+        <ComponentRef Id="cWinVerbsUser" />\r
+        <ComponentRef Id="cWinVerbsUApps" />\r
+    </Feature>\r
+\r
     <Feature Id="fIPoIB" Title="IPoIB" Level="1"\r
         Description="Internet Protocols over InfiniBand" Display="expand"\r
         ConfigurableDirectory="INSTALLDIR" AllowAdvertise="no"\r
@@ -1066,6 +1190,12 @@
         <ComponentRef Id="WinsockDirect" />\r
     </Feature>\r
 -->\r
+    <Feature Id="fND" Title="Network Direct"\r
+        Description="Network Direct Enabled"\r
+        Display="expand" Level="2" ConfigurableDirectory="INSTALLDIR"\r
+        AllowAdvertise="no" InstallDefault="local" Absent="allow">\r
+        <ComponentRef Id="cNetworkDirect" />\r
+    </Feature>\r
 \r
     <Feature Id="fDAPL" Title="DAPL" Description="DAT/DAPL over InfiniBand"\r
         Display="collapse" Level="1" ConfigurableDirectory="INSTALLDIR"\r
@@ -1178,12 +1308,15 @@
     <CustomAction Id="DriverUninstall" BinaryKey="CA"\r
          VBScriptCall="DriverUninstall" Return="check" />\r
 \r
-    <CustomAction Id="WSD_start" BinaryKey="CA"\r
+    <CustomAction Id="WSDStart" BinaryKey="CA"\r
          VBScriptCall="WSDEnable" Return="check" />\r
 \r
     <CustomAction Id="OpenSM_start" BinaryKey="CA"\r
          VBScriptCall="OpenSM_StartMeUp" Return="check" />\r
 \r
+    <CustomAction Id="ND_start" BinaryKey="CA"\r
+         VBScriptCall="ND_StartMeUp" Return="check" />\r
+\r
     <CustomAction Id="HammerTime" BinaryKey="CA"\r
          VBScriptCall="HammerTime" Return="check" />\r
 \r
@@ -1203,13 +1336,16 @@
 \r
        <Custom Action="DriverInstall" After="PatchFiles"> Not Installed</Custom>\r
 \r
-       <Custom Action="WSD_start" After="InstallFinalize">\r
+       <Custom Action="WSDStart" After="InstallFinalize">\r
            Not Installed</Custom>\r
 \r
-       <Custom Action="OpenSM_start" After="WSD_start">\r
-          ($OpenSM_Service_enabled = 3) AND  Not Installed </Custom>\r
+       <Custom Action="OpenSM_start" After="WSDStart">\r
+          ($OpenSM_Service_enabled = 3) AND Not Installed </Custom>\r
+\r
+       <Custom Action="ND_start" After="OpenSM_start">\r
+          ($cNetworkDirect = 3) AND Not Installed </Custom>\r
 \r
-       <Custom Action="BcastRegChanged" After="OpenSM_start">\r
+       <Custom Action="BcastRegChanged" After="ND_start">\r
            Not Installed</Custom>\r
 \r
        <!--> REMOVE ONLY </!-->\r