[WinOF] Support Winmad.dll, libibverbs.dll, libibumad.dll, ibverbs symbols(.pdb files).
authorstansmith <stansmith@ad392aa1-c5ef-ae45-8dd8-e69d62a5ef86>
Mon, 5 Jan 2009 19:53:57 +0000 (19:53 +0000)
committerstansmith <stansmith@ad392aa1-c5ef-ae45-8dd8-e69d62a5ef86>
Mon, 5 Jan 2009 19:53:57 +0000 (19:53 +0000)
winverbs installed by default.
Linux OFED SRP target recognized when SRP installed.
For Server 2008 & Vista - dpinst.exe is used to install IOU, SRP & VNIC. Server 2003/XP use devman.exe.

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

WinOF/WIX/CustomActions.vbs
WinOF/WIX/wlh/ia64/wof.wxs
WinOF/WIX/wlh/x64/wof.wxs
WinOF/WIX/wlh/x86/wof.wxs
WinOF/WIX/wnet/ia64/wof.wxs
WinOF/WIX/wnet/x64/wof.wxs
WinOF/WIX/wnet/x86/wof.wxs
WinOF/WIX/wxp/x86/wof.wxs

index bb75a0b..c41283c 100644 (file)
@@ -378,9 +378,12 @@ Function RemoveDriverFiles(WshShell)
        End If\r
 \r
     FileDelete(Win & "winverbs.lib")\r
+    FileDelete(Win & "libibverbs.lib")\r
     DriverFileDelete fso,WshShell,sDRIVERS & "winverbs.sys"\r
     DriverFileDelete fso,WshShell,sSYS32 & "winverbs.dll"\r
     DriverFileDelete fso,WshShell,sSYS32 & "winverbsd.dll"\r
+    DriverFileDelete fso,WshShell,sSYS32 & "libibverbs.dll"\r
+    DriverFileDelete fso,WshShell,sSYS32 & "libibverbsd.dll"\r
     \r
     ' delete opensm files\r
     sTemp = fso.GetSpecialFolder(0) & "\temp\"\r
@@ -729,19 +732,23 @@ Function IsInfiniHost(ID)
 End Function\r
 \r
 \r
-' Install Qlogic VNIC Driver\r
+' Install Qlogic VNIC Driver using devman.exe (aka devcon)\r
 \r
-Sub Install_VNIC(WshShell,devmanQL)\r
+Sub devman_Install_VNIC(WshShell,sInstalldir)\r
 \r
        Dim devID, rc\r
 \r
+    devmanQL = "cmd.exe /c cd /d " & sInstalldir & "qlgcvnic & " & _\r
+                       "..\IBcore\devman.exe "\r
+\r
     Err.clear\r
        devID = "IBA\V00066AP00000030"\r
        rc = WshShell.Run (devmanQL & "disable " & devID, 0, true)\r
        rc = WshShell.Run (devmanQL & "update netvnic.inf " & devID,0,true)\r
        ' Display error number and description if applicable\r
        If rc <> 0 Then\r
-               msgbox "Install_VNIC Err(" & rc & ") - update qlgcvnic.sys " & devID\r
+               msgbox "Install_VNIC Err(" & rc & ") - devman update qlgcvnic.sys " _\r
+                               & devID\r
        Else\r
                rc = WshShell.Run (devmanQL & "enable " & devID, 0, true)\r
        End if\r
@@ -749,40 +756,114 @@ Sub Install_VNIC(WshShell,devmanQL)
 End Sub\r
        \r
 \r
+Function dpinst_Install_VNIC(WshShell,sInstalldir)\r
+       Dim dpinstSRP,cmd,rc\r
+\r
+       dpinst_Install_VNIC = 0\r
+\r
+       dpinstVNIC = "cmd.exe /c cd /d " & sInstalldir & _\r
+                                       "qlgcvnic & ..\ibcore\dpinst.exe "\r
+\r
+       cmd = dpinstVNIC & "/S /F /SA /PATH """ & sInstalldir & "qlgcvnic""" & _\r
+                               " /SE /SW"\r
+       rc = WshShell.Run (cmd,0,true)\r
+       If (rc AND DPINST_ERR) Then\r
+               msgbox "ERR: qlgcvnic Install RC(" & rc & ") " & cmd\r
+               dpinst_Install_VNIC = rc\r
+       End if\r
+\r
+End Function\r
+\r
+\r
 ' Install SRP (SCSI RDMA Protocol) Driver\r
 \r
-Sub Install_SRP(WshShell,devmanSRP)\r
+Function devman_Install_SRP(WshShell,sInstalldir)\r
 \r
-       Dim devID, rc\r
+       Dim Devices,devID,rc,found\r
 \r
-       Err.clear\r
        ' QLogic Virtual FC I/O controller or\r
        ' InfiniBand SRP Miniport: IBA\C0100C609EP0108 or IBA\CFF00C609EP0108\r
+       ' OFED SRP target: IBA\V000002P00005A44\r
        ' one driver handles all three.\r
-       devID = "IBA\V00066AP00000038"\r
-       rc = WshShell.Run (devmanSRP & "update ib_srp.inf " & devID,0,true)\r
-       ' Display error number and description if applicable\r
-       If rc <> 0 Then\r
-               msgbox "Install_SRP Err(" & rc &") devman update ib_srp.inf " & devID\r
+       SRP_IDS = Array(_\r
+                               "IBA\V000002P00005A44",_\r
+                               "IBA\C0100C609EP0108",_\r
+                               "IBA\CFF00C609EP0108",_\r
+                               "IBA\V00066AP00000038")\r
+\r
+    devmanSRP = "cmd.exe /c cd /d " & sInstalldir & "SRP & " & _\r
+                                       "..\IBcore\devman.exe "\r
+       Err.clear\r
+       found = 0\r
+\r
+       On Error Resume Next\r
+\r
+       Devices = Find_IBA_Devices(WshShell,sInstalldir) \r
+       If IsNull(Devices) Then\r
+               msgbox "devman_Install_SRP() missing IBA\* devices?"\r
+               Exit Function\r
        End If\r
 \r
-End Sub\r
+       For each ID in SRP_IDS\r
+               For each devID in Devices\r
+               If Instr(1,devID,ID) = 1 Then\r
+                               found = 1\r
+                               rc = WshShell.Run (devmanSRP & "update ib_srp.inf " & ID,0,true)\r
+                               ' Display error number and description if applicable\r
+                               If rc <> 0 Then\r
+                                       msgbox "Install_SRP Err(" & rc _\r
+                                                       & ") devman update ib_srp.inf " & ID\r
+                               End If\r
+                               Exit For\r
+                       End If\r
+               Next\r
+'              One driver handles all SRP devices - install once?\r
+'              If found = 1 Then\r
+'                      Exit For\r
+'              End If\r
+       Next\r
+\r
+       If found = 0 Then\r
+               devman_Install_SRP = -1\r
+       Else\r
+               devman_Install_SRP = 0\r
+       End If\r
+\r
+End Function\r
+\r
 \r
+Function dpinst_Install_SRP(WshShell,sInstalldir)\r
+       Dim dpinstSRP,cmd,rc\r
+\r
+       dpinst_Install_SRP = 0\r
+       dpinstSRP = "cmd.exe /c cd /d " & sInstalldir _\r
+                               & "SRP & ..\ibcore\dpinst.exe "\r
+       cmd = dpinstSRP & "/S /F /SA /PATH """ & sInstalldir & "SRP""" & " /SE /SW"\r
+       rc = WshShell.Run (cmd,0,true)\r
+       If (rc AND DPINST_ERR) Then\r
+               msgbox "ERR: SRP Install rc(" & rc & ") " & cmd\r
+               dpinst_Install_SRP = rc\r
+       End if\r
+\r
+End Function\r
 \r
-Sub Install_IOU(WshShell,devman)\r
 \r
-       Dim rc\r
+Sub devman_Install_IOU(WshShell,sInstalldir)\r
+\r
+       Dim rc,devman\r
+\r
+    devman = "cmd.exe /c cd /d " & sInstalldir & "IBcore & devman.exe "\r
 \r
        On Error Resume Next\r
 \r
-       dev_list = Find_Dev_by_Tag(WshShell,devman,"find","IBA\IB_IOU")\r
+       dev_list = Find_Dev_by_Tag(WshShell,devman,"find","InfiniBand I/O Unit")\r
 \r
        ' if no IB_IOU device found, install ibiou.sys driver\r
        If IsNull(dev_list) Then\r
-               rc = WshShell.Run (devman & "install ib_iou.inf IBA\IB_IOU",0,true)\r
+               rc = WshShell.Run (devman & "update ib_iou.inf IBA\IB_IOU",0,true)\r
                If rc <> 0 Then\r
                        msgbox "Install_IOU Err(" & rc & ")" & _\r
-                                       "devman install ib_iou.inf IBA\IB_IOU"\r
+                                       "devman update ib_iou.inf IBA\IB_IOU"\r
                End If\r
 '      Else\r
 '              msgbox "IOU driver already loaded [" & dev_list(0) & "]"\r
@@ -803,25 +884,26 @@ Const ERROR_SUCCESS_REBOOT_REQUIRED = 3010 ' restart required
 Const DPINST_ERR = &H80000000\r
 \r
 \r
-Function dpinst_install(WshShell,sInstalldir,need_IPOIB)\r
+Function dpinst_install(WshShell,sInstalldir,need_IPOIB,need_VNIC,need_SRP)\r
 \r
-       Dim dpinst,dpinstNET,cmd,RC\r
+       Dim dpinst,dpinstNET,cmd,rc\r
 \r
        err.clear\r
        On Error Resume Next\r
 \r
-       dpinst = "cmd.exe /c cd /d " & sInstalldir & "IBcore & dpinst.exe "\r
-       dpinstNET = "cmd.exe /c cd /d " & sInstalldir & "net & ..\ibcore\dpinst.exe "\r
+       cmdspec = "cmd.exe /c cd /d " & sInstalldir \r
+       dpinst = cmdspec & "IBcore & dpinst.exe "\r
+       dpinstNET = cmdspec & "net & ..\ibcore\dpinst.exe "\r
 \r
        cmd = dpinst & "/S /F /SA /SE /SW"\r
 \r
        ' HCA driver install - mlx4 or mthca, dpinst does all .inf files in\r
        ' the current folder.\r
 \r
-       RC = WshShell.Run (cmd,0,true)\r
+       rc = WshShell.Run (cmd,0,true)\r
 \r
-       If (RC AND DPINST_ERR) Then\r
-               msgbox "dpinst_install - HCA driver Install failed(" & RC & ") " & cmd\r
+       If (rc AND DPINST_ERR) Then\r
+               msgbox "dpinst_install - HCA driver Install failed(" & rc & ") " & cmd\r
                remove_INF_file WshShell,dpinst,"mthca"\r
                remove_INF_file WshShell,dpinst,"mlx4"\r
                dpinst_install=ERROR_INSTALL_FAILURE\r
@@ -832,22 +914,33 @@ Function dpinst_install(WshShell,sInstalldir,need_IPOIB)
        If need_IPOIB Then\r
                cmd = dpinstNET & "/S /F /SA /PATH """ & sInstalldir & "net""" & _\r
                                " /SE /SW"\r
-               RC = WshShell.Run (cmd,0,true)\r
-               If (RC AND DPINST_ERR) Then\r
-                       msgbox "IPoIB Install RC(" & RC & ") " & cmd\r
+               rc = WshShell.Run (cmd,0,true)\r
+               If (rc AND DPINST_ERR) Then\r
+                       msgbox "IPoIB Install rc(" & rc & ") " & cmd\r
                        dpinst_install=ERROR_INSTALL_FAILURE\r
                        Exit Function\r
                End if\r
     End If\r
     \r
+       ' IOU driver is installed (loaded into driver store) by default as the\r
+       ' driver (ibiou.sys) is located in IBcore; side-effect of dpinst.exe.\r
+\r
+       If need_VNIC Then\r
+               rc = dpinst_Install_VNIC(WshShell,sInstalldir)\r
+    End If\r
+    \r
+       If need_SRP Then\r
+               rc = dpinst_Install_SRP(WshShell,sInstalldir)\r
+    End If\r
+    \r
        dpinst_install = 0\r
 \r
 End Function\r
 \r
 \r
-Function devman_install(Wsh,sInstalldir,have_mthca,have_mlx4,IPOIB,IOU)\r
+Function devman_install(WshShell,Installdir,have_mthca,have_mlx4,IPOIB,VNIC,SRP)\r
 \r
-       Dim devman,cmd,Return,RC\r
+       Dim devman,cmd,Return,rc\r
 \r
        ' an HCA driver is 'required' for devman/devcon installs.\r
     If have_mlx4 = 0 AND have_mthca = 0 Then\r
@@ -858,9 +951,9 @@ Function devman_install(Wsh,sInstalldir,have_mthca,have_mlx4,IPOIB,IOU)
         Exit Function\r
     End If\r
 \r
-    devman = "cmd.exe /c cd /d " & sInstalldir & "IBcore & devman.exe "\r
+    devman = "cmd.exe /c cd /d " & Installdir & "IBcore & devman.exe "\r
 \r
-       dev_list = Find_Dev_by_Tag(Wsh,devman,"find","VEN_15B3")\r
+       dev_list = Find_Dev_by_Tag(WshShell,devman,"find","VEN_15B3")\r
 \r
        If IsNull(dev_list) Then\r
                msgbox "HCA driver install - No HCA devices to install?"\r
@@ -884,8 +977,7 @@ Function devman_install(Wsh,sInstalldir,have_mthca,have_mlx4,IPOIB,IOU)
                                                mlxdev = "PCI\VEN_15B3"\r
                                        End If\r
                                        cmd = devman & "update mlx4_bus.inf """ & mlxdev & """"\r
-                                       Return = Wsh.Run (cmd,0,true)\r
-' msgbox "mlx4_bus(" & Return & ") " & cmd\r
+                                       Return = WshShell.Run (cmd,0,true)\r
                        If Return = 0 Then\r
                                DrvInstalled = true\r
                                Exit For\r
@@ -907,12 +999,12 @@ Function devman_install(Wsh,sInstalldir,have_mthca,have_mlx4,IPOIB,IOU)
 \r
                ' Install ConnectX HCA\r
         cmd = devman & "update mlx4_hca.inf MLX4\CONNECTX_HCA"\r
-        Return = Wsh.Run (cmd,0,true)\r
+        Return = WshShell.Run (cmd,0,true)\r
 \r
         ' Display error number and description if applicable\r
         If Return <> 0 Then\r
             msgbox "mlx4_hca Install Err(" & Return & ") " & cmd\r
-                       remove_INF_file Wsh,devman,"mlx4_"\r
+                       remove_INF_file WshShell,devman,"mlx4_"\r
             devman_install=ERROR_INSTALL_FAILURE\r
             Exit Function\r
         End if\r
@@ -934,7 +1026,7 @@ Function devman_install(Wsh,sInstalldir,have_mthca,have_mlx4,IPOIB,IOU)
                                                idev = "PCI\VEN_15B3"\r
                                        End If\r
                        cmd = devman & "update mthca.inf """ & idev & """"\r
-                       Return = Wsh.Run (cmd,0,true)\r
+                       Return = WshShell.Run (cmd,0,true)\r
                        If Return = 0 Then\r
                                DrvInstalled = true\r
                                Exit For\r
@@ -950,7 +1042,7 @@ Function devman_install(Wsh,sInstalldir,have_mthca,have_mlx4,IPOIB,IOU)
 \r
                If DrvInstalled <> true Then\r
             msgbox "InfiniHost(mthca) Install Err(" & Return & ") " & cmd\r
-                       remove_INF_file Wsh,devman,"mthca"\r
+                       remove_INF_file WshShell,devman,"mthca"\r
             devman_install=ERROR_INSTALL_FAILURE\r
             Exit Function\r
                End if\r
@@ -968,10 +1060,10 @@ Function devman_install(Wsh,sInstalldir,have_mthca,have_mlx4,IPOIB,IOU)
 \r
     ' Check/install IPoIB driver\r
        If IPOIB Then\r
-       devmanNET = "cmd.exe /c cd /d " & sInstalldir & _\r
+       devmanNET = "cmd.exe /c cd /d " & Installdir & _\r
                                        "net & ..\IBcore\devman.exe "\r
                cmd = devmanNET & "update netipoib.inf IBA\IPoIB"\r
-               rc = Wsh.Run (cmd,0,true)\r
+               rc = WshShell.Run (cmd,0,true)\r
                If rc <> 0 Then\r
                        msgbox "IPoIB Install Err(" & rc & ") " & cmd\r
                        DriverUninstall\r
@@ -982,16 +1074,39 @@ Function devman_install(Wsh,sInstalldir,have_mthca,have_mlx4,IPOIB,IOU)
     \r
        ' IB I/O Unit driver installed only if required by VNIC or SRP.\r
 \r
-    If IOU Then\r
-       rc = Wsh.Run (devman & "install ib_iou.inf IBA\IB_IOU",0,true)\r
+    If VNIC OR SRP Then\r
+       rc = WshShell.Run (devman & "update ib_iou.inf IBA\IB_IOU",0,true)\r
                If rc <> 0 Then\r
-                       msgbox "IOU Install Err(" & rc & ") install ib_iou.inf IBA\IB_IOU"\r
+                       msgbox "IOU Install Err(" & rc & ") update ib_iou.inf IBA\IB_IOU"\r
                        DriverUninstall\r
             devman_install=ERROR_INSTALL_FAILURE\r
             Exit Function\r
                End if\r
     End If\r
 \r
+    ' Install Qlogic VNIC Driver?\r
+       If VNIC Then\r
+               devman_Install_VNIC WshShell,Installdir\r
+    End if\r
+       \r
+    ' Install SRP (SCSI RDMA Protocol) Driver?\r
+    If SRP Then\r
+               For cnt=1 To 3\r
+                       rc = devman_Install_SRP(WshShell,Installdir)\r
+                       If rc <> -1 Then\r
+                               Exit For\r
+                       End If\r
+                       WshShell.popup "Waiting 10 seconds for SRP device(s) to appear",10,_\r
+                                               "WinOF - SRP Install"\r
+               Next\r
+               If rc = -1 Then\r
+                       msgbox "WinOF: Missing SRP devices?" & vbCrLf _\r
+                               & "cd /d " & Installdir & "SRP" & vbCrLf _\r
+                               & "..\IBcore\devman find IBA\*" & vbCrLf _\r
+                               & "..\IBcore\devman update ib_srp.inf found-SRP-DevID" & vbCrLf\r
+               End If\r
+       End If\r
+\r
        devman_install = 0\r
 \r
 End Function\r
@@ -1001,11 +1116,11 @@ End Function
 ''''''''''' Device Driver Install ''''''''''''\r
 \r
 Function DriverInstall()\r
-    Dim PropArray, devID\r
-       Dim devman, devmanEXE, devmanQL\r
+    Dim PropArray\r
+       Dim devman, devmanEXE\r
     Dim rc, cmd, CheckMode, sInstalldir, fso\r
        Dim DrvInstalled, idev, mlxdev, dev, dev_list\r
-       Dim need_IPOIB,need_SRP,need_VNIC,need_IOU\r
+       Dim WLH,need_IPOIB,need_SRP,need_VNIC\r
 \r
        On Error Resume Next\r
 \r
@@ -1036,30 +1151,22 @@ Function DriverInstall()
        End If\r
 \r
     sInstalldir = PropArray(0)\r
-       sVersionNT      = PropArray(4)\r
+       VersionNT       = PropArray(4)\r
        InstallThis     = PropArray(5)\r
 \r
-    devmanEXE = sInstalldir & "IBcore\devman.exe "\r
-    devmanEXE1 = "..\IBcore\devman.exe "\r
-    devman =    "cmd.exe /c cd /d " & sInstalldir & "IBcore & devman.exe "\r
-    devmanQL =  "cmd.exe /c cd /d " & sInstalldir & "qlgcvnic & " & devmanEXE1\r
-    devmanSRP = "cmd.exe /c cd /d " & sInstalldir & "SRP & " & devmanEXE1\r
-    devmanWV = "cmd.exe /c cd /d " & sInstalldir & "winverbs & " & devmanEXE1\r
-\r
-       dpinst = "cmd.exe /c cd /d " & sInstalldir & "IBcore & dpinst.exe "\r
-       dpinstWV = "cmd.exe /c cd /d " & sInstalldir & "winverbs & ..\IBcore\dpinst.exe "\r
+    devman = "cmd.exe /c cd /d " & sInstalldir & "IBcore & devman.exe "\r
 \r
     Set WshShell = CreateObject("WScript.Shell")\r
     Set fso = CreateObject("Scripting.FileSystemObject")\r
        \r
-    If Not fso.FileExists(devmanEXE) Then\r
-        msgbox "DriverInstall - missing file WinOF\IBcore\devman.exe"\r
+    If Not fso.FileExists(sInstalldir & "IBcore\devman.exe") Then\r
+        msgbox "DriverInstall: missing " & sInstalldir & "IBcore\devman.exe"\r
         DriverInstall=ERROR_FUNCTION_FAILED \r
         Exit Function\r
     End if\r
 \r
-    If Not fso.FileExists(sInstalldir & "IBcore\devman.exe") Then\r
-        msgbox "DriverInstall - missing file WinOF\IBcore\dpinst.exe"\r
+    If Not fso.FileExists(sInstalldir & "IBcore\dpinst.exe") Then\r
+        msgbox "DriverInstall: missing " & sInstalldir & "IBcore\dpinst.exe"\r
         DriverInstall=ERROR_FUNCTION_FAILED \r
         Exit Function\r
     End if\r
@@ -1093,58 +1200,30 @@ Function DriverInstall()
        need_VNIC       = instr(InstallThis,"fVNIC") _\r
                                        AND fso.FileExists(sInstalldir & "qlgcvnic\netvnic.inf")\r
 \r
-       need_IOU        = need_SRP + need_VNIC\r
-\r
-       ' Use DPINST.EXE for Svr 2008 & Vista Driver Install otherwise use devman\r
-\r
-       If sVersionNT >= 600 Then\r
-           DriverInstall = dpinst_install(WshShell,sInstalldir,need_IPOIB)\r
+       ' Flag Windows LongHorn Install (aka Vista | Server 2008)\r
+       If VersionNT >= 600 Then\r
+               WLH = 1\r
        Else\r
-           DriverInstall = devman_install(WshShell,sInstalldir,have_mthca,_\r
-                                                                               have_mlx4,need_IPOIB,need_IOU)\r
-       End If\r
-\r
-       If DriverInstall Then\r
-               Exit Function\r
-       End If\r
-       \r
-    ' Install Qlogic VNIC Driver\r
-       If need_VNIC Then\r
-               Install_VNIC WshShell,devmanQL\r
-    End if\r
-       \r
-    ' Install SRP (SCSI RDMA Protocol) Driver\r
-    If need_SRP Then\r
-               Install_SRP WshShell,devmanSRP\r
-       End If\r
-\r
-       If fso.FileExists(sInstalldir & "Xwinverbs\winverbs.inf") Then\r
-\r
-               ' install, don't start/insert\r
-               cmd = dpinstWV & "/S /F /SA /SE /SW /PATH """ & sInstalldir _\r
-                               & "winverbs""" \r
-\r
-        Return = WshShell.Run (cmd,0,true)\r
+               WLH = 0\r
+       End if\r
 \r
-        cmd = devmanWV & "classfilter InfinibandController upper +winverbs"\r
-        Return = WshShell.Run (cmd,0,true)\r
-        If Return <> 1 Then msgbox "winverbs\winverbs.inf(" & Return & ")"\r
+    DriverInstall=0\r
 \r
-        cmd = devmanWV & "disable =InfinibandController"\r
-        Return = WshShell.Run (cmd,0,true)\r
-        If Return <> 1 Then msgbox "winverbs\disable(" & Return & ")"\r
+       ' Use DPINST.EXE for Svr 2008 & Vista Driver Install (Windows LongHorn)\r
+       ' otherwise use devman.\r
 \r
-        cmd = devmanWV & "enable =InfinibandController"\r
-        Return = WshShell.Run (cmd,0,true)\r
-        If Return <> 1 Then msgbox "winverbs\enable(" & Return & ")"\r
+       If WLH Then\r
+           DriverInstall = dpinst_install(WshShell,sInstalldir,need_IPOIB,_\r
+                                                                               need_VNIC,need_SRP)\r
+       Else\r
+           DriverInstall = devman_install(WshShell,sInstalldir,have_mthca,_\r
+                                                                               have_mlx4,need_IPOIB,need_VNIC,need_SRP)\r
        End If\r
 \r
-    err.clear \r
-    DriverInstall=0\r
-\r
 End Function\r
 \r
 \r
+\r
 '''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''\r
 \r
 ' Find IBA devices using Devcon\r
@@ -1153,29 +1232,32 @@ Function Find_IBA_Devices(WshShell,sInstalldir)
        Dim dev\r
 \r
        Set ibaDevicesExec = WshShell.Exec ("cmd.exe /c cd " & sInstalldir & "IBcore & devman.exe findall * | FIND ""IBA""")\r
+\r
+       ' Set ibaDevicesExec = WshShell.Exec ("cmd.exe /c cd " & sInstalldir & "IBcore & devman.exe find IBA\*")\r
+\r
        ibaDevices = split(ibaDevicesExec.StdOut.ReadAll, vbCrLF)\r
 \r
-       ' Getting the array Size\r
+       ' Determine the actual array Size - dump nonessential lines from cmd output.\r
        dim arrSize\r
        arrSize = 0\r
-       for each dev in ibaDevices\r
+       For each dev in ibaDevices\r
                if (Instr(dev,"IBA\") = 1) Then\r
                        arrSize = arrSize + 1\r
                End if\r
-       next\r
+       Next\r
        'Creating array of IBA\ devices\r
        dim ibaDev()\r
        Redim ibaDev(arrSize - 1)\r
        index = 0\r
-       for each dev in ibaDevices\r
+       For each dev in ibaDevices\r
                if (Instr(dev,"IBA\") = 1) Then\r
                        ibaDev(index) = dev\r
                        index = index + 1\r
                End if\r
-       next\r
+       Next\r
 \r
-       ' Return array of devices\r
        Find_IBA_Devices=ibaDev \r
+\r
 End Function\r
 \r
 \r
@@ -1251,8 +1333,8 @@ Function remove_INF_file(WshShell,exe,LookFor)
        ' using dpinst.exe[WLH] or devman.exe[wnet/xp]?\r
        use_dpinst = Instr(exe,"dpinst")\r
 \r
-       cmd = "cmd.exe /c for /f %i in ('findstr /m " & LookFor & _\r
-                       " %WINDIR%\inf\oem*.inf') do @echo %i"\r
+       cmd = "cmd.exe /c for /f %i in ('findstr /m /c:""" & LookFor _\r
+                       & """ %WINDIR%\inf\oem*.inf') do @echo %i"\r
 \r
     Set infFilesExec = WshShell.Exec ( cmd )\r
 \r
@@ -1299,9 +1381,9 @@ End Function
 \r
 ' Remove QLogic VNIC instances\r
 \r
-Sub Uninstall_VNIC(fso,WshShell,devices,sInstalldir)\r
+Sub Uninstall_VNIC(fso,WshShell,devices,sInstalldir,VersionNT)\r
 \r
-       Dim devman,Return,device,dt,sDRIVERS\r
+       Dim devman,Return,device,dt,sDRIVERS,tool\r
 \r
        devman = "cmd.exe /c cd /d " & sInstalldir & "IBcore & devman.exe "\r
 \r
@@ -1321,7 +1403,13 @@ Sub Uninstall_VNIC(fso,WshShell,devices,sInstalldir)
            End if\r
        Next\r
 \r
-       remove_INF_file WshShell,devman,"qlgcvnic.sys"\r
+       If VersionNT >= 600 Then\r
+               tool = "cmd.exe /c cd /d " & sInstalldir & "IBcore & dpinst.exe "\r
+       Else\r
+               tool = devman\r
+       End If\r
+\r
+       remove_INF_file WshShell,tool,"qlgcvnic.sys"\r
 \r
        sDRIVERS = Session.Property("WindowsFolder") & "system32\drivers\"\r
        DriverFileDelete fso,WshShell,sDRIVERS & "vnic.sys"\r
@@ -1330,9 +1418,18 @@ Sub Uninstall_VNIC(fso,WshShell,devices,sInstalldir)
 End Sub\r
 \r
 \r
-Sub Uninstall_SRP(fso,WshShell,devices,sInstalldir)\r
+Sub Uninstall_SRP(fso,WshShell,devices,sInstalldir,VersionNT)\r
 \r
-       Dim devman,devmanRMAT,devmanDAAT,Return,device,sDRIVERS\r
+       Dim devman,devmanRMAT,devmanDAAT,Return,device,sDRIVERS,tool\r
+\r
+       ' QLogic Virtual FC I/O controller or\r
+       ' InfiniBand SRP Miniport: IBA\C0100C609EP0108 or IBA\CFF00C609EP0108\r
+       ' one driver handles all three.\r
+       DID = Array(_\r
+                       "IBA\V000002P00005A44",_\r
+                       "IBA\C0100C609EP0108",_\r
+                       "IBA\CFF00C609EP0108",_\r
+                       "IBA\V00066AP00000038")\r
 \r
        devman = "cmd.exe /c cd /d " & sInstalldir & "IBcore & devman.exe "\r
        devmanRMAT = devman & "remove @"\r
@@ -1343,30 +1440,32 @@ Sub Uninstall_SRP(fso,WshShell,devices,sInstalldir)
                devices = Find_IBA_Devices(WshShell,sInstalldir)\r
        End If\r
 \r
-       ' Remove SRP device - QLogic Virtual FC I/O controller instance?\r
-       For each deviceCan in devices\r
-           If (Instr(deviceCan,"IBA\V00066AP00000038")) Then\r
-               device = split(deviceCan, " ")\r
-                         ' disable the instance\r
-                     Return = WshShell.Run (devmanDAAT & device(0), 0, true)\r
-               ' Removing I/O Unit of the SRP\r
-               Return = WshShell.Run (devmanRMAT & device(0), 0, true)\r
-           End if\r
+       ' Remove SRP devices\r
+       '       QLogic Virtual FC I/O controller instance?\r
+       '       Either: IBA\C0100C609EP0108 or IBA\CFF00C609EP0108\r
+       '       Linux SRP target: IBA\V000002P00005A44\r
+       For each ID in DID\r
+               For each deviceCan in devices\r
+                       If Instr(deviceCan,ID) <> 0 Then\r
+                               device = split(deviceCan, ":")\r
+                       dt = rtrim(device(0))\r
+                               ' disable the instance\r
+                               Return = WshShell.Run (devmanDAAT & dt, 0, true)\r
+                               ' Removing SRP device\r
+                               Return = WshShell.Run (devmanRMAT & dt, 0, true)\r
+'msgbox "Uninstall_SRP() " & devmanRMAT & dt & " rc " & Return\r
+                       End if\r
+               Next\r
        Next\r
 \r
-       ' Removing SRP miniport devices.\r
-       ' Either: IBA\C0100C609EP0108 or IBA\CFF00C609EP0108\r
-       For each devTarget in devices\r
-           If (Instr(devTarget,"00C609EP0108")) Then\r
-               device = split(devTarget, " ")\r
-                         ' disable the instance\r
-                   Return = WshShell.Run (devmanDAAT & device(0), 0, true)\r
-               ' Removing SRP\r
-               Return = WshShell.Run (devmanRMAT & device(0), 0, true)\r
-           End if\r
-       Next\r
+       If VersionNT >= 600 Then\r
+               ' use dpinst.exe instead of devman.exe for Windows LongHorn++\r
+               tool = replace(devman,"devman","dpinst")\r
+       Else\r
+               tool = devman\r
+       End If\r
 \r
-       remove_INF_file WshShell,devman,"ibsrp.sys"\r
+       remove_INF_file WshShell,tool,"ibsrp.sys"\r
 \r
        sDRIVERS = Session.Property("WindowsFolder") & "system32\drivers\"\r
        DriverFileDelete fso,WshShell,sDRIVERS & "ibsrp.sys"\r
@@ -1404,11 +1503,10 @@ Sub remove_all_HCA_devices(WshShell,sInstalldir)
 \r
 End Sub\r
 \r
-Function Uninstall_IB_Devices(sInstalldir,sVersionNT,sRemove)\r
+Function Uninstall_IB_Devices(sInstalldir,VersionNT,sRemove)\r
 \r
-       Dim WshShell, fso, devices, cmd, dpinst, devman, devmanRMAT\r
+       Dim WshShell, fso, devices, cmd, dpinst, devman, devmanRMAT, tool\r
 \r
-       dpinst = "cmd.exe /c cd /d " & sInstalldir & "IBcore & dpinst.exe "\r
        devman = "cmd.exe /c cd /d " & sInstalldir & "IBcore & devman.exe "\r
 \r
        devmanRMAT = devman & "remove @"\r
@@ -1429,13 +1527,13 @@ Function Uninstall_IB_Devices(sInstalldir,sVersionNT,sRemove)
 \r
        devices = Find_IBA_Devices(WshShell,sInstalldir)\r
 \r
-       Uninstall_SRP fso,WshShell,devices,sInstalldir\r
+       Uninstall_SRP fso,WshShell,devices,sInstalldir,VersionNT\r
 \r
-       Uninstall_VNIC fso,WshShell,devices,sInstalldir\r
+       Uninstall_VNIC fso,WshShell,devices,sInstalldir,VersionNT\r
 \r
-       ' remove any lingering IB I/O Units\r
+       ' remove IB I/O Unit driver\r
        For each devTarget in devices\r
-           If (Instr(devTarget,"IBA\IB_IOU")) Then\r
+           If (Instr(devTarget,"InfiniBand I/O Unit")) Then\r
                device = split(devTarget, ":")\r
                dt = rtrim(device(0))\r
                        ' double-quote device name to ensure success.\r
@@ -1463,22 +1561,19 @@ Function Uninstall_IB_Devices(sInstalldir,sVersionNT,sRemove)
        ' Old (CoInstaller version) ibbus GUID - just in case.\r
        Return = WshShell.Run (devman & "remove {94F41CED-78EB-407C-B5DF-958040AF0FD8",0,true)\r
 \r
-    ' remove 3rd party driver packages (ibsrp, vnic, ipoib, mthca, Connectx)\r
+    ' remove 3rd party driver packages (ibsrp, vnic, ipoib, mthca, ConnectX)\r
        ' use dpinst.exe for Server 2008 & Vista as dpinst was used to install.\r
 \r
-       If sVersionNT >= 600 Then\r
-               remove_INF_file WshShell,dpinst,"ibiou"\r
-               remove_INF_file WshShell,dpinst,"ipoib"\r
-               remove_INF_file WshShell,dpinst,"winverb"\r
-               remove_INF_file WshShell,dpinst,"mthca"\r
-               remove_INF_file WshShell,dpinst,"mlx4_"\r
+       If VersionNT >= 600 Then\r
+               tool = "cmd.exe /c cd /d " & sInstalldir & "IBcore & dpinst.exe "\r
        Else\r
-               remove_INF_file WshShell,devman,"ibiou"\r
-               remove_INF_file WshShell,devman,"ipoib"\r
-               remove_INF_file WshShell,devman,"winverb"\r
-               remove_INF_file WshShell,devman,"mthca"\r
-               remove_INF_file WshShell,devman,"mlx4_"\r
+               tool = devman\r
        End If\r
+\r
+       remove_INF_file WshShell,tool,"ibiou"\r
+       remove_INF_file WshShell,tool,"ipoib"\r
+       remove_INF_file WshShell,tool,"mthca"\r
+       remove_INF_file WshShell,tool,"mlx4_"\r
     \r
        Uninstall_IB_Devices = 0\r
 \r
@@ -1506,12 +1601,12 @@ Sub DriverUninstall()
        End If\r
 \r
        If sVersionNT <> 501 AND fso.FileExists(sInstalldir & "installsp.exe") Then\r
-               Return = WshShell.Run ("cmd.exe /c cd " & sInstalldir & _\r
+               Return = WshShell.Run ("cmd.exe /c cd /d " & sInstalldir & _\r
                                   " & installsp.exe -r", 0, true)\r
        End If\r
 \r
        If fso.FileExists(sInstalldir & "net\ndinstall.exe") Then\r
-           Return = WshShell.Run ("cmd.exe /c cd " & sInstalldir & _\r
+           Return = WshShell.Run ("cmd.exe /c cd /d " & sInstalldir & _\r
                                   " & net\ndinstall.exe -r", 0, true)\r
        End If\r
        \r
@@ -1565,6 +1660,7 @@ Sub DriverUninstall()
                        "Services\ibiou",_\r
                        "Services\qlgcvnic",_\r
                        "Services\ibsrp",_\r
+                       "Services\winmad",_\r
                        "Services\winverbs" )\r
 \r
        base = "reg.exe delete HKLM\SYSTEM\CurrentControlSet\" \r
@@ -1576,7 +1672,10 @@ Sub DriverUninstall()
                End if\r
        Next\r
 \r
+       ' Cleanup KMDF CoInstaller Driver entries.\r
        Return = WshShell.Run (base & "Control\Wdf\Kmdf\kmdflibrary\versions\1\driverservices /v mlx4_bus /f", 0, true)\r
+       Return = WshShell.Run (base & "Control\Wdf\Kmdf\kmdflibrary\versions\1\driverservices /v winverbs /f", 0, true)\r
+       Return = WshShell.Run (base & "Control\Wdf\Kmdf\kmdflibrary\versions\1\driverservices /v winmad /f", 0, true)\r
 \r
 ' Not yet\r
 '      Return = WshShell.Run ("reg.exe delete HKLM\Software\Microsoft\Windows\currentVersion\DIFx\DriverStore\WinVerbs_* /f", 0, true)\r
@@ -1617,7 +1716,7 @@ Sub WSDEnable()
 \r
       If fso.FileExists(sInstalldir & "installsp.exe") Then\r
           ' install the WinSockdirect service\r
-         Return = WshShell.Run ("cmd.exe /c cd " & sInstalldir _\r
+         Return = WshShell.Run ("cmd.exe /c cd /d " & sInstalldir _\r
                                  & " & installsp.exe -i", 0, true)\r
       End If\r
       If Err Then ShowError\r
@@ -1639,7 +1738,7 @@ Sub ND_StartMeUp()
     ' 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
+        Return = WshShell.Run ("cmd.exe /c cd /d " & sInstalldir _\r
                                & " & net\ndinstall.exe -i", 0, true)\r
         If Err Then ShowErr2("ND service install failed")\r
     End If\r
@@ -1834,7 +1933,7 @@ Function ChkInstallAndReboot()
     ' the system will be rebooted.\r
     dim res\r
        \r
-    res = WshShell.Popup("Existing InfiniBand installation has been removed." _\r
+    res = WshShell.popup("Existing InfiniBand installation has been removed." _\r
              & vbCRLF & vbCRLF & "Automatic REBOOT in 10 seconds."_\r
              & vbCRLF & "Please re-install WinOF."_\r
              ,13,"WinOF - Existing InfiniBand installation Detected")\r
@@ -1901,13 +2000,13 @@ End Sub
 ' Settings for '%PATH%' have changed. Run nsc to do the broadcast.\r
  \r
 Sub BcastRegChanged\r
-    Dim RC, sInstallDir\r
+    Dim sInstallDir\r
     Set WshShell=CreateObject("WScript.Shell")\r
 \r
     sInstallDir = Session.Property("INSTALLDIR")\r
 \r
        On Error Resume Next \r
-    WshShell.Run "%COMSPEC% /c cd " & sInstallDir & " & nsc.exe", 0, true\r
+    WshShell.Run "%COMSPEC% /c cd /d " & sInstallDir & " & nsc.exe", 0, true\r
     Err.clear\r
     BcastRegChanged = 0\r
 \r
@@ -1921,7 +2020,7 @@ End Sub
 ' Immediate execution; called after MsiCleanupOnSuccess (REMOVE="ALL")\r
 \r
 Sub HammerTime\r
-    Dim fso, sInstallDir, RC, cmd\r
+    Dim fso, sInstallDir, rc, cmd\r
 \r
     Set fso=CreateObject("Scripting.FileSystemObject") \r
     Set WshShell=CreateObject("WScript.Shell")\r
@@ -1929,7 +2028,7 @@ Sub HammerTime
     sInstallDir = Session.Property("INSTALLDIR")\r
     If fso.FolderExists(sInstallDir) Then\r
         cmd = "cmd.exe /c rmdir /S /Q """ & sInstallDir & """"\r
-        RC = wshShell.Run(cmd,0,true)\r
+        rc = wshShell.Run(cmd,0,true)\r
     End if\r
 \r
     RemoveFolder "C:\IBSDK"\r
@@ -1985,7 +2084,7 @@ End Function
 \r
 Function InstallChanged\r
 \r
-    Dim RC, sInstallDir, sAddLocal, sRemove, sDRIVERS, NeedReboot\r
+    Dim rc, sInstallDir, sAddLocal, sRemove, sDRIVERS, NeedReboot, WLH\r
     Err.clear\r
 \r
     sRemove = Session.Property("REMOVE")\r
@@ -1998,35 +2097,48 @@ Function InstallChanged
 \r
        NeedReboot = 0\r
 \r
-    sInstallDir = Session.Property("INSTALLDIR")\r
+    sInstalldir = Session.Property("INSTALLDIR")\r
     sAddLocal = Session.Property("ADDLOCAL")\r
 \r
-    devman =    "cmd.exe /c cd /d " & sInstalldir & "IBcore & devman.exe "\r
-    devmanEXE1 = "..\IBcore\devman.exe "\r
-    devmanQL =  "cmd.exe /c cd /d " & sInstalldir & "qlgcvnic & " & devmanEXE1\r
-    devmanSRP = "cmd.exe /c cd /d " & sInstalldir & "SRP & " & devmanEXE1\r
+       ' Flag Windows LongHorn Install (aka Vista | Server 2008)\r
+       VersionNT = Session.Property("VersionNT")\r
+       If VersionNT >= 600 Then\r
+               WLH = 1\r
+       Else\r
+               WLH = 0\r
+       End if\r
 \r
        On Error Resume Next \r
 \r
        If (Not IsNull(sAddLocal)) AND (sAddLocal <> "") Then\r
                If Instr(sAddLocal,"fSRP") OR Instr(sAddLocal,"fVNIC") Then\r
-                       Install_IOU WshShell,devman\r
+                       ' IOU driver loaded into driver store when HCA driver installed.\r
+                       If WLH = 0 Then\r
+                               devman_Install_IOU WshShell,sInstalldir\r
+                       End If\r
                End If\r
 \r
                If Instr(sAddLocal,"fSRP") Then\r
                If fso.FileExists(sInstalldir & "SRP\ib_srp.inf") Then\r
-                               Install_SRP WshShell,devmanSRP\r
+                               If WLH Then\r
+                                       rc = dpinst_Install_SRP(WshShell,sInstalldir)\r
+                               Else\r
+                                       rc = devman_Install_SRP(WshShell,sInstalldir)\r
+                               End If\r
                        Else\r
-                       msgbox "Install_SRP - missing " & sInstalldir & "SRP\ib_srp.inf"\r
+                       msgbox "ERR: missing " & sInstalldir & "SRP\ib_srp.inf"\r
                        End If\r
                End If\r
 \r
                If Instr(sAddLocal,"fVNIC") Then\r
                If fso.FileExists(sInstalldir & "qlgcvnic\netvnic.inf") Then\r
-                               Install_VNIC WshShell,devmanQL\r
+                               If WLH Then\r
+                                       rc = dpinst_Install_VNIC(WshShell,sInstalldir)\r
+                               Else\r
+                                       devman_Install_VNIC WshShell,sInstalldir\r
+                               End If\r
                        Else\r
-                               msgbox "Install_VNIC - missing " & sInstalldir & _\r
-                                               "qlgcvnic\netvnic.inf"\r
+                               msgbox "Err: missing " & sInstalldir & "qlgcvnic\netvnic.inf"\r
                        End If\r
                End If\r
        End If\r
@@ -2034,12 +2146,12 @@ Function InstallChanged
        If (Not IsNull(sRemove)) AND (sRemove <> "") Then\r
 \r
                If Instr(sRemove,"fSRP") Then\r
-                       Uninstall_SRP fso,WshShell,Null,sInstalldir\r
+                       Uninstall_SRP fso,WshShell,Null,sInstalldir,VersionNT\r
                        NeedReboot = NeedReboot + 1\r
                End If\r
 \r
                If Instr(sRemove,"fVNIC") Then\r
-                       Uninstall_VNIC fso,WshShell,Null,sInstalldir\r
+                       Uninstall_VNIC fso,WshShell,Null,sInstalldir,VersionNT\r
                        NeedReboot = NeedReboot + 1\r
                End If\r
        End If\r
@@ -2047,7 +2159,7 @@ Function InstallChanged
        If NeedReboot Then\r
                Session.Property("REBOOT") = "FORCE"      \r
                InstallChanged = ERROR_SUCCESS_REBOOT_REQUIRED\r
-               ' until forced rebot relly works....\r
+               ' until forced reboot relly works....\r
                msgbox "A system reboot is required to complete this operation." _\r
                                & vbCrLf & "Please do so at your earliest convinence."\r
        End If\r
index ad9c28b..3d9e747 100644 (file)
               <File Id="winverbsd.dll" Compressed="yes" DiskId="1"\r
                     LongName="winverbsd.dll" Name="winvrbsd.dll"\r
                     Source="..\bin\HCA\ia64\winverbsd.dll" />\r
+              <File Id="winmad.sys" Compressed="yes" DiskId="1"\r
+                    LongName="winmad.sys" Name="winmad.sys"\r
+                    Source="..\bin\HCA\ia64\winmad.sys" />\r
+              <File Id="winmad.pdb" Compressed="yes" DiskId="1"\r
+                    LongName="winmad.pdb" Name="winmad.pdb"\r
+                    Source="..\bin\HCA\ia64\winmad.pdb" />\r
+              <File Id="winmad.dll" Compressed="yes" DiskId="1"\r
+                    LongName="winmad.dll" Name="winmad.dll"\r
+                    Source="..\bin\HCA\ia64\winmad.dll" />\r
+              <File Id="winmadd.dll" Compressed="yes" DiskId="1"\r
+                    LongName="winmadd.dll" Name="winmaddd.dll"\r
+                    Source="..\bin\HCA\ia64\winmadd.dll" />\r
             </Component>\r
           </Directory>\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
+              <CopyFile Id="dupLibibverbs.dll" FileId="libibverbs.dll"\r
                      DestinationName="ibverbs.dll"\r
                      DestinationLongName="libibverbs.dll"\r
                      DestinationProperty="WindowsFolder" />\r
+            <File Id="libibverbs.pdb" Compressed="yes" DiskId="1"\r
+                  LongName="libibverbs.pdb" Name="ibverbs.pdb"\r
+                  Source="..\bin\HCA\ia64\libibverbs.pdb" />\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
-              <CopyFile Id="dupLibibvd.dll" FileId="libibverbsd.dll"\r
+              <CopyFile Id="dupLibibverbsd.dll" FileId="libibverbsd.dll"\r
                      DestinationName="ibverbsd.dll"\r
                      DestinationLongName="libibverbsd.dll"\r
                      DestinationProperty="WindowsFolder" />\r
+            <File Id="libibverbsd.pdb" Compressed="yes" DiskId="1"\r
+                  LongName="libibverbsd.pdb" Name="ibverbsd.pdb"\r
+                  Source="..\bin\HCA\ia64\libibverbsd.pdb" />\r
+\r
+            <File Id="libibmad.dll" Compressed="yes" DiskId="1"\r
+                  LongName="libibmad.dll" Name="ibmad.dll"\r
+                  Source="..\bin\HCA\ia64\libibmad.dll" />\r
+              <CopyFile Id="dupLibibmad.dll" FileId="libibmad.dll"\r
+                     DestinationName="ibmad.dll"\r
+                     DestinationLongName="libibmad.dll"\r
+                     DestinationProperty="WindowsFolder" />\r
+            <File Id="libibmad.pdb" Compressed="yes" DiskId="1"\r
+                  LongName="libibmad.pdb" Name="ibmad.pdb"\r
+                  Source="..\bin\HCA\ia64\libibmad.pdb" />\r
+\r
+            <File Id="libibmadd.dll" Compressed="yes" DiskId="1"\r
+                  LongName="libibmadd.dll" Name="ibmadd.dll"\r
+                  Source="..\bin\HCA\ia64\libibmadd.dll" />\r
+              <CopyFile Id="dupLibibmadd.dll" FileId="libibmadd.dll"\r
+                     DestinationName="ibmadd.dll"\r
+                     DestinationLongName="libibmadd.dll"\r
+                     DestinationProperty="WindowsFolder" />\r
+            <File Id="libibmadd.pdb" Compressed="yes" DiskId="1"\r
+                  LongName="libibmadd.pdb" Name="ibmadd.pdb"\r
+                  Source="..\bin\HCA\ia64\libibmadd.pdb" />\r
+\r
+            <File Id="libibumad.dll" Compressed="yes" DiskId="1"\r
+                  LongName="libibumad.dll" Name="ibumad.dll"\r
+                  Source="..\bin\HCA\ia64\libibumad.dll" />\r
+              <CopyFile Id="dupLibibumad.dll" FileId="libibumad.dll"\r
+                     DestinationName="ibumad.dll"\r
+                     DestinationLongName="libibumad.dll"\r
+                     DestinationProperty="WindowsFolder" />\r
+            <File Id="libibumad.pdb" Compressed="yes" DiskId="1"\r
+                  LongName="libibumad.pdb" Name="ibumad.pdb"\r
+                  Source="..\bin\HCA\ia64\libibumad.pdb" />\r
+\r
+            <File Id="libibumadd.dll" Compressed="yes" DiskId="1"\r
+                  LongName="libibumadd.dll" Name="ibumadd.dll"\r
+                  Source="..\bin\HCA\ia64\libibumadd.dll" />\r
+              <CopyFile Id="dupLibibumadd.dll" FileId="libibumadd.dll"\r
+                     DestinationName="ibumadd.dll"\r
+                     DestinationLongName="libibumadd.dll"\r
+                     DestinationProperty="WindowsFolder" />\r
+            <File Id="libibumadd.pdb" Compressed="yes" DiskId="1"\r
+                  LongName="libibumadd.pdb" Name="ibumadd.pdb"\r
+                  Source="..\bin\HCA\ia64\libibumadd.pdb" />\r
           </Component>\r
 \r
           <Component Id="cWinVerbsUApps"\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_asyncwatch.pdb" Compressed="yes" DiskId="1"\r
+                  LongName="ibv_asyncwatch.pdb" Name="asyncwat.pdb"\r
+                  Source="..\bin\tools\ia64\release\ibv_asyncwatch.pdb" />\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_devinfo.pdb" Compressed="yes" DiskId="1"\r
+                  LongName="ibv_devinfo.pdb" Name="devinfo.pdb"\r
+                  Source="..\bin\tools\ia64\release\ibv_devinfo.pdb" />\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_rc_pingpong.pdb" Compressed="yes" DiskId="1"\r
+                  LongName="ibv_rc_pingpong.pdb" Name="ibv_rc_p.pdb"\r
+                  Source="..\bin\tools\ia64\release\ibv_rc_pingpong.pdb" />\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_bw.pdb" Compressed="yes" DiskId="1"\r
+                  LongName="ibv_read_bw.pdb" Name="readbw.pdb"\r
+                  Source="..\bin\tools\ia64\release\ibv_read_bw.pdb" />\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_read_lat.pdb" Compressed="yes" DiskId="1"\r
+                  LongName="ibv_read_lat.pdb" Name="readlat.pdb"\r
+                  Source="..\bin\tools\ia64\release\ibv_read_lat.pdb" />\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_bw.pdb" Compressed="yes" DiskId="1"\r
+                  LongName="ibv_send_bw.pdb" Name="send_bw.pdb"\r
+                  Source="..\bin\tools\ia64\release\ibv_send_bw.pdb" />\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_send_lat.pdb" Compressed="yes" DiskId="1"\r
+                  LongName="ibv_send_lat.pdb" Name="send_lat.pdb"\r
+                  Source="..\bin\tools\ia64\release\ibv_send_lat.pdb" />\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_uc_pingpong.pdb" Compressed="yes" DiskId="1"\r
+                  LongName="ibv_uc_pingpong.pdb" Name="uc_ping.pdb"\r
+                  Source="..\bin\tools\ia64\release\ibv_uc_pingpong.pdb" />\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_ud_pingpong.pdb" Compressed="yes" DiskId="1"\r
+                  LongName="ibv_ud_pingpong.pdb" Name="ud_ping.pdb"\r
+                  Source="..\bin\tools\ia64\release\ibv_ud_pingpong.pdb" />\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_bw.pdb" Compressed="yes" DiskId="1"\r
+                  LongName="ibv_write_bw.pdb" Name="write_bw.pdb"\r
+                  Source="..\bin\tools\ia64\release\ibv_write_bw.pdb" />\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
+            <File Id="ibv_write_lat.pdb" Compressed="yes" DiskId="1"\r
+                  LongName="ibv_write_lat.pdb" Name="writelat.pdb"\r
+                  Source="..\bin\tools\ia64\release\ibv_write_lat.pdb" />\r
+            <File Id="sminfo.exe" Compressed="yes" DiskId="1"\r
+                  LongName="sminfo.exe" Name="sminfo.exe"\r
+                  Source="..\bin\tools\ia64\release\sminfo.exe" />\r
+            <File Id="sminfo.pdb" Compressed="yes" DiskId="1"\r
+                  LongName="sminfo.pdb" Name="sminfo.pdb"\r
+                  Source="..\bin\tools\ia64\release\sminfo.pdb" />\r
+            <File Id="ibstat.exe" Compressed="yes" DiskId="1"\r
+                  LongName="ibstat.exe" Name="ibstat.exe"\r
+                  Source="..\bin\tools\ia64\release\ibstat.exe" />\r
+            <File Id="ibstat.pdb" Compressed="yes" DiskId="1"\r
+                  LongName="ibstat.pdb" Name="ibstat.pdb"\r
+                  Source="..\bin\tools\ia64\release\ibstat.pdb" />\r
+            <File Id="perfquery.exe" Compressed="yes" DiskId="1"\r
+                  LongName="perfquery.exe" Name="perfquer.exe"\r
+                  Source="..\bin\tools\ia64\release\perfquery.exe" />\r
+            <File Id="perfquery.pdb" Compressed="yes" DiskId="1"\r
+                  LongName="perfquery.pdb" Name="perfquer.pdb"\r
+                  Source="..\bin\tools\ia64\release\perfquery.pdb" />\r
+            <File Id="ibaddr.exe" Compressed="yes" DiskId="1"\r
+                  LongName="ibaddr.exe" Name="ibaddr.exe"\r
+                  Source="..\bin\tools\ia64\release\ibaddr.exe" />\r
+            <File Id="ibaddr.pdb" Compressed="yes" DiskId="1"\r
+                  LongName="ibaddr.pdb" Name="ibaddr.pdb"\r
+                  Source="..\bin\tools\ia64\release\ibaddr.pdb" />\r
           </Component>\r
 \r
           <Directory Id="ipoibDir" Name="net">\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
-\r
+                    Source="..\bin\HCA\x86\winverbs.lib" />\r
               <File Id="winverbsd.lib" Compressed="yes" DiskId="1"\r
                     LongName="winverbsd.lib" Name="winvrbsd.lib"\r
-                    Source="..\bin\HCA\ia64\winverbsd.lib" />\r
+                    Source="..\bin\HCA\x86\winverbsd.lib" />\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
-\r
+                    Source="..\bin\HCA\x86\libibverbs.lib" />\r
+              <File Id="libibverbs2.pdb" Compressed="yes" DiskId="1"\r
+                    LongName="libibverbs.pdb" Name="ibverbs.pdb"\r
+                    Source="..\bin\HCA\x86\libibverbs.pdb" />\r
               <File Id="libibverbsd.lib" Compressed="yes" DiskId="1"\r
                     LongName="libibverbsd.lib" Name="ibverbsd.lib"\r
-                    Source="..\bin\HCA\ia64\libibverbsd.lib" />\r
+                    Source="..\bin\HCA\x86\libibverbsd.lib" />\r
+              <File Id="libibverbsd2.pdb" Compressed="yes" DiskId="1"\r
+                    LongName="libibverbsd.pdb" Name="ibverbsd.pdb"\r
+                    Source="..\bin\HCA\x86\libibverbsd.pdb" />\r
+\r
+              <File Id="libibmad.lib" Compressed="yes" DiskId="1"\r
+                    LongName="libibmad.lib" Name="ibmad.lib"\r
+                    Source="..\bin\HCA\x86\libibmad.lib" />\r
+              <File Id="libibmad2.pdb" Compressed="yes" DiskId="1"\r
+                    LongName="libibmad.pdb" Name="ibmad.pdb"\r
+                    Source="..\bin\HCA\x86\libibmad.pdb" />\r
+              <File Id="libibmadd.lib" Compressed="yes" DiskId="1"\r
+                    LongName="libibmadd.lib" Name="ibmadd.lib"\r
+                    Source="..\bin\HCA\x86\libibmadd.lib" />\r
+              <File Id="libibmadd2.pdb" Compressed="yes" DiskId="1"\r
+                    LongName="libibmadd.pdb" Name="ibmadd.pdb"\r
+                    Source="..\bin\HCA\x86\libibmadd.pdb" />\r
+\r
+              <File Id="libibumad.lib" Compressed="yes" DiskId="1"\r
+                    LongName="libibumad.lib" Name="ibumad.lib"\r
+                    Source="..\bin\HCA\x86\libibumad.lib" />\r
+              <File Id="libibumad2.pdb" Compressed="yes" DiskId="1"\r
+                    LongName="libibumad.pdb" Name="ibumad.pdb"\r
+                    Source="..\bin\HCA\x86\libibumad.pdb" />\r
+              <File Id="libibumadd.lib" Compressed="yes" DiskId="1"\r
+                    LongName="libibumadd.lib" Name="ibumadd.lib"\r
+                    Source="..\bin\HCA\x86\libibumadd.lib" />\r
+              <File Id="libibumadd2.pdb" Compressed="yes" DiskId="1"\r
+                    LongName="libibumadd.pdb" Name="ibumadd.pdb"\r
+                    Source="..\bin\HCA\x86\libibumadd.pdb" />\r
               </Component>\r
             </Directory>\r
 \r
index 627df72..885961d 100644 (file)
               <File Id="winverbsd.dll" Compressed="yes" DiskId="1"\r
                     LongName="winverbsd.dll" Name="winvrbsd.dll"\r
                     Source="..\bin\HCA\amd64\winverbsd.dll" />\r
+              <File Id="winmad.sys" Compressed="yes" DiskId="1"\r
+                    LongName="winmad.sys" Name="winmad.sys"\r
+                    Source="..\bin\HCA\amd64\winmad.sys" />\r
+              <File Id="winmad.pdb" Compressed="yes" DiskId="1"\r
+                    LongName="winmad.pdb" Name="winmad.pdb"\r
+                    Source="..\bin\HCA\amd64\winmad.pdb" />\r
+              <File Id="winmad.dll" Compressed="yes" DiskId="1"\r
+                    LongName="winmad.dll" Name="winmad.dll"\r
+                    Source="..\bin\HCA\amd64\winmad.dll" />\r
+              <File Id="winmadd.dll" Compressed="yes" DiskId="1"\r
+                    LongName="winmadd.dll" Name="winmaddd.dll"\r
+                    Source="..\bin\HCA\amd64\winmadd.dll" />\r
             </Component>\r
 \r
           </Directory>\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
+              <CopyFile Id="dupLibibverbs.dll" FileId="libibverbs.dll"\r
                      DestinationName="ibverbs.dll"\r
                      DestinationLongName="libibverbs.dll"\r
                      DestinationProperty="WindowsFolder" />\r
+            <File Id="libibverbs.pdb" Compressed="yes" DiskId="1"\r
+                  LongName="libibverbs.pdb" Name="ibverbs.pdb"\r
+                  Source="..\bin\HCA\amd64\libibverbs.pdb" />\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
-              <CopyFile Id="dupLibibvd.dll" FileId="libibverbsd.dll"\r
+              <CopyFile Id="dupLibibverbsd.dll" FileId="libibverbsd.dll"\r
                      DestinationName="ibverbsd.dll"\r
                      DestinationLongName="libibverbsd.dll"\r
                      DestinationProperty="WindowsFolder" />\r
+            <File Id="libibverbsd.pdb" Compressed="yes" DiskId="1"\r
+                  LongName="libibverbsd.pdb" Name="ibverbsd.pdb"\r
+                  Source="..\bin\HCA\amd64\libibverbsd.pdb" />\r
+\r
+            <File Id="libibmad.dll" Compressed="yes" DiskId="1"\r
+                  LongName="libibmad.dll" Name="ibmad.dll"\r
+                  Source="..\bin\HCA\amd64\libibmad.dll" />\r
+              <CopyFile Id="dupLibibmad.dll" FileId="libibmad.dll"\r
+                     DestinationName="ibmad.dll"\r
+                     DestinationLongName="libibmad.dll"\r
+                     DestinationProperty="WindowsFolder" />\r
+            <File Id="libibmad.pdb" Compressed="yes" DiskId="1"\r
+                  LongName="libibmad.pdb" Name="ibmad.pdb"\r
+                  Source="..\bin\HCA\amd64\libibmad.pdb" />\r
+\r
+            <File Id="libibmadd.dll" Compressed="yes" DiskId="1"\r
+                  LongName="libibmadd.dll" Name="ibmadd.dll"\r
+                  Source="..\bin\HCA\amd64\libibmadd.dll" />\r
+              <CopyFile Id="dupLibibmadd.dll" FileId="libibmadd.dll"\r
+                     DestinationName="ibmadd.dll"\r
+                     DestinationLongName="libibmadd.dll"\r
+                     DestinationProperty="WindowsFolder" />\r
+            <File Id="libibmadd.pdb" Compressed="yes" DiskId="1"\r
+                  LongName="libibmadd.pdb" Name="ibmadd.pdb"\r
+                  Source="..\bin\HCA\amd64\libibmadd.pdb" />\r
+\r
+            <File Id="libibumad.dll" Compressed="yes" DiskId="1"\r
+                  LongName="libibumad.dll" Name="ibumad.dll"\r
+                  Source="..\bin\HCA\amd64\libibumad.dll" />\r
+              <CopyFile Id="dupLibibumad.dll" FileId="libibumad.dll"\r
+                     DestinationName="ibumad.dll"\r
+                     DestinationLongName="libibumad.dll"\r
+                     DestinationProperty="WindowsFolder" />\r
+            <File Id="libibumad.pdb" Compressed="yes" DiskId="1"\r
+                  LongName="libibumad.pdb" Name="ibumad.pdb"\r
+                  Source="..\bin\HCA\amd64\libibumad.pdb" />\r
+\r
+            <File Id="libibumadd.dll" Compressed="yes" DiskId="1"\r
+                  LongName="libibumadd.dll" Name="ibumadd.dll"\r
+                  Source="..\bin\HCA\amd64\libibumadd.dll" />\r
+              <CopyFile Id="dupLibibumadd.dll" FileId="libibumadd.dll"\r
+                     DestinationName="ibumadd.dll"\r
+                     DestinationLongName="libibumadd.dll"\r
+                     DestinationProperty="WindowsFolder" />\r
+            <File Id="libibumadd.pdb" Compressed="yes" DiskId="1"\r
+                  LongName="libibumadd.pdb" Name="ibumadd.pdb"\r
+                  Source="..\bin\HCA\amd64\libibumadd.pdb" />\r
           </Component>\r
 \r
           <Component Id="cWinVerbsUApps"\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_asyncwatch.pdb" Compressed="yes" DiskId="1"\r
+                  LongName="ibv_asyncwatch.pdb" Name="asyncwat.pdb"\r
+                  Source="..\bin\tools\amd64\release\ibv_asyncwatch.pdb" />\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_devinfo.pdb" Compressed="yes" DiskId="1"\r
+                  LongName="ibv_devinfo.pdb" Name="devinfo.pdb"\r
+                  Source="..\bin\tools\amd64\release\ibv_devinfo.pdb" />\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_rc_pingpong.pdb" Compressed="yes" DiskId="1"\r
+                  LongName="ibv_rc_pingpong.pdb" Name="ibv_rc_p.pdb"\r
+                  Source="..\bin\tools\amd64\release\ibv_rc_pingpong.pdb" />\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_bw.pdb" Compressed="yes" DiskId="1"\r
+                  LongName="ibv_read_bw.pdb" Name="readbw.pdb"\r
+                  Source="..\bin\tools\amd64\release\ibv_read_bw.pdb" />\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_read_lat.pdb" Compressed="yes" DiskId="1"\r
+                  LongName="ibv_read_lat.pdb" Name="readlat.pdb"\r
+                  Source="..\bin\tools\amd64\release\ibv_read_lat.pdb" />\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_bw.pdb" Compressed="yes" DiskId="1"\r
+                  LongName="ibv_send_bw.pdb" Name="send_bw.pdb"\r
+                  Source="..\bin\tools\amd64\release\ibv_send_bw.pdb" />\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_send_lat.pdb" Compressed="yes" DiskId="1"\r
+                  LongName="ibv_send_lat.pdb" Name="send_lat.pdb"\r
+                  Source="..\bin\tools\amd64\release\ibv_send_lat.pdb" />\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_uc_pingpong.pdb" Compressed="yes" DiskId="1"\r
+                  LongName="ibv_uc_pingpong.pdb" Name="uc_ping.pdb"\r
+                  Source="..\bin\tools\amd64\release\ibv_uc_pingpong.pdb" />\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_ud_pingpong.pdb" Compressed="yes" DiskId="1"\r
+                  LongName="ibv_ud_pingpong.pdb" Name="ud_ping.pdb"\r
+                  Source="..\bin\tools\amd64\release\ibv_ud_pingpong.pdb" />\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_bw.pdb" Compressed="yes" DiskId="1"\r
+                  LongName="ibv_write_bw.pdb" Name="write_bw.pdb"\r
+                  Source="..\bin\tools\amd64\release\ibv_write_bw.pdb" />\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
+            <File Id="ibv_write_lat.pdb" Compressed="yes" DiskId="1"\r
+                  LongName="ibv_write_lat.pdb" Name="writelat.pdb"\r
+                  Source="..\bin\tools\amd64\release\ibv_write_lat.pdb" />\r
+            <File Id="sminfo.exe" Compressed="yes" DiskId="1"\r
+                  LongName="sminfo.exe" Name="sminfo.exe"\r
+                  Source="..\bin\tools\amd64\release\sminfo.exe" />\r
+            <File Id="sminfo.pdb" Compressed="yes" DiskId="1"\r
+                  LongName="sminfo.pdb" Name="sminfo.pdb"\r
+                  Source="..\bin\tools\amd64\release\sminfo.pdb" />\r
+            <File Id="ibstat.exe" Compressed="yes" DiskId="1"\r
+                  LongName="ibstat.exe" Name="ibstat.exe"\r
+                  Source="..\bin\tools\amd64\release\ibstat.exe" />\r
+            <File Id="ibstat.pdb" Compressed="yes" DiskId="1"\r
+                  LongName="ibstat.pdb" Name="ibstat.pdb"\r
+                  Source="..\bin\tools\amd64\release\ibstat.pdb" />\r
+            <File Id="perfquery.exe" Compressed="yes" DiskId="1"\r
+                  LongName="perfquery.exe" Name="perfquer.exe"\r
+                  Source="..\bin\tools\amd64\release\perfquery.exe" />\r
+            <File Id="perfquery.pdb" Compressed="yes" DiskId="1"\r
+                  LongName="perfquery.pdb" Name="perfquer.pdb"\r
+                  Source="..\bin\tools\amd64\release\perfquery.pdb" />\r
+            <File Id="ibaddr.exe" Compressed="yes" DiskId="1"\r
+                  LongName="ibaddr.exe" Name="ibaddr.exe"\r
+                  Source="..\bin\tools\amd64\release\ibaddr.exe" />\r
+            <File Id="ibaddr.pdb" Compressed="yes" DiskId="1"\r
+                  LongName="ibaddr.pdb" Name="ibaddr.pdb"\r
+                  Source="..\bin\tools\amd64\release\ibaddr.pdb" />\r
           </Component>\r
 \r
           <Directory Id="ipoibDir" Name="net">\r
               <File Id="winverbs.lib" Compressed="yes" DiskId="1"\r
                     LongName="winverbs.lib" Name="winverbs.lib"\r
                     Source="..\bin\HCA\amd64\winverbs.lib" />\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
               <File Id="libibverbs.lib" Compressed="yes" DiskId="1"\r
                     LongName="libibverbs.lib" Name="ibverbs.lib"\r
                     Source="..\bin\HCA\amd64\libibverbs.lib" />\r
-\r
+              <File Id="libibverbs2.pdb" Compressed="yes" DiskId="1"\r
+                    LongName="libibverbs.pdb" Name="ibverbs.pdb"\r
+                    Source="..\bin\HCA\amd64\libibverbs.pdb" />\r
               <File Id="libibverbsd.lib" Compressed="yes" DiskId="1"\r
                     LongName="libibverbsd.lib" Name="ibverbsd.lib"\r
                     Source="..\bin\HCA\amd64\libibverbsd.lib" />\r
+              <File Id="libibverbsd2.pdb" Compressed="yes" DiskId="1"\r
+                    LongName="libibverbsd.pdb" Name="ibverbsd.pdb"\r
+                    Source="..\bin\HCA\amd64\libibverbsd.pdb" />\r
+\r
+              <File Id="libibmad.lib" Compressed="yes" DiskId="1"\r
+                    LongName="libibmad.lib" Name="ibmad.lib"\r
+                    Source="..\bin\HCA\amd64\libibmad.lib" />\r
+              <File Id="libibmad2.pdb" Compressed="yes" DiskId="1"\r
+                    LongName="libibmad.pdb" Name="ibmad.pdb"\r
+                    Source="..\bin\HCA\amd64\libibmad.pdb" />\r
+              <File Id="libibmadd.lib" Compressed="yes" DiskId="1"\r
+                    LongName="libibmadd.lib" Name="ibmadd.lib"\r
+                    Source="..\bin\HCA\amd64\libibmadd.lib" />\r
+              <File Id="libibmadd2.pdb" Compressed="yes" DiskId="1"\r
+                    LongName="libibmadd.pdb" Name="ibmadd.pdb"\r
+                    Source="..\bin\HCA\amd64\libibmadd.pdb" />\r
+\r
+              <File Id="libibumad.lib" Compressed="yes" DiskId="1"\r
+                    LongName="libibumad.lib" Name="ibumad.lib"\r
+                    Source="..\bin\HCA\amd64\libibumad.lib" />\r
+              <File Id="libibumad2.pdb" Compressed="yes" DiskId="1"\r
+                    LongName="libibumad.pdb" Name="ibumad.pdb"\r
+                    Source="..\bin\HCA\amd64\libibumad.pdb" />\r
+              <File Id="libibumadd.lib" Compressed="yes" DiskId="1"\r
+                    LongName="libibumadd.lib" Name="ibumadd.lib"\r
+                    Source="..\bin\HCA\amd64\libibumadd.lib" />\r
+              <File Id="libibumadd2.pdb" Compressed="yes" DiskId="1"\r
+                    LongName="libibumadd.pdb" Name="ibumadd.pdb"\r
+                    Source="..\bin\HCA\amd64\libibumadd.pdb" />\r
             </Component>\r
           </Directory>\r
 \r
index 06d334c..598f12a 100644 (file)
                         <File Id="winverbsd.dll" Compressed="yes" DiskId="1"\r
                               LongName="winverbsd.dll" Name="winvrbsd.dll"\r
                               Source="..\bin\HCA\x86\winverbsd.dll" />\r
+                        <File Id="winmad.sys" Compressed="yes" DiskId="1"\r
+                              LongName="winmad.sys" Name="winmad.sys"\r
+                              Source="..\bin\HCA\x86\winmad.sys" />\r
+                        <File Id="winmad.pdb" Compressed="yes" DiskId="1"\r
+                              LongName="winmad.pdb" Name="winmad.pdb"\r
+                              Source="..\bin\HCA\x86\winmad.pdb" />\r
+                        <File Id="winmad.dll" Compressed="yes" DiskId="1"\r
+                              LongName="winmad.dll" Name="winmad.dll"\r
+                              Source="..\bin\HCA\x86\winmad.dll" />\r
+                        <File Id="winmadd.dll" Compressed="yes" DiskId="1"\r
+                              LongName="winmadd.dll" Name="winmaddd.dll"\r
+                              Source="..\bin\HCA\x86\winmadd.dll" />\r
                     </Component>\r
                 </Directory>\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
+                    <CopyFile Id="dupLibibverbs.dll" FileId="libibverbs.dll"\r
                            DestinationName="ibverbs.dll"\r
                            DestinationLongName="libibverbs.dll"\r
                            DestinationProperty="WindowsFolder" />\r
-\r
+                  <File Id="libibverbs.pdb" Compressed="yes" DiskId="1"\r
+                        LongName="libibverbs.pdb" Name="ibverbs.pdb"\r
+                        Source="..\bin\HCA\x86\libibverbs.pdb" />\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
-                     <CopyFile Id="dupLibibvd.dll" FileId="libibverbsd.dll"\r
+                    <CopyFile Id="dupLibibverbsd.dll" FileId="libibverbsd.dll"\r
                            DestinationName="ibverbsd.dll"\r
                            DestinationLongName="libibverbsd.dll"\r
                            DestinationProperty="WindowsFolder" />\r
+                  <File Id="libibverbsd.pdb" Compressed="yes" DiskId="1"\r
+                        LongName="libibverbsd.pdb" Name="ibverbsd.pdb"\r
+                        Source="..\bin\HCA\x86\libibverbsd.pdb" />\r
+      \r
+                  <File Id="libibmad.dll" Compressed="yes" DiskId="1"\r
+                        LongName="libibmad.dll" Name="ibmad.dll"\r
+                        Source="..\bin\HCA\x86\libibmad.dll" />\r
+                    <CopyFile Id="dupLibibmad.dll" FileId="libibmad.dll"\r
+                           DestinationName="ibmad.dll"\r
+                           DestinationLongName="libibmad.dll"\r
+                           DestinationProperty="WindowsFolder" />\r
+                  <File Id="libibmad.pdb" Compressed="yes" DiskId="1"\r
+                        LongName="libibmad.pdb" Name="ibmad.pdb"\r
+                        Source="..\bin\HCA\x86\libibmad.pdb" />\r
+      \r
+                  <File Id="libibmadd.dll" Compressed="yes" DiskId="1"\r
+                        LongName="libibmadd.dll" Name="ibmadd.dll"\r
+                        Source="..\bin\HCA\x86\libibmadd.dll" />\r
+                    <CopyFile Id="dupLibibmadd.dll" FileId="libibmadd.dll"\r
+                           DestinationName="ibmadd.dll"\r
+                           DestinationLongName="libibmadd.dll"\r
+                           DestinationProperty="WindowsFolder" />\r
+                  <File Id="libibmadd.pdb" Compressed="yes" DiskId="1"\r
+                        LongName="libibmadd.pdb" Name="ibmadd.pdb"\r
+                        Source="..\bin\HCA\x86\libibmadd.pdb" />\r
+      \r
+                  <File Id="libibumad.dll" Compressed="yes" DiskId="1"\r
+                        LongName="libibumad.dll" Name="ibumad.dll"\r
+                        Source="..\bin\HCA\x86\libibumad.dll" />\r
+                    <CopyFile Id="dupLibibumad.dll" FileId="libibumad.dll"\r
+                           DestinationName="ibumad.dll"\r
+                           DestinationLongName="libibumad.dll"\r
+                           DestinationProperty="WindowsFolder" />\r
+                  <File Id="libibumad.pdb" Compressed="yes" DiskId="1"\r
+                        LongName="libibumad.pdb" Name="ibumad.pdb"\r
+                        Source="..\bin\HCA\x86\libibumad.pdb" />\r
+      \r
+                  <File Id="libibumadd.dll" Compressed="yes" DiskId="1"\r
+                        LongName="libibumadd.dll" Name="ibumadd.dll"\r
+                        Source="..\bin\HCA\x86\libibumadd.dll" />\r
+                    <CopyFile Id="dupLibibumadd.dll" FileId="libibumadd.dll"\r
+                           DestinationName="ibumadd.dll"\r
+                           DestinationLongName="libibumadd.dll"\r
+                           DestinationProperty="WindowsFolder" />\r
+                  <File Id="libibumadd.pdb" Compressed="yes" DiskId="1"\r
+                        LongName="libibumadd.pdb" Name="ibumadd.pdb"\r
+                        Source="..\bin\HCA\x86\libibumadd.pdb" />\r
                 </Component>\r
 \r
                 <Component Id="cWinVerbsUApps"\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_asyncwatch.pdb" Compressed="yes" DiskId="1"\r
+                        LongName="ibv_asyncwatch.pdb" Name="asyncwat.pdb"\r
+                        Source="..\bin\tools\x86\release\ibv_asyncwatch.pdb" />\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_devinfo.pdb" Compressed="yes" DiskId="1"\r
+                        LongName="ibv_devinfo.pdb" Name="devinfo.pdb"\r
+                        Source="..\bin\tools\x86\release\ibv_devinfo.pdb" />\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_rc_pingpong.pdb" Compressed="yes" DiskId="1"\r
+                        LongName="ibv_rc_pingpong.pdb" Name="ibv_rc_p.pdb"\r
+                        Source="..\bin\tools\x86\release\ibv_rc_pingpong.pdb" />\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_bw.pdb" Compressed="yes" DiskId="1"\r
+                        LongName="ibv_read_bw.pdb" Name="readbw.pdb"\r
+                        Source="..\bin\tools\x86\release\ibv_read_bw.pdb" />\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_read_lat.pdb" Compressed="yes" DiskId="1"\r
+                        LongName="ibv_read_lat.pdb" Name="readlat.pdb"\r
+                        Source="..\bin\tools\x86\release\ibv_read_lat.pdb" />\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_bw.pdb" Compressed="yes" DiskId="1"\r
+                        LongName="ibv_send_bw.pdb" Name="send_bw.pdb"\r
+                        Source="..\bin\tools\x86\release\ibv_send_bw.pdb" />\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_send_lat.pdb" Compressed="yes" DiskId="1"\r
+                        LongName="ibv_send_lat.pdb" Name="send_lat.pdb"\r
+                        Source="..\bin\tools\x86\release\ibv_send_lat.pdb" />\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_uc_pingpong.pdb" Compressed="yes" DiskId="1"\r
+                        LongName="ibv_uc_pingpong.pdb" Name="uc_ping.pdb"\r
+                        Source="..\bin\tools\x86\release\ibv_uc_pingpong.pdb" />\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_ud_pingpong.pdb" Compressed="yes" DiskId="1"\r
+                        LongName="ibv_ud_pingpong.pdb" Name="ud_ping.pdb"\r
+                        Source="..\bin\tools\x86\release\ibv_ud_pingpong.pdb" />\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_bw.pdb" Compressed="yes" DiskId="1"\r
+                        LongName="ibv_write_bw.pdb" Name="write_bw.pdb"\r
+                        Source="..\bin\tools\x86\release\ibv_write_bw.pdb" />\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
+                  <File Id="ibv_write_lat.pdb" Compressed="yes" DiskId="1"\r
+                        LongName="ibv_write_lat.pdb" Name="writelat.pdb"\r
+                        Source="..\bin\tools\x86\release\ibv_write_lat.pdb" />\r
+                  <File Id="sminfo.exe" Compressed="yes" DiskId="1"\r
+                        LongName="sminfo.exe" Name="sminfo.exe"\r
+                        Source="..\bin\tools\x86\release\sminfo.exe" />\r
+                  <File Id="sminfo.pdb" Compressed="yes" DiskId="1"\r
+                        LongName="sminfo.pdb" Name="sminfo.pdb"\r
+                        Source="..\bin\tools\x86\release\sminfo.pdb" />\r
+                  <File Id="ibstat.exe" Compressed="yes" DiskId="1"\r
+                        LongName="ibstat.exe" Name="ibstat.exe"\r
+                        Source="..\bin\tools\x86\release\ibstat.exe" />\r
+                  <File Id="ibstat.pdb" Compressed="yes" DiskId="1"\r
+                        LongName="ibstat.pdb" Name="ibstat.pdb"\r
+                        Source="..\bin\tools\x86\release\ibstat.pdb" />\r
+                  <File Id="perfquery.exe" Compressed="yes" DiskId="1"\r
+                        LongName="perfquery.exe" Name="perfquer.exe"\r
+                        Source="..\bin\tools\x86\release\perfquery.exe" />\r
+                  <File Id="perfquery.pdb" Compressed="yes" DiskId="1"\r
+                        LongName="perfquery.pdb" Name="perfquer.pdb"\r
+                        Source="..\bin\tools\x86\release\perfquery.pdb" />\r
+                  <File Id="ibaddr.exe" Compressed="yes" DiskId="1"\r
+                        LongName="ibaddr.exe" Name="ibaddr.exe"\r
+                        Source="..\bin\tools\x86\release\ibaddr.exe" />\r
+                  <File Id="ibaddr.pdb" Compressed="yes" DiskId="1"\r
+                        LongName="ibaddr.pdb" Name="ibaddr.pdb"\r
+                        Source="..\bin\tools\x86\release\ibaddr.pdb" />\r
                 </Component>\r
 \r
                 <Directory Id="ipoibDir" Name="net">\r
               <File Id="winverbs.lib" Compressed="yes" DiskId="1"\r
                     LongName="winverbs.lib" Name="winverbs.lib"\r
                     Source="..\bin\HCA\x86\winverbs.lib" />\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
               <File Id="libibverbs.lib" Compressed="yes" DiskId="1"\r
                     LongName="libibverbs.lib" Name="ibverbs.lib"\r
                     Source="..\bin\HCA\x86\libibverbs.lib" />\r
-\r
+              <File Id="libibverbs2.pdb" Compressed="yes" DiskId="1"\r
+                    LongName="libibverbs.pdb" Name="ibverbs.pdb"\r
+                    Source="..\bin\HCA\x86\libibverbs.pdb" />\r
               <File Id="libibverbsd.lib" Compressed="yes" DiskId="1"\r
                     LongName="libibverbsd.lib" Name="ibverbsd.lib"\r
                     Source="..\bin\HCA\x86\libibverbsd.lib" />\r
+              <File Id="libibverbsd2.pdb" Compressed="yes" DiskId="1"\r
+                    LongName="libibverbsd.pdb" Name="ibverbsd.pdb"\r
+                    Source="..\bin\HCA\x86\libibverbsd.pdb" />\r
+\r
+              <File Id="libibmad.lib" Compressed="yes" DiskId="1"\r
+                    LongName="libibmad.lib" Name="ibmad.lib"\r
+                    Source="..\bin\HCA\x86\libibmad.lib" />\r
+              <File Id="libibmad2.pdb" Compressed="yes" DiskId="1"\r
+                    LongName="libibmad.pdb" Name="ibmad.pdb"\r
+                    Source="..\bin\HCA\x86\libibmad.pdb" />\r
+              <File Id="libibmadd.lib" Compressed="yes" DiskId="1"\r
+                    LongName="libibmadd.lib" Name="ibmadd.lib"\r
+                    Source="..\bin\HCA\x86\libibmadd.lib" />\r
+              <File Id="libibmadd2.pdb" Compressed="yes" DiskId="1"\r
+                    LongName="libibmadd.pdb" Name="ibmadd.pdb"\r
+                    Source="..\bin\HCA\x86\libibmadd.pdb" />\r
+\r
+              <File Id="libibumad.lib" Compressed="yes" DiskId="1"\r
+                    LongName="libibumad.lib" Name="ibumad.lib"\r
+                    Source="..\bin\HCA\x86\libibumad.lib" />\r
+              <File Id="libibumad2.pdb" Compressed="yes" DiskId="1"\r
+                    LongName="libibumad.pdb" Name="ibumad.pdb"\r
+                    Source="..\bin\HCA\x86\libibumad.pdb" />\r
+              <File Id="libibumadd.lib" Compressed="yes" DiskId="1"\r
+                    LongName="libibumadd.lib" Name="ibumadd.lib"\r
+                    Source="..\bin\HCA\x86\libibumadd.lib" />\r
+              <File Id="libibumadd2.pdb" Compressed="yes" DiskId="1"\r
+                    LongName="libibumadd.pdb" Name="ibumadd.pdb"\r
+                    Source="..\bin\HCA\x86\libibumadd.pdb" />\r
              </Component>\r
            </Directory>\r
 \r
index 816ed58..3d6efb0 100644 (file)
               <File Id="winverbsd.dll" Compressed="yes" DiskId="1"\r
                     LongName="winverbsd.dll" Name="winvrbsd.dll"\r
                     Source="..\bin\HCA\ia64\winverbsd.dll" />\r
+              <File Id="winmad.sys" Compressed="yes" DiskId="1"\r
+                    LongName="winmad.sys" Name="winmad.sys"\r
+                    Source="..\bin\HCA\ia64\winmad.sys" />\r
+              <File Id="winmad.pdb" Compressed="yes" DiskId="1"\r
+                    LongName="winmad.pdb" Name="winmad.pdb"\r
+                    Source="..\bin\HCA\ia64\winmad.pdb" />\r
+              <File Id="winmad.dll" Compressed="yes" DiskId="1"\r
+                    LongName="winmad.dll" Name="winmad.dll"\r
+                    Source="..\bin\HCA\ia64\winmad.dll" />\r
+              <File Id="winmadd.dll" Compressed="yes" DiskId="1"\r
+                    LongName="winmadd.dll" Name="winmaddd.dll"\r
+                    Source="..\bin\HCA\ia64\winmadd.dll" />\r
              </Component>\r
           </Directory>\r
 \r
@@ -515,17 +527,68 @@ End ConnectX remove -->
             <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
+              <CopyFile Id="dupLibibverbs.dll" FileId="libibverbs.dll"\r
+                     DestinationName="ibverbs.dll"\r
+                     DestinationLongName="libibverbs.dll"\r
+                     DestinationProperty="WindowsFolder" />\r
+            <File Id="libibverbs.pdb" Compressed="yes" DiskId="1"\r
+                  LongName="libibverbs.pdb" Name="ibverbs.pdb"\r
+                  Source="..\bin\HCA\ia64\libibverbs.pdb" />\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
-              <CopyFile Id="dupLibibvd.dll" FileId="libibverbsd.dll"\r
-                      DestinationName="ibverbsd.dll"\r
-                      DestinationLongName="libibverbsd.dll"\r
-                      DestinationProperty="WindowsFolder" />\r
+              <CopyFile Id="dupLibibverbsd.dll" FileId="libibverbsd.dll"\r
+                     DestinationName="ibverbsd.dll"\r
+                     DestinationLongName="libibverbsd.dll"\r
+                     DestinationProperty="WindowsFolder" />\r
+            <File Id="libibverbsd.pdb" Compressed="yes" DiskId="1"\r
+                  LongName="libibverbsd.pdb" Name="ibverbsd.pdb"\r
+                  Source="..\bin\HCA\ia64\libibverbsd.pdb" />\r
+\r
+            <File Id="libibmad.dll" Compressed="yes" DiskId="1"\r
+                  LongName="libibmad.dll" Name="ibmad.dll"\r
+                  Source="..\bin\HCA\ia64\libibmad.dll" />\r
+              <CopyFile Id="dupLibibmad.dll" FileId="libibmad.dll"\r
+                     DestinationName="ibmad.dll"\r
+                     DestinationLongName="libibmad.dll"\r
+                     DestinationProperty="WindowsFolder" />\r
+            <File Id="libibmad.pdb" Compressed="yes" DiskId="1"\r
+                  LongName="libibmad.pdb" Name="ibmad.pdb"\r
+                  Source="..\bin\HCA\ia64\libibmad.pdb" />\r
+\r
+            <File Id="libibmadd.dll" Compressed="yes" DiskId="1"\r
+                  LongName="libibmadd.dll" Name="ibmadd.dll"\r
+                  Source="..\bin\HCA\ia64\libibmadd.dll" />\r
+              <CopyFile Id="dupLibibmadd.dll" FileId="libibmadd.dll"\r
+                     DestinationName="ibmadd.dll"\r
+                     DestinationLongName="libibmadd.dll"\r
+                     DestinationProperty="WindowsFolder" />\r
+            <File Id="libibmadd.pdb" Compressed="yes" DiskId="1"\r
+                  LongName="libibmadd.pdb" Name="ibmadd.pdb"\r
+                  Source="..\bin\HCA\ia64\libibmadd.pdb" />\r
+\r
+            <File Id="libibumad.dll" Compressed="yes" DiskId="1"\r
+                  LongName="libibumad.dll" Name="ibumad.dll"\r
+                  Source="..\bin\HCA\ia64\libibumad.dll" />\r
+              <CopyFile Id="dupLibibumad.dll" FileId="libibumad.dll"\r
+                     DestinationName="ibumad.dll"\r
+                     DestinationLongName="libibumad.dll"\r
+                     DestinationProperty="WindowsFolder" />\r
+            <File Id="libibumad.pdb" Compressed="yes" DiskId="1"\r
+                  LongName="libibumad.pdb" Name="ibumad.pdb"\r
+                  Source="..\bin\HCA\ia64\libibumad.pdb" />\r
+\r
+            <File Id="libibumadd.dll" Compressed="yes" DiskId="1"\r
+                  LongName="libibumadd.dll" Name="ibumadd.dll"\r
+                  Source="..\bin\HCA\ia64\libibumadd.dll" />\r
+              <CopyFile Id="dupLibibumadd.dll" FileId="libibumadd.dll"\r
+                     DestinationName="ibumadd.dll"\r
+                     DestinationLongName="libibumadd.dll"\r
+                     DestinationProperty="WindowsFolder" />\r
+            <File Id="libibumadd.pdb" Compressed="yes" DiskId="1"\r
+                  LongName="libibumadd.pdb" Name="ibumadd.pdb"\r
+                  Source="..\bin\HCA\ia64\libibumadd.pdb" />\r
           </Component>\r
 \r
           <Component Id="cWinVerbsUApps"\r
@@ -534,36 +597,93 @@ End ConnectX remove -->
             <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_asyncwatch.pdb" Compressed="yes" DiskId="1"\r
+                  LongName="ibv_asyncwatch.pdb" Name="asyncwat.pdb"\r
+                  Source="..\bin\tools\ia64\release\ibv_asyncwatch.pdb" />\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_devinfo.pdb" Compressed="yes" DiskId="1"\r
+                  LongName="ibv_devinfo.pdb" Name="devinfo.pdb"\r
+                  Source="..\bin\tools\ia64\release\ibv_devinfo.pdb" />\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_rc_pingpong.pdb" Compressed="yes" DiskId="1"\r
+                  LongName="ibv_rc_pingpong.pdb" Name="ibv_rc_p.pdb"\r
+                  Source="..\bin\tools\ia64\release\ibv_rc_pingpong.pdb" />\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_bw.pdb" Compressed="yes" DiskId="1"\r
+                  LongName="ibv_read_bw.pdb" Name="readbw.pdb"\r
+                  Source="..\bin\tools\ia64\release\ibv_read_bw.pdb" />\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_read_lat.pdb" Compressed="yes" DiskId="1"\r
+                  LongName="ibv_read_lat.pdb" Name="readlat.pdb"\r
+                  Source="..\bin\tools\ia64\release\ibv_read_lat.pdb" />\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_bw.pdb" Compressed="yes" DiskId="1"\r
+                  LongName="ibv_send_bw.pdb" Name="send_bw.pdb"\r
+                  Source="..\bin\tools\ia64\release\ibv_send_bw.pdb" />\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_send_lat.pdb" Compressed="yes" DiskId="1"\r
+                  LongName="ibv_send_lat.pdb" Name="send_lat.pdb"\r
+                  Source="..\bin\tools\ia64\release\ibv_send_lat.pdb" />\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_uc_pingpong.pdb" Compressed="yes" DiskId="1"\r
+                  LongName="ibv_uc_pingpong.pdb" Name="uc_ping.pdb"\r
+                  Source="..\bin\tools\ia64\release\ibv_uc_pingpong.pdb" />\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_ud_pingpong.pdb" Compressed="yes" DiskId="1"\r
+                  LongName="ibv_ud_pingpong.pdb" Name="ud_ping.pdb"\r
+                  Source="..\bin\tools\ia64\release\ibv_ud_pingpong.pdb" />\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_bw.pdb" Compressed="yes" DiskId="1"\r
+                  LongName="ibv_write_bw.pdb" Name="write_bw.pdb"\r
+                  Source="..\bin\tools\ia64\release\ibv_write_bw.pdb" />\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
+            <File Id="ibv_write_lat.pdb" Compressed="yes" DiskId="1"\r
+                  LongName="ibv_write_lat.pdb" Name="writelat.pdb"\r
+                  Source="..\bin\tools\ia64\release\ibv_write_lat.pdb" />\r
+            <File Id="sminfo.exe" Compressed="yes" DiskId="1"\r
+                  LongName="sminfo.exe" Name="sminfo.exe"\r
+                  Source="..\bin\tools\ia64\release\sminfo.exe" />\r
+            <File Id="sminfo.pdb" Compressed="yes" DiskId="1"\r
+                  LongName="sminfo.pdb" Name="sminfo.pdb"\r
+                  Source="..\bin\tools\ia64\release\sminfo.pdb" />\r
+            <File Id="ibstat.exe" Compressed="yes" DiskId="1"\r
+                  LongName="ibstat.exe" Name="ibstat.exe"\r
+                  Source="..\bin\tools\ia64\release\ibstat.exe" />\r
+            <File Id="ibstat.pdb" Compressed="yes" DiskId="1"\r
+                  LongName="ibstat.pdb" Name="ibstat.pdb"\r
+                  Source="..\bin\tools\ia64\release\ibstat.pdb" />\r
+            <File Id="perfquery.exe" Compressed="yes" DiskId="1"\r
+                  LongName="perfquery.exe" Name="perfquer.exe"\r
+                  Source="..\bin\tools\ia64\release\perfquery.exe" />\r
+            <File Id="perfquery.pdb" Compressed="yes" DiskId="1"\r
+                  LongName="perfquery.pdb" Name="perfquer.pdb"\r
+                  Source="..\bin\tools\ia64\release\perfquery.pdb" />\r
+            <File Id="ibaddr.exe" Compressed="yes" DiskId="1"\r
+                  LongName="ibaddr.exe" Name="ibaddr.exe"\r
+                  Source="..\bin\tools\ia64\release\ibaddr.exe" />\r
+            <File Id="ibaddr.pdb" Compressed="yes" DiskId="1"\r
+                  LongName="ibaddr.pdb" Name="ibaddr.pdb"\r
+                  Source="..\bin\tools\ia64\release\ibaddr.pdb" />\r
           </Component>\r
 \r
           <Directory Id="ipoibDir" Name="net">\r
@@ -1027,7 +1147,6 @@ End ConnectX remove -->
               <File Id="winverbs.lib" Compressed="yes" DiskId="1"\r
                     LongName="winverbs.lib" Name="winverbs.lib"\r
                     Source="..\bin\HCA\ia64\winverbs.lib" />\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
@@ -1035,10 +1154,41 @@ End ConnectX remove -->
               <File Id="libibverbs.lib" Compressed="yes" DiskId="1"\r
                     LongName="libibverbs.lib" Name="ibverbs.lib"\r
                     Source="..\bin\HCA\ia64\libibverbs.lib" />\r
-\r
+              <File Id="libibverbs2.pdb" Compressed="yes" DiskId="1"\r
+                    LongName="libibverbs.pdb" Name="ibverbs.pdb"\r
+                    Source="..\bin\HCA\ia64\libibverbs.pdb" />\r
               <File Id="libibverbsd.lib" Compressed="yes" DiskId="1"\r
                     LongName="libibverbsd.lib" Name="ibverbsd.lib"\r
                     Source="..\bin\HCA\ia64\libibverbsd.lib" />\r
+              <File Id="libibverbsd2.pdb" Compressed="yes" DiskId="1"\r
+                    LongName="libibverbsd.pdb" Name="ibverbsd.pdb"\r
+                    Source="..\bin\HCA\ia64\libibverbsd.pdb" />\r
+\r
+              <File Id="libibmad.lib" Compressed="yes" DiskId="1"\r
+                    LongName="libibmad.lib" Name="ibmad.lib"\r
+                    Source="..\bin\HCA\ia64\libibmad.lib" />\r
+              <File Id="libibmad2.pdb" Compressed="yes" DiskId="1"\r
+                    LongName="libibmad.pdb" Name="ibmad.pdb"\r
+                    Source="..\bin\HCA\ia64\libibmad.pdb" />\r
+              <File Id="libibmadd.lib" Compressed="yes" DiskId="1"\r
+                    LongName="libibmadd.lib" Name="ibmadd.lib"\r
+                    Source="..\bin\HCA\ia64\libibmadd.lib" />\r
+              <File Id="libibmadd2.pdb" Compressed="yes" DiskId="1"\r
+                    LongName="libibmadd.pdb" Name="ibmadd.pdb"\r
+                    Source="..\bin\HCA\ia64\libibmadd.pdb" />\r
+\r
+              <File Id="libibumad.lib" Compressed="yes" DiskId="1"\r
+                    LongName="libibumad.lib" Name="ibumad.lib"\r
+                    Source="..\bin\HCA\ia64\libibumad.lib" />\r
+              <File Id="libibumad2.pdb" Compressed="yes" DiskId="1"\r
+                    LongName="libibumad.pdb" Name="ibumad.pdb"\r
+                    Source="..\bin\HCA\ia64\libibumad.pdb" />\r
+              <File Id="libibumadd.lib" Compressed="yes" DiskId="1"\r
+                    LongName="libibumadd.lib" Name="ibumadd.lib"\r
+                    Source="..\bin\HCA\ia64\libibumadd.lib" />\r
+              <File Id="libibumadd2.pdb" Compressed="yes" DiskId="1"\r
+                    LongName="libibumadd.pdb" Name="ibumadd.pdb"\r
+                    Source="..\bin\HCA\ia64\libibumadd.pdb" />\r
               </Component>\r
             </Directory>\r
 \r
index c764a22..f963286 100644 (file)
                <File Id="winverbsd.dll" Compressed="yes" DiskId="1"\r
                      LongName="winverbsd.dll" Name="winvrbsd.dll"\r
                      Source="..\bin\HCA\amd64\winverbsd.dll" />\r
+              <File Id="winmad.sys" Compressed="yes" DiskId="1"\r
+                    LongName="winmad.sys" Name="winmad.sys"\r
+                    Source="..\bin\HCA\amd64\winmad.sys" />\r
+              <File Id="winmad.pdb" Compressed="yes" DiskId="1"\r
+                    LongName="winmad.pdb" Name="winmad.pdb"\r
+                    Source="..\bin\HCA\amd64\winmad.pdb" />\r
+              <File Id="winmad.dll" Compressed="yes" DiskId="1"\r
+                    LongName="winmad.dll" Name="winmad.dll"\r
+                    Source="..\bin\HCA\amd64\winmad.dll" />\r
+              <File Id="winmadd.dll" Compressed="yes" DiskId="1"\r
+                    LongName="winmadd.dll" Name="winmaddd.dll"\r
+                    Source="..\bin\HCA\amd64\winmadd.dll" />\r
              </Component>\r
           </Directory>\r
 \r
           <Component Id="cWinVerbsOFED"\r
                        Guid="20916BB0-5E16-49bb-BE9F-3A202D760E72">\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="libibverbsd.dll" Compressed="yes" DiskId="1"\r
-                   LongName="libibverbsd.dll" Name="ibverbsd.dll"\r
-                   Source="..\bin\HCA\amd64\libibverbsd.dll" />\r
-               <CopyFile Id="dupLibibvd.dll" FileId="libibverbsd.dll"\r
-                      DestinationName="ibverbsd.dll"\r
-                      DestinationLongName="libibverbsd.dll"\r
-                      DestinationProperty="WindowsFolder" />\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="dupLibibverbs.dll" FileId="libibverbs.dll"\r
+                     DestinationName="ibverbs.dll"\r
+                     DestinationLongName="libibverbs.dll"\r
+                     DestinationProperty="WindowsFolder" />\r
+            <File Id="libibverbs.pdb" Compressed="yes" DiskId="1"\r
+                  LongName="libibverbs.pdb" Name="ibverbs.pdb"\r
+                  Source="..\bin\HCA\amd64\libibverbs.pdb" />\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
+              <CopyFile Id="dupLibibverbsd.dll" FileId="libibverbsd.dll"\r
+                     DestinationName="ibverbsd.dll"\r
+                     DestinationLongName="libibverbsd.dll"\r
+                     DestinationProperty="WindowsFolder" />\r
+            <File Id="libibverbsd.pdb" Compressed="yes" DiskId="1"\r
+                  LongName="libibverbsd.pdb" Name="ibverbsd.pdb"\r
+                  Source="..\bin\HCA\amd64\libibverbsd.pdb" />\r
+\r
+            <File Id="libibmad.dll" Compressed="yes" DiskId="1"\r
+                  LongName="libibmad.dll" Name="ibmad.dll"\r
+                  Source="..\bin\HCA\amd64\libibmad.dll" />\r
+              <CopyFile Id="dupLibibmad.dll" FileId="libibmad.dll"\r
+                     DestinationName="ibmad.dll"\r
+                     DestinationLongName="libibmad.dll"\r
+                     DestinationProperty="WindowsFolder" />\r
+            <File Id="libibmad.pdb" Compressed="yes" DiskId="1"\r
+                  LongName="libibmad.pdb" Name="ibmad.pdb"\r
+                  Source="..\bin\HCA\amd64\libibmad.pdb" />\r
+\r
+            <File Id="libibmadd.dll" Compressed="yes" DiskId="1"\r
+                  LongName="libibmadd.dll" Name="ibmadd.dll"\r
+                  Source="..\bin\HCA\amd64\libibmadd.dll" />\r
+              <CopyFile Id="dupLibibmadd.dll" FileId="libibmadd.dll"\r
+                     DestinationName="ibmadd.dll"\r
+                     DestinationLongName="libibmadd.dll"\r
+                     DestinationProperty="WindowsFolder" />\r
+            <File Id="libibmadd.pdb" Compressed="yes" DiskId="1"\r
+                  LongName="libibmadd.pdb" Name="ibmadd.pdb"\r
+                  Source="..\bin\HCA\amd64\libibmadd.pdb" />\r
+\r
+            <File Id="libibumad.dll" Compressed="yes" DiskId="1"\r
+                  LongName="libibumad.dll" Name="ibumad.dll"\r
+                  Source="..\bin\HCA\amd64\libibumad.dll" />\r
+              <CopyFile Id="dupLibibumad.dll" FileId="libibumad.dll"\r
+                     DestinationName="ibumad.dll"\r
+                     DestinationLongName="libibumad.dll"\r
+                     DestinationProperty="WindowsFolder" />\r
+            <File Id="libibumad.pdb" Compressed="yes" DiskId="1"\r
+                  LongName="libibumad.pdb" Name="ibumad.pdb"\r
+                  Source="..\bin\HCA\amd64\libibumad.pdb" />\r
+\r
+            <File Id="libibumadd.dll" Compressed="yes" DiskId="1"\r
+                  LongName="libibumadd.dll" Name="ibumadd.dll"\r
+                  Source="..\bin\HCA\amd64\libibumadd.dll" />\r
+              <CopyFile Id="dupLibibumadd.dll" FileId="libibumadd.dll"\r
+                     DestinationName="ibumadd.dll"\r
+                     DestinationLongName="libibumadd.dll"\r
+                     DestinationProperty="WindowsFolder" />\r
+            <File Id="libibumadd.pdb" Compressed="yes" DiskId="1"\r
+                  LongName="libibumadd.pdb" Name="ibumadd.pdb"\r
+                  Source="..\bin\HCA\amd64\libibumadd.pdb" />\r
           </Component>\r
 \r
           <Component Id="cWinVerbsUApps"\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_asyncwatch.pdb" Compressed="yes" DiskId="1"\r
+                  LongName="ibv_asyncwatch.pdb" Name="asyncwat.pdb"\r
+                  Source="..\bin\tools\amd64\release\ibv_asyncwatch.pdb" />\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_devinfo.pdb" Compressed="yes" DiskId="1"\r
+                  LongName="ibv_devinfo.pdb" Name="devinfo.pdb"\r
+                  Source="..\bin\tools\amd64\release\ibv_devinfo.pdb" />\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_rc_pingpong.pdb" Compressed="yes" DiskId="1"\r
+                  LongName="ibv_rc_pingpong.pdb" Name="ibv_rc_p.pdb"\r
+                  Source="..\bin\tools\amd64\release\ibv_rc_pingpong.pdb" />\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_bw.pdb" Compressed="yes" DiskId="1"\r
+                  LongName="ibv_read_bw.pdb" Name="readbw.pdb"\r
+                  Source="..\bin\tools\amd64\release\ibv_read_bw.pdb" />\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_read_lat.pdb" Compressed="yes" DiskId="1"\r
+                  LongName="ibv_read_lat.pdb" Name="readlat.pdb"\r
+                  Source="..\bin\tools\amd64\release\ibv_read_lat.pdb" />\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_bw.pdb" Compressed="yes" DiskId="1"\r
+                  LongName="ibv_send_bw.pdb" Name="send_bw.pdb"\r
+                  Source="..\bin\tools\amd64\release\ibv_send_bw.pdb" />\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_send_lat.pdb" Compressed="yes" DiskId="1"\r
+                  LongName="ibv_send_lat.pdb" Name="send_lat.pdb"\r
+                  Source="..\bin\tools\amd64\release\ibv_send_lat.pdb" />\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_uc_pingpong.pdb" Compressed="yes" DiskId="1"\r
+                  LongName="ibv_uc_pingpong.pdb" Name="uc_ping.pdb"\r
+                  Source="..\bin\tools\amd64\release\ibv_uc_pingpong.pdb" />\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_ud_pingpong.pdb" Compressed="yes" DiskId="1"\r
+                  LongName="ibv_ud_pingpong.pdb" Name="ud_ping.pdb"\r
+                  Source="..\bin\tools\amd64\release\ibv_ud_pingpong.pdb" />\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_bw.pdb" Compressed="yes" DiskId="1"\r
+                  LongName="ibv_write_bw.pdb" Name="write_bw.pdb"\r
+                  Source="..\bin\tools\amd64\release\ibv_write_bw.pdb" />\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
+            <File Id="ibv_write_lat.pdb" Compressed="yes" DiskId="1"\r
+                  LongName="ibv_write_lat.pdb" Name="writelat.pdb"\r
+                  Source="..\bin\tools\amd64\release\ibv_write_lat.pdb" />\r
+            <File Id="sminfo.exe" Compressed="yes" DiskId="1"\r
+                  LongName="sminfo.exe" Name="sminfo.exe"\r
+                  Source="..\bin\tools\amd64\release\sminfo.exe" />\r
+            <File Id="sminfo.pdb" Compressed="yes" DiskId="1"\r
+                  LongName="sminfo.pdb" Name="sminfo.pdb"\r
+                  Source="..\bin\tools\amd64\release\sminfo.pdb" />\r
+            <File Id="ibstat.exe" Compressed="yes" DiskId="1"\r
+                  LongName="ibstat.exe" Name="ibstat.exe"\r
+                  Source="..\bin\tools\amd64\release\ibstat.exe" />\r
+            <File Id="ibstat.pdb" Compressed="yes" DiskId="1"\r
+                  LongName="ibstat.pdb" Name="ibstat.pdb"\r
+                  Source="..\bin\tools\amd64\release\ibstat.pdb" />\r
+            <File Id="perfquery.exe" Compressed="yes" DiskId="1"\r
+                  LongName="perfquery.exe" Name="perfquer.exe"\r
+                  Source="..\bin\tools\amd64\release\perfquery.exe" />\r
+            <File Id="perfquery.pdb" Compressed="yes" DiskId="1"\r
+                  LongName="perfquery.pdb" Name="perfquer.pdb"\r
+                  Source="..\bin\tools\amd64\release\perfquery.pdb" />\r
+            <File Id="ibaddr.exe" Compressed="yes" DiskId="1"\r
+                  LongName="ibaddr.exe" Name="ibaddr.exe"\r
+                  Source="..\bin\tools\amd64\release\ibaddr.exe" />\r
+            <File Id="ibaddr.pdb" Compressed="yes" DiskId="1"\r
+                  LongName="ibaddr.pdb" Name="ibaddr.pdb"\r
+                  Source="..\bin\tools\amd64\release\ibaddr.pdb" />\r
           </Component>\r
 \r
           <Directory Id="ipoibDir" Name="net">\r
               <File Id="winverbs.lib" Compressed="yes" DiskId="1"\r
                     LongName="winverbs.lib" Name="winverbs.lib"\r
                     Source="..\bin\HCA\amd64\winverbs.lib" />\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
               <File Id="libibverbs.lib" Compressed="yes" DiskId="1"\r
                     LongName="libibverbs.lib" Name="ibverbs.lib"\r
                     Source="..\bin\HCA\amd64\libibverbs.lib" />\r
-\r
+              <File Id="libibverbs2.pdb" Compressed="yes" DiskId="1"\r
+                    LongName="libibverbs.pdb" Name="ibverbs.pdb"\r
+                    Source="..\bin\HCA\amd64\libibverbs.pdb" />\r
               <File Id="libibverbsd.lib" Compressed="yes" DiskId="1"\r
                     LongName="libibverbsd.lib" Name="ibverbsd.lib"\r
                     Source="..\bin\HCA\amd64\libibverbsd.lib" />\r
+              <File Id="libibverbsd2.pdb" Compressed="yes" DiskId="1"\r
+                    LongName="libibverbsd.pdb" Name="ibverbsd.pdb"\r
+                    Source="..\bin\HCA\amd64\libibverbsd.pdb" />\r
+\r
+              <File Id="libibmad.lib" Compressed="yes" DiskId="1"\r
+                    LongName="libibmad.lib" Name="ibmad.lib"\r
+                    Source="..\bin\HCA\amd64\libibmad.lib" />\r
+              <File Id="libibmad2.pdb" Compressed="yes" DiskId="1"\r
+                    LongName="libibmad.pdb" Name="ibmad.pdb"\r
+                    Source="..\bin\HCA\amd64\libibmad.pdb" />\r
+              <File Id="libibmadd.lib" Compressed="yes" DiskId="1"\r
+                    LongName="libibmadd.lib" Name="ibmadd.lib"\r
+                    Source="..\bin\HCA\amd64\libibmadd.lib" />\r
+              <File Id="libibmadd2.pdb" Compressed="yes" DiskId="1"\r
+                    LongName="libibmadd.pdb" Name="ibmadd.pdb"\r
+                    Source="..\bin\HCA\amd64\libibmadd.pdb" />\r
+\r
+              <File Id="libibumad.lib" Compressed="yes" DiskId="1"\r
+                    LongName="libibumad.lib" Name="ibumad.lib"\r
+                    Source="..\bin\HCA\amd64\libibumad.lib" />\r
+              <File Id="libibumad2.pdb" Compressed="yes" DiskId="1"\r
+                    LongName="libibumad.pdb" Name="ibumad.pdb"\r
+                    Source="..\bin\HCA\amd64\libibumad.pdb" />\r
+              <File Id="libibumadd.lib" Compressed="yes" DiskId="1"\r
+                    LongName="libibumadd.lib" Name="ibumadd.lib"\r
+                    Source="..\bin\HCA\amd64\libibumadd.lib" />\r
+              <File Id="libibumadd2.pdb" Compressed="yes" DiskId="1"\r
+                    LongName="libibumadd.pdb" Name="ibumadd.pdb"\r
+                    Source="..\bin\HCA\amd64\libibumadd.pdb" />\r
             </Component>\r
           </Directory>\r
 \r
index 93b2f43..6623399 100644 (file)
                     <Component Id="cWinVerbsDrivers"\r
                              Guid="F5FA1491-E2D2-4f22-9549-07C61F86BFEB">\r
 \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.pdb" DiskId="1" Compressed="yes"\r
-                           LongName="winverbs.pdb" Name="winverbs.pdb"\r
-                           Source="..\bin\HCA\x86\winverbs.pdb" />\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
+                        <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.pdb" DiskId="1" Compressed="yes"\r
+                              LongName="winverbs.pdb" Name="winverbs.pdb"\r
+                              Source="..\bin\HCA\x86\winverbs.pdb" />\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
+                        <File Id="winmad.sys" Compressed="yes" DiskId="1"\r
+                              LongName="winmad.sys" Name="winmad.sys"\r
+                              Source="..\bin\HCA\x86\winmad.sys" />\r
+                        <File Id="winmad.pdb" Compressed="yes" DiskId="1"\r
+                              LongName="winmad.pdb" Name="winmad.pdb"\r
+                              Source="..\bin\HCA\x86\winmad.pdb" />\r
+                        <File Id="winmad.dll" Compressed="yes" DiskId="1"\r
+                              LongName="winmad.dll" Name="winmad.dll"\r
+                              Source="..\bin\HCA\x86\winmad.dll" />\r
+                        <File Id="winmadd.dll" Compressed="yes" DiskId="1"\r
+                              LongName="winmadd.dll" Name="winmaddd.dll"\r
+                              Source="..\bin\HCA\x86\winmadd.dll" />\r
                    </Component>\r
-\r
-\r
                 </Directory>\r
 \r
                 <Directory Id="dir_0" Name="Checked">\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
+                    <CopyFile Id="dupLibibverbs.dll" FileId="libibverbs.dll"\r
                            DestinationName="ibverbs.dll"\r
                            DestinationLongName="libibverbs.dll"\r
                            DestinationProperty="WindowsFolder" />\r
-\r
+                  <File Id="libibverbs.pdb" Compressed="yes" DiskId="1"\r
+                        LongName="libibverbs.pdb" Name="ibverbs.pdb"\r
+                        Source="..\bin\HCA\x86\libibverbs.pdb" />\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
-                    <CopyFile Id="dupLibibvd.dll" FileId="libibverbsd.dll"\r
+                    <CopyFile Id="dupLibibverbsd.dll" FileId="libibverbsd.dll"\r
                            DestinationName="ibverbsd.dll"\r
                            DestinationLongName="libibverbsd.dll"\r
                            DestinationProperty="WindowsFolder" />\r
-\r
+                  <File Id="libibverbsd.pdb" Compressed="yes" DiskId="1"\r
+                        LongName="libibverbsd.pdb" Name="ibverbsd.pdb"\r
+                        Source="..\bin\HCA\x86\libibverbsd.pdb" />\r
+      \r
+                  <File Id="libibmad.dll" Compressed="yes" DiskId="1"\r
+                        LongName="libibmad.dll" Name="ibmad.dll"\r
+                        Source="..\bin\HCA\x86\libibmad.dll" />\r
+                    <CopyFile Id="dupLibibmad.dll" FileId="libibmad.dll"\r
+                           DestinationName="ibmad.dll"\r
+                           DestinationLongName="libibmad.dll"\r
+                           DestinationProperty="WindowsFolder" />\r
+                  <File Id="libibmad.pdb" Compressed="yes" DiskId="1"\r
+                        LongName="libibmad.pdb" Name="ibmad.pdb"\r
+                        Source="..\bin\HCA\x86\libibmad.pdb" />\r
+      \r
+                  <File Id="libibmadd.dll" Compressed="yes" DiskId="1"\r
+                        LongName="libibmadd.dll" Name="ibmadd.dll"\r
+                        Source="..\bin\HCA\x86\libibmadd.dll" />\r
+                    <CopyFile Id="dupLibibmadd.dll" FileId="libibmadd.dll"\r
+                           DestinationName="ibmadd.dll"\r
+                           DestinationLongName="libibmadd.dll"\r
+                           DestinationProperty="WindowsFolder" />\r
+                  <File Id="libibmadd.pdb" Compressed="yes" DiskId="1"\r
+                        LongName="libibmadd.pdb" Name="ibmadd.pdb"\r
+                        Source="..\bin\HCA\x86\libibmadd.pdb" />\r
+      \r
+                  <File Id="libibumad.dll" Compressed="yes" DiskId="1"\r
+                        LongName="libibumad.dll" Name="ibumad.dll"\r
+                        Source="..\bin\HCA\x86\libibumad.dll" />\r
+                    <CopyFile Id="dupLibibumad.dll" FileId="libibumad.dll"\r
+                           DestinationName="ibumad.dll"\r
+                           DestinationLongName="libibumad.dll"\r
+                           DestinationProperty="WindowsFolder" />\r
+                  <File Id="libibumad.pdb" Compressed="yes" DiskId="1"\r
+                        LongName="libibumad.pdb" Name="ibumad.pdb"\r
+                        Source="..\bin\HCA\x86\libibumad.pdb" />\r
+      \r
+                  <File Id="libibumadd.dll" Compressed="yes" DiskId="1"\r
+                        LongName="libibumadd.dll" Name="ibumadd.dll"\r
+                        Source="..\bin\HCA\x86\libibumadd.dll" />\r
+                    <CopyFile Id="dupLibibumadd.dll" FileId="libibumadd.dll"\r
+                           DestinationName="ibumadd.dll"\r
+                           DestinationLongName="libibumadd.dll"\r
+                           DestinationProperty="WindowsFolder" />\r
+                  <File Id="libibumadd.pdb" Compressed="yes" DiskId="1"\r
+                        LongName="libibumadd.pdb" Name="ibumadd.pdb"\r
+                        Source="..\bin\HCA\x86\libibumadd.pdb" />\r
                 </Component>\r
 \r
                 <Component Id="cWinVerbsUApps"\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_asyncwatch.pdb" Compressed="yes" DiskId="1"\r
+                        LongName="ibv_asyncwatch.pdb" Name="asyncwat.pdb"\r
+                        Source="..\bin\tools\x86\release\ibv_asyncwatch.pdb" />\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_devinfo.pdb" Compressed="yes" DiskId="1"\r
+                        LongName="ibv_devinfo.pdb" Name="devinfo.pdb"\r
+                        Source="..\bin\tools\x86\release\ibv_devinfo.pdb" />\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_rc_pingpong.pdb" Compressed="yes" DiskId="1"\r
+                        LongName="ibv_rc_pingpong.pdb" Name="ibv_rc_p.pdb"\r
+                        Source="..\bin\tools\x86\release\ibv_rc_pingpong.pdb" />\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_bw.pdb" Compressed="yes" DiskId="1"\r
+                        LongName="ibv_read_bw.pdb" Name="readbw.pdb"\r
+                        Source="..\bin\tools\x86\release\ibv_read_bw.pdb" />\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_read_lat.pdb" Compressed="yes" DiskId="1"\r
+                        LongName="ibv_read_lat.pdb" Name="readlat.pdb"\r
+                        Source="..\bin\tools\x86\release\ibv_read_lat.pdb" />\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_bw.pdb" Compressed="yes" DiskId="1"\r
+                        LongName="ibv_send_bw.pdb" Name="send_bw.pdb"\r
+                        Source="..\bin\tools\x86\release\ibv_send_bw.pdb" />\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_send_lat.pdb" Compressed="yes" DiskId="1"\r
+                        LongName="ibv_send_lat.pdb" Name="send_lat.pdb"\r
+                        Source="..\bin\tools\x86\release\ibv_send_lat.pdb" />\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_uc_pingpong.pdb" Compressed="yes" DiskId="1"\r
+                        LongName="ibv_uc_pingpong.pdb" Name="uc_ping.pdb"\r
+                        Source="..\bin\tools\x86\release\ibv_uc_pingpong.pdb" />\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_ud_pingpong.pdb" Compressed="yes" DiskId="1"\r
+                        LongName="ibv_ud_pingpong.pdb" Name="ud_ping.pdb"\r
+                        Source="..\bin\tools\x86\release\ibv_ud_pingpong.pdb" />\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_bw.pdb" Compressed="yes" DiskId="1"\r
+                        LongName="ibv_write_bw.pdb" Name="write_bw.pdb"\r
+                        Source="..\bin\tools\x86\release\ibv_write_bw.pdb" />\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
+                  <File Id="ibv_write_lat.pdb" Compressed="yes" DiskId="1"\r
+                        LongName="ibv_write_lat.pdb" Name="writelat.pdb"\r
+                        Source="..\bin\tools\x86\release\ibv_write_lat.pdb" />\r
+                  <File Id="sminfo.exe" Compressed="yes" DiskId="1"\r
+                        LongName="sminfo.exe" Name="sminfo.exe"\r
+                        Source="..\bin\tools\x86\release\sminfo.exe" />\r
+                  <File Id="sminfo.pdb" Compressed="yes" DiskId="1"\r
+                        LongName="sminfo.pdb" Name="sminfo.pdb"\r
+                        Source="..\bin\tools\x86\release\sminfo.pdb" />\r
+                  <File Id="ibstat.exe" Compressed="yes" DiskId="1"\r
+                        LongName="ibstat.exe" Name="ibstat.exe"\r
+                        Source="..\bin\tools\x86\release\ibstat.exe" />\r
+                  <File Id="ibstat.pdb" Compressed="yes" DiskId="1"\r
+                        LongName="ibstat.pdb" Name="ibstat.pdb"\r
+                        Source="..\bin\tools\x86\release\ibstat.pdb" />\r
+                  <File Id="perfquery.exe" Compressed="yes" DiskId="1"\r
+                        LongName="perfquery.exe" Name="perfquer.exe"\r
+                        Source="..\bin\tools\x86\release\perfquery.exe" />\r
+                  <File Id="perfquery.pdb" Compressed="yes" DiskId="1"\r
+                        LongName="perfquery.pdb" Name="perfquer.pdb"\r
+                        Source="..\bin\tools\x86\release\perfquery.pdb" />\r
+                  <File Id="ibaddr.exe" Compressed="yes" DiskId="1"\r
+                        LongName="ibaddr.exe" Name="ibaddr.exe"\r
+                        Source="..\bin\tools\x86\release\ibaddr.exe" />\r
+                  <File Id="ibaddr.pdb" Compressed="yes" DiskId="1"\r
+                        LongName="ibaddr.pdb" Name="ibaddr.pdb"\r
+                        Source="..\bin\tools\x86\release\ibaddr.pdb" />\r
                 </Component>\r
 \r
                 <Directory Id="ipoibDir" Name="net">\r
                <File Id="winverbs.lib" Compressed="yes" DiskId="1"\r
                      LongName="winverbs.lib" Name="winverbs.lib"\r
                      Source="..\bin\HCA\x86\winverbs.lib" />\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
                <File Id="libibverbs.lib" Compressed="yes" DiskId="1"\r
                      LongName="libibverbs.lib" Name="ibverbs.lib"\r
                      Source="..\bin\HCA\x86\libibverbs.lib" />\r
-               <File Id="libibverbs.pdb" Compressed="yes" DiskId="1"\r
+               <File Id="libibverbs2.pdb" Compressed="yes" DiskId="1"\r
                      LongName="libibverbs.pdb" Name="ibverbs.pdb"\r
                      Source="..\bin\HCA\x86\libibverbs.pdb" />\r
                <File Id="libibverbsd.lib" Compressed="yes" DiskId="1"\r
                      LongName="libibverbsd.lib" Name="ibverbsd.lib"\r
                      Source="..\bin\HCA\x86\libibverbsd.lib" />\r
-               <File Id="libibverbsd.pdb" Compressed="yes" DiskId="1"\r
+               <File Id="libibverbsd2.pdb" Compressed="yes" DiskId="1"\r
                      LongName="libibverbsd.pdb" Name="ibverbsd.pdb"\r
                      Source="..\bin\HCA\x86\libibverbsd.pdb" />\r
 \r
+               <File Id="libibmad.lib" Compressed="yes" DiskId="1"\r
+                     LongName="libibmad.lib" Name="ibmad.lib"\r
+                     Source="..\bin\HCA\x86\libibmad.lib" />\r
+               <File Id="libibmad2.pdb" Compressed="yes" DiskId="1"\r
+                     LongName="libibmad.pdb" Name="ibmad.pdb"\r
+                     Source="..\bin\HCA\x86\libibmad.pdb" />\r
+               <File Id="libibmadd.lib" Compressed="yes" DiskId="1"\r
+                     LongName="libibmadd.lib" Name="ibmadd.lib"\r
+                     Source="..\bin\HCA\x86\libibmadd.lib" />\r
+               <File Id="libibmadd2.pdb" Compressed="yes" DiskId="1"\r
+                     LongName="libibmadd.pdb" Name="ibmadd.pdb"\r
+                     Source="..\bin\HCA\x86\libibmadd.pdb" />\r
+\r
+               <File Id="libibumad.lib" Compressed="yes" DiskId="1"\r
+                     LongName="libibumad.lib" Name="ibumad.lib"\r
+                     Source="..\bin\HCA\x86\libibumad.lib" />\r
+               <File Id="libibumad2.pdb" Compressed="yes" DiskId="1"\r
+                     LongName="libibumad.pdb" Name="ibumad.pdb"\r
+                     Source="..\bin\HCA\x86\libibumad.pdb" />\r
+               <File Id="libibumadd.lib" Compressed="yes" DiskId="1"\r
+                     LongName="libibumadd.lib" Name="ibumadd.lib"\r
+                     Source="..\bin\HCA\x86\libibumadd.lib" />\r
+               <File Id="libibumadd2.pdb" Compressed="yes" DiskId="1"\r
+                     LongName="libibumadd.pdb" Name="ibumadd.pdb"\r
+                     Source="..\bin\HCA\x86\libibumadd.pdb" />\r
              </Component>\r
            </Directory>\r
 \r
index 77415a1..bfd9e60 100644 (file)
                         <File Id="winverbsd.dll" Compressed="yes" DiskId="1"\r
                               LongName="winverbsd.dll" Name="winvrbsd.dll"\r
                               Source="..\bin\HCA\x86\winverbsd.dll" />\r
+                        <File Id="winmad.sys" Compressed="yes" DiskId="1"\r
+                              LongName="winmad.sys" Name="winmad.sys"\r
+                              Source="..\bin\HCA\x86\winmad.sys" />\r
+                        <File Id="winmad.pdb" Compressed="yes" DiskId="1"\r
+                              LongName="winmad.pdb" Name="winmad.pdb"\r
+                              Source="..\bin\HCA\x86\winmad.pdb" />\r
+                        <File Id="winmad.dll" Compressed="yes" DiskId="1"\r
+                              LongName="winmad.dll" Name="winmad.dll"\r
+                              Source="..\bin\HCA\x86\winmad.dll" />\r
+                        <File Id="winmadd.dll" Compressed="yes" DiskId="1"\r
+                              LongName="winmadd.dll" Name="winmaddd.dll"\r
+                              Source="..\bin\HCA\x86\winmadd.dll" />\r
                     </Component>\r
                 </Directory>\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
+                    <CopyFile Id="dupLibibverbs.dll" FileId="libibverbs.dll"\r
                            DestinationName="ibverbs.dll"\r
                            DestinationLongName="libibverbs.dll"\r
                            DestinationProperty="WindowsFolder" />\r
-\r
+                  <File Id="libibverbs.pdb" Compressed="yes" DiskId="1"\r
+                        LongName="libibverbs.pdb" Name="ibverbs.pdb"\r
+                        Source="..\bin\HCA\x86\libibverbs.pdb" />\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
-                    <CopyFile Id="dupLibibvd.dll" FileId="libibverbsd.dll"\r
+                    <CopyFile Id="dupLibibverbsd.dll" FileId="libibverbsd.dll"\r
                            DestinationName="ibverbsd.dll"\r
                            DestinationLongName="libibverbsd.dll"\r
                            DestinationProperty="WindowsFolder" />\r
+                  <File Id="libibverbsd.pdb" Compressed="yes" DiskId="1"\r
+                        LongName="libibverbsd.pdb" Name="ibverbsd.pdb"\r
+                        Source="..\bin\HCA\x86\libibverbsd.pdb" />\r
+      \r
+                  <File Id="libibmad.dll" Compressed="yes" DiskId="1"\r
+                        LongName="libibmad.dll" Name="ibmad.dll"\r
+                        Source="..\bin\HCA\x86\libibmad.dll" />\r
+                    <CopyFile Id="dupLibibmad.dll" FileId="libibmad.dll"\r
+                           DestinationName="ibmad.dll"\r
+                           DestinationLongName="libibmad.dll"\r
+                           DestinationProperty="WindowsFolder" />\r
+                  <File Id="libibmad.pdb" Compressed="yes" DiskId="1"\r
+                        LongName="libibmad.pdb" Name="ibmad.pdb"\r
+                        Source="..\bin\HCA\x86\libibmad.pdb" />\r
+      \r
+                  <File Id="libibmadd.dll" Compressed="yes" DiskId="1"\r
+                        LongName="libibmadd.dll" Name="ibmadd.dll"\r
+                        Source="..\bin\HCA\x86\libibmadd.dll" />\r
+                    <CopyFile Id="dupLibibmadd.dll" FileId="libibmadd.dll"\r
+                           DestinationName="ibmadd.dll"\r
+                           DestinationLongName="libibmadd.dll"\r
+                           DestinationProperty="WindowsFolder" />\r
+                  <File Id="libibmadd.pdb" Compressed="yes" DiskId="1"\r
+                        LongName="libibmadd.pdb" Name="ibmadd.pdb"\r
+                        Source="..\bin\HCA\x86\libibmadd.pdb" />\r
+      \r
+                  <File Id="libibumad.dll" Compressed="yes" DiskId="1"\r
+                        LongName="libibumad.dll" Name="ibumad.dll"\r
+                        Source="..\bin\HCA\x86\libibumad.dll" />\r
+                    <CopyFile Id="dupLibibumad.dll" FileId="libibumad.dll"\r
+                           DestinationName="ibumad.dll"\r
+                           DestinationLongName="libibumad.dll"\r
+                           DestinationProperty="WindowsFolder" />\r
+                  <File Id="libibumad.pdb" Compressed="yes" DiskId="1"\r
+                        LongName="libibumad.pdb" Name="ibumad.pdb"\r
+                        Source="..\bin\HCA\x86\libibumad.pdb" />\r
+      \r
+                  <File Id="libibumadd.dll" Compressed="yes" DiskId="1"\r
+                        LongName="libibumadd.dll" Name="ibumadd.dll"\r
+                        Source="..\bin\HCA\x86\libibumadd.dll" />\r
+                    <CopyFile Id="dupLibibumadd.dll" FileId="libibumadd.dll"\r
+                           DestinationName="ibumadd.dll"\r
+                           DestinationLongName="libibumadd.dll"\r
+                           DestinationProperty="WindowsFolder" />\r
+                  <File Id="libibumadd.pdb" Compressed="yes" DiskId="1"\r
+                        LongName="libibumadd.pdb" Name="ibumadd.pdb"\r
+                        Source="..\bin\HCA\x86\libibumadd.pdb" />\r
                 </Component>\r
 \r
                 <Component Id="cWinVerbsUApps"\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_asyncwatch.pdb" Compressed="yes" DiskId="1"\r
+                        LongName="ibv_asyncwatch.pdb" Name="asyncwat.pdb"\r
+                        Source="..\bin\tools\x86\release\ibv_asyncwatch.pdb" />\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_devinfo.pdb" Compressed="yes" DiskId="1"\r
+                        LongName="ibv_devinfo.pdb" Name="devinfo.pdb"\r
+                        Source="..\bin\tools\x86\release\ibv_devinfo.pdb" />\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_rc_pingpong.pdb" Compressed="yes" DiskId="1"\r
+                        LongName="ibv_rc_pingpong.pdb" Name="ibv_rc_p.pdb"\r
+                        Source="..\bin\tools\x86\release\ibv_rc_pingpong.pdb" />\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_bw.pdb" Compressed="yes" DiskId="1"\r
+                        LongName="ibv_read_bw.pdb" Name="readbw.pdb"\r
+                        Source="..\bin\tools\x86\release\ibv_read_bw.pdb" />\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_read_lat.pdb" Compressed="yes" DiskId="1"\r
+                        LongName="ibv_read_lat.pdb" Name="readlat.pdb"\r
+                        Source="..\bin\tools\x86\release\ibv_read_lat.pdb" />\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_bw.pdb" Compressed="yes" DiskId="1"\r
+                        LongName="ibv_send_bw.pdb" Name="send_bw.pdb"\r
+                        Source="..\bin\tools\x86\release\ibv_send_bw.pdb" />\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_send_lat.pdb" Compressed="yes" DiskId="1"\r
+                        LongName="ibv_send_lat.pdb" Name="send_lat.pdb"\r
+                        Source="..\bin\tools\x86\release\ibv_send_lat.pdb" />\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_uc_pingpong.pdb" Compressed="yes" DiskId="1"\r
+                        LongName="ibv_uc_pingpong.pdb" Name="uc_ping.pdb"\r
+                        Source="..\bin\tools\x86\release\ibv_uc_pingpong.pdb" />\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_ud_pingpong.pdb" Compressed="yes" DiskId="1"\r
+                        LongName="ibv_ud_pingpong.pdb" Name="ud_ping.pdb"\r
+                        Source="..\bin\tools\x86\release\ibv_ud_pingpong.pdb" />\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_bw.pdb" Compressed="yes" DiskId="1"\r
+                        LongName="ibv_write_bw.pdb" Name="write_bw.pdb"\r
+                        Source="..\bin\tools\x86\release\ibv_write_bw.pdb" />\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
+                  <File Id="ibv_write_lat.pdb" Compressed="yes" DiskId="1"\r
+                        LongName="ibv_write_lat.pdb" Name="writelat.pdb"\r
+                        Source="..\bin\tools\x86\release\ibv_write_lat.pdb" />\r
+                  <File Id="sminfo.exe" Compressed="yes" DiskId="1"\r
+                        LongName="sminfo.exe" Name="sminfo.exe"\r
+                        Source="..\bin\tools\x86\release\sminfo.exe" />\r
+                  <File Id="sminfo.pdb" Compressed="yes" DiskId="1"\r
+                        LongName="sminfo.pdb" Name="sminfo.pdb"\r
+                        Source="..\bin\tools\x86\release\sminfo.pdb" />\r
+                  <File Id="ibstat.exe" Compressed="yes" DiskId="1"\r
+                        LongName="ibstat.exe" Name="ibstat.exe"\r
+                        Source="..\bin\tools\x86\release\ibstat.exe" />\r
+                  <File Id="ibstat.pdb" Compressed="yes" DiskId="1"\r
+                        LongName="ibstat.pdb" Name="ibstat.pdb"\r
+                        Source="..\bin\tools\x86\release\ibstat.pdb" />\r
+                  <File Id="perfquery.exe" Compressed="yes" DiskId="1"\r
+                        LongName="perfquery.exe" Name="perfquer.exe"\r
+                        Source="..\bin\tools\x86\release\perfquery.exe" />\r
+                  <File Id="perfquery.pdb" Compressed="yes" DiskId="1"\r
+                        LongName="perfquery.pdb" Name="perfquer.pdb"\r
+                        Source="..\bin\tools\x86\release\perfquery.pdb" />\r
+                  <File Id="ibaddr.exe" Compressed="yes" DiskId="1"\r
+                        LongName="ibaddr.exe" Name="ibaddr.exe"\r
+                        Source="..\bin\tools\x86\release\ibaddr.exe" />\r
+                  <File Id="ibaddr.pdb" Compressed="yes" DiskId="1"\r
+                        LongName="ibaddr.pdb" Name="ibaddr.pdb"\r
+                        Source="..\bin\tools\x86\release\ibaddr.pdb" />\r
                 </Component>\r
 \r
                 <Directory Id="ipoibDir" Name="net">\r
                     LongName="complibd.pdb" Name="complibd.pdb"\r
                     Source="..\bin\HCA\x86\complibd.pdb" />\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
-\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.lib" Compressed="yes" DiskId="1"\r
-                    LongName="libibverbs.lib" Name="ibverbs.lib"\r
-                    Source="..\bin\HCA\x86\libibverbs.lib" />\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
+               <File Id="winverbs.lib" Compressed="yes" DiskId="1"\r
+                     LongName="winverbs.lib" Name="winverbs.lib"\r
+                     Source="..\bin\HCA\x86\winverbs.lib" />\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.lib" Compressed="yes" DiskId="1"\r
+                     LongName="libibverbs.lib" Name="ibverbs.lib"\r
+                     Source="..\bin\HCA\x86\libibverbs.lib" />\r
+               <File Id="libibverbs2.pdb" Compressed="yes" DiskId="1"\r
+                     LongName="libibverbs.pdb" Name="ibverbs.pdb"\r
+                     Source="..\bin\HCA\x86\libibverbs.pdb" />\r
+               <File Id="libibverbsd.lib" Compressed="yes" DiskId="1"\r
+                     LongName="libibverbsd.lib" Name="ibverbsd.lib"\r
+                     Source="..\bin\HCA\x86\libibverbsd.lib" />\r
+               <File Id="libibverbsd2.pdb" Compressed="yes" DiskId="1"\r
+                     LongName="libibverbsd.pdb" Name="ibverbsd.pdb"\r
+                     Source="..\bin\HCA\x86\libibverbsd.pdb" />\r
+\r
+               <File Id="libibmad.lib" Compressed="yes" DiskId="1"\r
+                     LongName="libibmad.lib" Name="ibmad.lib"\r
+                     Source="..\bin\HCA\x86\libibmad.lib" />\r
+               <File Id="libibmad2.pdb" Compressed="yes" DiskId="1"\r
+                     LongName="libibmad.pdb" Name="ibmad.pdb"\r
+                     Source="..\bin\HCA\x86\libibmad.pdb" />\r
+               <File Id="libibmadd.lib" Compressed="yes" DiskId="1"\r
+                     LongName="libibmadd.lib" Name="ibmadd.lib"\r
+                     Source="..\bin\HCA\x86\libibmadd.lib" />\r
+               <File Id="libibmadd2.pdb" Compressed="yes" DiskId="1"\r
+                     LongName="libibmadd.pdb" Name="ibmadd.pdb"\r
+                     Source="..\bin\HCA\x86\libibmadd.pdb" />\r
+\r
+               <File Id="libibumad.lib" Compressed="yes" DiskId="1"\r
+                     LongName="libibumad.lib" Name="ibumad.lib"\r
+                     Source="..\bin\HCA\x86\libibumad.lib" />\r
+               <File Id="libibumad2.pdb" Compressed="yes" DiskId="1"\r
+                     LongName="libibumad.pdb" Name="ibumad.pdb"\r
+                     Source="..\bin\HCA\x86\libibumad.pdb" />\r
+               <File Id="libibumadd.lib" Compressed="yes" DiskId="1"\r
+                     LongName="libibumadd.lib" Name="ibumadd.lib"\r
+                     Source="..\bin\HCA\x86\libibumadd.lib" />\r
+               <File Id="libibumadd2.pdb" Compressed="yes" DiskId="1"\r
+                     LongName="libibumadd.pdb" Name="ibumadd.pdb"\r
+                     Source="..\bin\HCA\x86\libibumadd.pdb" />\r
              </Component>\r
            </Directory>\r
 \r