[WinOF]

trunk\WinOF\WIX\{wlh,wnet,wxp}\*\wof.wxs
    Enable ia64 ConnectX (mlx4) HCA support in WinOF Installs.
    Setup winverbs.sys filter driver in WinOF\IBcore\
    Winverbs[ibverbs.dll] OFED verbs & OFED test pgms (ibv_read_bs & friends) installed by default.

trunk\WinOF\WIX\CustomActions.vbs
    Enable use of dpinst.exe for WLH variants; skip having to specify InfiniHost or ConnectX driver.
     Server 2003/XP/XP64 still need to specify 'which' HCA driver (see below).

    Support cmd-line msiexec installs:
      start/wait msiexec /I WOF.msi /passive NODRV=1 #install defaults except drivers (WDM support)

      (Server 2003/Xp64/XP ONLY - ignored for WLH)
      start/wait msiexec /I WOF.msi /passive HCA=cx  # Install ConnectX driver instead of InfiniHost.
      start/wait msiexec /I WOF.msi /passive HCA=+cx  # Install ConnectX and InfiniHost HCA drivers.

      start/wait msiexec /I WOF.msi /passive HCA=SRP  # add SRP driver to default install.
      start/wait msiexec /I WOF.msi /passive HCA=VNIC  # add SRP driver to default install.

trunk\winof\buildrelease.bat
    Rearrange varible set(s) so 'clean' can 'rmdir WinOF\WIX\{wlh,wnet,wxp}\bin'.

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

diff --git a/trunk/WinOF/BuildRelease.bat b/trunk/WinOF/BuildRelease.bat
index 69f78b4fd5bf390fc71685fa3383b0aaae5c82bd..73cb5ff84e9efd5cebba1bc7cc9dd7919dc64895 100644 (file)
--- a/trunk/WinOF/BuildRelease.bat
+++ b/trunk/WinOF/BuildRelease.bat
@@ -74,10 +74,34 @@ if not "%WDM_INC_PATH%" == "" (
     exit /B 1\r
 )\r
 \r
+rem assumes %CD% == '<...>\gen1\trunk'\r
+set BSE=%CD%\r
+set WIX=%CD%\WinOF\WIX\r
+\r
+rem Use Wix V2 binaries.\r
+rem set WIX_BIN=wix-2.0.5325.0-binaries\r
+set WIX_BIN=wix-2.0.5805.0-binaries\r
+\r
+set RBIN_WLH=%WIX%\wlh\bin%\r
+set RBIN_WNET=%WIX%\wnet\bin%\r
+set RBIN_WXP=%WIX%\wxp\bin%\r
+\r
 rem remove build artifacts\r
 if "%1" == "clean" (\r
     echo Removing build artifacts and folders...\r
     call %CD%\etc\clean-build.bat\r
+    if exist %WIX%\wlh\bin (\r
+               echo Removing %WIX%\wlh\bin\r
+               rmdir /Q /S %WIX%\wlh\bin\r
+    )\r
+    if exist %WIX%\wnet\bin (\r
+               echo Removing %WIX%\wnet\bin\r
+               rmdir /Q /S %WIX%\wnet\bin\r
+    )\r
+    if exist %WIX%\wxp\bin (\r
+               echo Removing %WIX%\wxp\bin\r
+               rmdir /Q /S %WIX%\wxp\bin\r
+    )\r
     exit /B 0\r
 )\r
 \r
@@ -120,8 +144,10 @@ rem Platform SDK path - watchout for missing LoadPerf.h (installsp.c)
 set _PSDK=%SystemDrive%\progra~1\mi2578~1\r
 \r
 rem set this to be the current svn commit number; overrides svn in path\r
-rem processing.\r
-set USE_SVN=1748\r
+rem processing. Additionally if set to 'latest' code expects ..\..\..\latest.txt\r
+rem to contain the SVN number to use.\r
+rem set USE_SVN=1748\r
+set USE_SVN=latest\r
 \r
 rem setup value for OPENIB_REV assignment.\r
 if "%2" == "" (\r
@@ -134,7 +160,12 @@ if "%2" == "" (
     if "%USE_SVN%" == "" (\r
         set SVN=%CD:~22,4%\r
     ) else (\r
-        set SVN=%USE_SVN%\r
+       if "%USE_SVN%" == "latest" (\r
+rem                    set /P SVN=<F:\openIB-windows-svn\latest.txt\r
+                       set /P SVN=< ..\..\..\latest.txt\r
+               ) else (\r
+                       set SVN=%USE_SVN%\r
+               )\r
     )\r
     set LBL=_svn.!SVN!\r
 ) else (\r
@@ -142,18 +173,6 @@ if "%2" == "" (
     set LBL=%2\r
 )\r
 \r
-rem assumes %CD% == '<...>\gen1\trunk'\r
-set BSE=%CD%\r
-set WIX=%CD%\WinOF\WIX\r
-\r
-rem Use Wix V2 binaries.\r
-rem set WIX_BIN=wix-2.0.5325.0-binaries\r
-set WIX_BIN=wix-2.0.5805.0-binaries\r
-\r
-set RBIN_WLH=%WIX%\wlh\bin%\r
-set RBIN_WNET=%WIX%\wnet\bin%\r
-set RBIN_WXP=%WIX%\wxp\bin%\r
-\r
 if NOT EXIST "%WIX%\build-all-MSI.bat" (\r
     echo %0 - Missing .msi installer build script\r
     echo    %WIX%\build-all-MSI.bat\r
@@ -287,6 +306,18 @@ if "%1" == "compilenoforce" (
 if "%1" == "all" (\r
     echo Removing build artifacts and folders...\r
     call %CD%\etc\clean-build.bat\r
+    if exist %WIX%\wlh\bin (\r
+               echo Removing %WIX%\wlh\bin\r
+               rmdir /Q /S %WIX%\wlh\bin\r
+    )\r
+    if exist %WIX%\wnet\bin (\r
+               echo Removing %WIX%\wnet\bin\r
+               rmdir /Q /S %WIX%\wnet\bin\r
+    )\r
+    if exist %WIX%\wxp\bin (\r
+               echo Removing %WIX%\wxp\bin\r
+               rmdir /Q /S %WIX%\wxp\bin\r
+    )\r
 )\r
 \r
 rem ************ Setup Env for Building \r

diff --git a/trunk/WinOF/WIX/CustomActions.vbs b/trunk/WinOF/WIX/CustomActions.vbs
index 52fef31bd9a8a18eba51e43bcac156cca711e8c0..bb75a0b51129fd4de3841a46c68f5d749f4fd7d7 100644 (file)
--- a/trunk/WinOF/WIX/CustomActions.vbs
+++ b/trunk/WinOF/WIX/CustomActions.vbs
@@ -62,6 +62,10 @@ Sub WinOF_setup
        If VersionNT < 600 Then\r
                use_this_HCA = Session.Property("HCA")\r
                If use_this_HCA <> "" Then\r
+                       ' down-case if required.\r
+                       If Instr(use_this_HCA,"CX") <> 0 Then\r
+                               use_this_HCA = Replace(use_this_HCA,"CX","cx")\r
+                       End if\r
                        If Instr(use_this_HCA,"+cx") <> 0 Then\r
                                ' Add ConnectX HCA drivers\r
                                AddLocal = AddLocal & ",hca_connectX"\r
@@ -1501,16 +1505,16 @@ Sub DriverUninstall()
                sRemove = "ALL"\r
        End If\r
 \r
-       if fso.FileExists(sInstalldir & "net\ndinstall.exe") Then\r
-           Return = WshShell.Run ("cmd.exe /c cd " & sInstalldir & _\r
-                                  " & net\ndinstall.exe -r", 0, true)\r
-       End If\r
-       \r
        If sVersionNT <> 501 AND fso.FileExists(sInstalldir & "installsp.exe") Then\r
                Return = WshShell.Run ("cmd.exe /c cd " & sInstalldir & _\r
                                   " & installsp.exe -r", 0, true)\r
        End If\r
 \r
+       If fso.FileExists(sInstalldir & "net\ndinstall.exe") Then\r
+           Return = WshShell.Run ("cmd.exe /c cd " & sInstalldir & _\r
+                                  " & net\ndinstall.exe -r", 0, true)\r
+       End If\r
+       \r
        ' stop the openSM service in case it was started.\r
        Return = WshShell.Run ("cmd.exe /c sc.exe stop opensm", 0, true)\r
 \r

diff --git a/trunk/WinOF/WIX/wlh/ia64/wof.wxs b/trunk/WinOF/WIX/wlh/ia64/wof.wxs
index 6063e0e87258acf7abcd2d358bfc659fd878d82a..ad9c28bca742a609ac9b271290b7b401544f0892 100644 (file)
--- a/trunk/WinOF/WIX/wlh/ia64/wof.wxs
+++ b/trunk/WinOF/WIX/wlh/ia64/wof.wxs
@@ -228,6 +228,9 @@
               <File Id="devman.exe" Compressed="yes" DiskId="1"\r
                      LongName="devman.exe" Name="devman.exe"\r
                      Source="..\..\ia64\devman.exe" />\r
+              <File Id="wdfcoinstaller" Compressed="yes" DiskId="1"\r
+                     LongName="WdfCoInstaller01007.dll" Name="WCO.dll"\r
+                     Source="..\bin\hca\ia64\WdfCoInstaller01007.dll" />\r
               <File Id="cl32.dll" Compressed="yes" DiskId="1"\r
                      LongName="cl32.dll" Name="CL32.DLL"\r
                      Source="..\bin\HCA\ia64\cl32.dll" />\r
@@ -310,7 +313,6 @@
                      Source="..\bin\HCA\ia64\mthcaud.dll" />\r
             </Component>\r
 \r
-<!-- Remove when ConnectX works on ia64\r
             <Component Id="cConnectXDriver"\r
                        Guid="C1EFF4D6-CE55-432a-9D92-E46AB983D9E3">\r
               <File Id="mlx4_bus.inf" Compressed="yes" DiskId="1"\r
@@ -325,9 +327,6 @@
               <File Id="mlx4_bus.pdb" Compressed="yes" DiskId="1"\r
                      Name="mlx4_bus.pdb"\r
                      Source="..\bin\hca\ia64\mlx4_bus.pdb" />\r
-              <File Id="wdfcoinstaller" Compressed="yes" DiskId="1"\r
-                     LongName="WdfCoInstaller01007.dll" Name="WCO.dll"\r
-                     Source="..\bin\hca\ia64\WdfCoInstaller01007.dll" />\r
               <File Id="mlx4_hca.inf" Compressed="yes" DiskId="1"\r
                      LongName="mlx4_hca.inf" Name="mlx4_hca.INF"\r
                      Source="..\bin\hca\ia64\mlx4_hca.inf" />\r
@@ -347,7 +346,7 @@
                      LongName="mlx4ud.dll" Name="mlx4ud.dll"\r
                      Source="..\bin\hca\ia64\mlx4ud.dll" />\r
 \r
-                         <!++ copy 32-bit binaries for 32b in ia64 ++> \r
+                         <!-- copy 32-bit binaries --> \r
               <File Id="mlx4u32d.dll" Compressed="yes" DiskId="1"\r
                      LongName="mlx4u32d.dll" Name="mlx4u32.dll"\r
                      Source="..\bin\hca\ia64\mlx4u32d.dll" />\r
@@ -355,8 +354,23 @@
                      LongName="mlx4u32.dll" Name="mlx4u32.dll"\r
                      Source="..\bin\hca\ia64\mlx4u32.dll" />\r
             </Component>\r
-End Remove -->\r
 \r
+            <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\ia64\winverbs.sys" />\r
+              <File Id="winverbs.pdb" Compressed="yes" DiskId="1"\r
+                    LongName="winverbs.pdb" Name="winverbs.pdb"\r
+                    Source="..\bin\HCA\ia64\winverbs.pdb" />\r
+              <File Id="winverbs.dll" Compressed="yes" DiskId="1"\r
+                    LongName="winverbs.dll" Name="winvrbs.dll"\r
+                    Source="..\bin\HCA\ia64\winverbs.dll" />\r
+              <File Id="winverbsd.dll" Compressed="yes" DiskId="1"\r
+                    LongName="winverbsd.dll" Name="winvrbsd.dll"\r
+                    Source="..\bin\HCA\ia64\winverbsd.dll" />\r
+            </Component>\r
           </Directory>\r
 \r
           <Directory Id="dir_0" Name="Checked">\r
@@ -365,48 +379,79 @@ End Remove -->
                          Guid="D96F299E-EEAA-44a5-BBC4-A862A158BA6B">\r
                 <CreateFolder />\r
 \r
-                <File Id="chk0" Name="README.txt" DiskId="1" Compressed="yes"\r
-                  Source="..\..\README_checked.txt" />\r
-                <File Id="chk1" Name="mthca.sys" DiskId="1" Compressed="yes"\r
-                  Source="..\bin\Chk\HCA\ia64\mthca.sys" />\r
-                <File Id="cat1" Name="mthca.cat" DiskId="1" Compressed="yes"\r
-                  Source="..\bin\Chk\HCA\ia64\mthca.cat" />\r
-                <File Id="sym1" Name="mthca.pdb" DiskId="1" Compressed="yes"\r
-                  Source="..\bin\Chk\HCA\ia64\mthca.pdb" />\r
-\r
-                <File Id="chk2" Name="ibbus.sys" DiskId="1" Compressed="yes"\r
-                  Source="..\bin\Chk\HCA\ia64\ibbus.sys" />\r
-                <File Id="sym2" Name="ibbus.pdb" DiskId="1" Compressed="yes"\r
-                  Source="..\bin\Chk\HCA\ia64\ibbus.pdb" />\r
-\r
-                <File Id="chk3" Name="ibiou.sys" DiskId="1" Compressed="yes"\r
-                  Source="..\bin\Chk\HCA\ia64\ibiou.sys" />\r
-                <File Id="cat3" Name="ib_iou.cat" DiskId="1" Compressed="yes"\r
-                  Source="..\bin\Chk\HCA\ia64\ib_iou.cat" />\r
-                <File Id="sym3" Name="ibiou.pdb" DiskId="1" Compressed="yes"\r
-                  Source="..\bin\Chk\HCA\ia64\ibiou.pdb" />\r
-\r
-                <File Id="chk4" Name="ipoib.sys" DiskId="1" Compressed="yes"\r
-                  Source="..\bin\Chk\net\ia64\ipoib.sys" />\r
-                <File Id="cat4" Name="ipoib.cat" DiskId="1" Compressed="yes"\r
-                  Source="..\bin\Chk\net\ia64\ipoib.cat" />\r
-                <File Id="sym4" Name="ipoib.pdb" DiskId="1" Compressed="yes"\r
-                  Source="..\bin\Chk\net\ia64\ipoib.pdb" />\r
-\r
-                <File Id="chk5" Name="qlgcvnic.sys" DiskId="1" Compressed="yes"\r
-                  Source="..\bin\Chk\net\ia64\qlgcvnic.sys" />\r
-                <File Id="cat5" Name="netvnic.cat" DiskId="1" Compressed="yes"\r
-                  Source="..\bin\Chk\net\ia64\netvnic.cat" />\r
-                <File Id="sym5" Name="qlgcvnic.pdb" DiskId="1" Compressed="yes"\r
-                  Source="..\bin\Chk\net\ia64\qlgcvnic.pdb" />\r
-\r
-                <File Id="chk6" Name="ibsrp.sys" DiskId="1" Compressed="yes"\r
-                  Source="..\bin\Chk\storage\ia64\ibsrp.sys" />\r
-                <File Id="cat6" Name="ibsrp.cat" DiskId="1" Compressed="yes"\r
-                  Source="..\bin\Chk\storage\ia64\ibsrp.cat" />\r
-                <File Id="sym6" Name="ibsrp.pdb" DiskId="1" Compressed="yes"\r
-                  Source="..\bin\Chk\storage\ia64\ibsrp.pdb" />\r
-\r
+                <File Id="chk0" DiskId="1" Compressed="yes"\r
+                      Name="README.txt"\r
+                      Source="..\..\README_checked.txt" />\r
+                <File Id="chk1" DiskId="1" Compressed="yes"\r
+                      Name="mthca.sys"\r
+                      Source="..\bin\Chk\HCA\ia64\mthca.sys" />\r
+                <File Id="cat1" DiskId="1" Compressed="yes"\r
+                      Name="mthca.cat"\r
+                      Source="..\bin\Chk\HCA\ia64\mthca.cat" />\r
+                <File Id="sym1" DiskId="1" Compressed="yes"\r
+                      Name="mthca.pdb"\r
+                      Source="..\bin\Chk\HCA\ia64\mthca.pdb" />\r
+\r
+                <File Id="chk2" DiskId="1" Compressed="yes"\r
+                      Name="ibbus.sys"\r
+                      Source="..\bin\Chk\HCA\ia64\ibbus.sys" />\r
+                <File Id="sym2" DiskId="1" Compressed="yes"\r
+                      Name="ibbus.pdb"\r
+                      Source="..\bin\Chk\HCA\ia64\ibbus.pdb" />\r
+\r
+                <File Id="chk3" DiskId="1" Compressed="yes"\r
+                      Name="ibiou.sys"\r
+                      Source="..\bin\Chk\HCA\ia64\ibiou.sys" />\r
+                <File Id="cat3" DiskId="1" Compressed="yes"\r
+                      Name="ib_iou.cat"\r
+                      Source="..\bin\Chk\HCA\ia64\ib_iou.cat" />\r
+                <File Id="sym3" DiskId="1" Compressed="yes"\r
+                      Name="ibiou.pdb"\r
+                      Source="..\bin\Chk\HCA\ia64\ibiou.pdb" />\r
+\r
+                <File Id="chk4" DiskId="1" Compressed="yes"\r
+                      Name="ipoib.sys"\r
+                      Source="..\bin\Chk\net\ia64\ipoib.sys" />\r
+                <File Id="cat4" DiskId="1" Compressed="yes"\r
+                      Name="ipoib.cat"\r
+                      Source="..\bin\Chk\net\ia64\ipoib.cat" />\r
+                <File Id="sym4" DiskId="1" Compressed="yes"\r
+                      Name="ipoib.pdb"\r
+                      Source="..\bin\Chk\net\ia64\ipoib.pdb" />\r
+\r
+                <File Id="chk5" DiskId="1" Compressed="yes"\r
+                      Name="qlgcvnic.sys"\r
+                      Source="..\bin\Chk\net\ia64\qlgcvnic.sys" />\r
+                <File Id="cat5" DiskId="1" Compressed="yes"\r
+                      Name="netvnic.cat"\r
+                      Source="..\bin\Chk\net\ia64\netvnic.cat" />\r
+                <File Id="sym5" DiskId="1" Compressed="yes"\r
+                      Name="qlgcvnic.pdb"\r
+                      Source="..\bin\Chk\net\ia64\qlgcvnic.pdb" />\r
+\r
+                <File Id="chk6" DiskId="1" Compressed="yes"\r
+                      Name="ibsrp.sys"\r
+                      Source="..\bin\Chk\storage\ia64\ibsrp.sys" />\r
+                <File Id="cat6" DiskId="1" Compressed="yes"\r
+                      Name="ibsrp.cat"\r
+                      Source="..\bin\Chk\storage\ia64\ibsrp.cat" />\r
+                <File Id="sym6" DiskId="1" Compressed="yes"\r
+                      Name="ibsrp.pdb"\r
+                      Source="..\bin\Chk\storage\ia64\ibsrp.pdb" />\r
+\r
+                <File Id="chk9" DiskId="1" Compressed="yes"\r
+                      Name="winverbs.sys"\r
+                      Source="..\bin\Chk\HCA\ia64\winverbs.sys" />\r
+                <File Id="sym9" DiskId="1" Compressed="yes"\r
+                      Name="winverbs.pdb"\r
+                      Source="..\bin\Chk\HCA\ia64\winverbs.pdb" />\r
+                <File Id="dll9" DiskId="1" Compressed="yes"\r
+                      Name="winverbs.dll"\r
+                      Source="..\bin\Chk\HCA\ia64\winverbs.dll" />\r
+                <File Id="dlld9" DiskId="1" Compressed="yes"\r
+                      Name="winverbd.dll"\r
+                      LongName="winverbsd.dll"\r
+                      Source="..\bin\Chk\HCA\ia64\winverbsd.dll" />\r
               </Component>\r
             </Directory>\r
       \r
@@ -458,70 +503,24 @@ End Remove -->
             </Directory>\r
           </Directory>\r
 \r
-          <Directory Id="wvDir" Name="WinVerbs">\r
-             <Component Id="cWinVerbsKernel"\r
-                       Guid="F5FA1491-E2D2-4f22-9549-07C61F86BFEB">\r
-               <CreateFolder />\r
-\r
-               <File Id="winverbs.inf" Compressed="yes" DiskId="1"\r
-                     LongName="winverbs.inf" Name="winverbs.INF"\r
-                     Source="..\bin\HCA\ia64\winverbs.inf" />\r
-               <File Id="winverbs.sys" Compressed="yes" DiskId="1"\r
-                     LongName="winverbs.sys" Name="winverbs.sys"\r
-                     Source="..\bin\HCA\ia64\winverbs.sys" />\r
-               <File Id="winverbs.cat" Compressed="yes" DiskId="1"\r
-                     LongName="winverbs.cat" Name="winverbs.cat"\r
-                     Source="..\bin\HCA\ia64\winverbs.cat" />\r
-               <File Id="winverbs.dll" Compressed="yes" DiskId="1"\r
-                     LongName="winverbs.dll" Name="winvrbs.dll"\r
-                     Source="..\bin\HCA\ia64\winverbs.dll" />\r
-               <File Id="winverbsd.dll" Compressed="yes" DiskId="1"\r
-                     LongName="winverbsd.dll" Name="winvrbsd.dll"\r
-                     Source="..\bin\HCA\ia64\winverbsd.dll" />\r
-               <File Id="wvWdfCoinstaller" Compressed="yes" DiskId="1"\r
-                     LongName="WdfCoInstaller01007.dll" Name="WCO.dll"\r
-                     Source="..\bin\HCA\ia64\WdfCoInstaller01007.dll" />\r
-             </Component>\r
-\r
-             <Component Id="cWinVerbsUser"\r
-                       Guid="20916BB0-5E16-49bb-BE9F-3A202D760E72">\r
+          <Component Id="cWinVerbsOFED"\r
+                     Guid="20916BB0-5E16-49bb-BE9F-3A202D760E72">\r
 \r
-               <File Id="winverbs.lib" Compressed="yes" DiskId="1"\r
-                     LongName="winverbs.lib" Name="winverbs.lib"\r
-                     Source="..\bin\HCA\ia64\winverbs.lib" />\r
-               <CopyFile Id="dupWverbs.lib" FileId="winverbs.lib"\r
-                     DestinationName="winverbs.lib"\r
-                     DestinationProperty="WindowsFolder" />\r
-\r
-               <File Id="winverbsd.lib" Compressed="yes" DiskId="1"\r
-                     LongName="winverbsd.lib" Name="winvrbsd.lib"\r
-                     Source="..\bin\HCA\ia64\winverbsd.lib" />\r
-\r
-               <File Id="libibverbs.dll" Compressed="yes" DiskId="1"\r
-                     LongName="libibverbs.dll" Name="ibverbs.dll"\r
-                     Source="..\bin\HCA\ia64\libibverbs.dll" />\r
-               <CopyFile Id="dupLibibv.dll" FileId="libibverbs.dll"\r
+            <File Id="libibverbs.dll" Compressed="yes" DiskId="1"\r
+                  LongName="libibverbs.dll" Name="ibverbs.dll"\r
+                  Source="..\bin\HCA\ia64\libibverbs.dll" />\r
+              <CopyFile Id="dupLibibv.dll" FileId="libibverbs.dll"\r
                      DestinationName="ibverbs.dll"\r
                      DestinationLongName="libibverbs.dll"\r
                      DestinationProperty="WindowsFolder" />\r
-\r
-               <File Id="libibverbs.lib" Compressed="yes" DiskId="1"\r
-                     LongName="libibverbs.lib" Name="ibverbs.lib"\r
-                     Source="..\bin\HCA\ia64\libibverbs.lib" />\r
-               <CopyFile Id="dupLibibv.lib" FileId="libibverbs.lib"\r
-                     DestinationName="ibverbs.lib"\r
-                     DestinationLongName="libibverbs.lib"\r
+            <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
-\r
-               <File Id="libibverbsd.dll" Compressed="yes" DiskId="1"\r
-                     LongName="libibverbsd.dll" Name="ibverbsd.dll"\r
-                     Source="..\bin\HCA\ia64\libibverbsd.dll" />\r
-\r
-               <File Id="libibverbsd.lib" Compressed="yes" DiskId="1"\r
-                     LongName="libibverbsd.lib" Name="ibverbsd.lib"\r
-                     Source="..\bin\HCA\ia64\libibverbsd.lib" />\r
-             </Component>\r
-          </Directory>\r
+          </Component>\r
 \r
           <Component Id="cWinVerbsUApps"\r
                     Guid="ECAB2829-AE65-4ef8-8214-9A89E5BBDB9A">\r
@@ -1018,6 +1017,22 @@ End Remove -->
               <File Id="ibal32d.pdb" Compressed="yes" DiskId="1"\r
                     LongName="ibal32d.pdb" Name="ibal32d.pdb"\r
                     Source="..\bin\HCA\ia64\ibal32d.pdb" />\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
+              <File Id="winverbsd.lib" Compressed="yes" DiskId="1"\r
+                    LongName="winverbsd.lib" Name="winvrbsd.lib"\r
+                    Source="..\bin\HCA\ia64\winverbsd.lib" />\r
+\r
+              <File Id="libibverbs.lib" Compressed="yes" DiskId="1"\r
+                    LongName="libibverbs.lib" Name="ibverbs.lib"\r
+                    Source="..\bin\HCA\ia64\libibverbs.lib" />\r
+\r
+              <File Id="libibverbsd.lib" Compressed="yes" DiskId="1"\r
+                    LongName="libibverbsd.lib" Name="ibverbsd.lib"\r
+                    Source="..\bin\HCA\ia64\libibverbsd.lib" />\r
               </Component>\r
             </Directory>\r
 \r
@@ -1281,10 +1296,7 @@ End Remove -->
          AllowAdvertise='no' InstallDefault='local' Absent='allow'>\r
 \r
         <ComponentRef Id="cMthcaDriver" />\r
-\r
-<!-- remove when ConnectX works on ia64: i.e., ia64 platforms have PCIe\r
         <ComponentRef Id="cConnectXDriver" />\r
-End Remove -->\r
     </Feature>\r
 \r
     <Feature Id="IBcore" Title="InfiniBand Core" Level="1"\r
@@ -1292,6 +1304,7 @@ End Remove -->
          Display="expand" ConfigurableDirectory="INSTALLDIR"\r
          AllowAdvertise='no' InstallDefault='local' Absent='disallow'>\r
       <ComponentRef Id="cIBcore" />\r
+      <ComponentRef Id="cWinVerbsDrivers" />\r
       <ComponentRef Id="Docs" />\r
       <ComponentRef Id="Tools" />\r
       <ComponentRef Id="OpenSMservice" />\r
@@ -1300,11 +1313,10 @@ End Remove -->
     </Feature>\r
 \r
     <Feature Id="fWV" Title="WinVerbs"\r
-        Description="OFED verbs API for Windows"\r
-        Display="expand" Level="2" ConfigurableDirectory="INSTALLDIR"\r
+        Description="OFED verbs - Libraries and utilities"\r
+        Display="expand" Level="1" ConfigurableDirectory="INSTALLDIR"\r
         AllowAdvertise="no" InstallDefault="local" Absent="allow">\r
-        <ComponentRef Id="cWinVerbsKernel" />\r
-        <ComponentRef Id="cWinVerbsUser" />\r
+        <ComponentRef Id="cWinVerbsOFED" />\r
         <ComponentRef Id="cWinVerbsUApps" />\r
     </Feature>\r
 \r

diff --git a/trunk/WinOF/WIX/wlh/x64/wof.wxs b/trunk/WinOF/WIX/wlh/x64/wof.wxs
index f6d673cef53fefbfa8d0346b2ffcb9e691044caf..627df72584051b431d223d58ee1d6fd8b977f7b7 100644 (file)
--- a/trunk/WinOF/WIX/wlh/x64/wof.wxs
+++ b/trunk/WinOF/WIX/wlh/x64/wof.wxs
@@ -229,6 +229,9 @@
               <File Id="devman.exe" Compressed="yes" DiskId="1"\r
                      LongName="devman.exe" Name="devman.exe"\r
                      Source="..\..\x64\devman.exe" />\r
+              <File Id="wdfcoinstaller" Compressed="yes" DiskId="1"\r
+                     LongName="WdfCoInstaller01007.dll" Name="WCO.dll"\r
+                     Source="..\bin\hca\amd64\WdfCoInstaller01007.dll" />\r
               <File Id="cl32.dll" Compressed="yes" DiskId="1"\r
                      LongName="cl32.dll" Name="CL32.DLL"\r
                      Source="..\bin\HCA\amd64\cl32.dll" />\r
@@ -327,9 +330,6 @@
               <File Id="mlx4_bus.pdb" Compressed="yes" DiskId="1"\r
                      Name="mlx4_bus.pdb"\r
                      Source="..\bin\hca\amd64\mlx4_bus.pdb" />\r
-              <File Id="wdfcoinstaller" Compressed="yes" DiskId="1"\r
-                     LongName="WdfCoInstaller01007.dll" Name="WCO.dll"\r
-                     Source="..\bin\hca\amd64\WdfCoInstaller01007.dll" />\r
               <File Id="mlx4_hca.inf" Compressed="yes" DiskId="1"\r
                      LongName="mlx4_hca.inf" Name="mlx4_hca.INF"\r
                      Source="..\bin\hca\amd64\mlx4_hca.inf" />\r
@@ -357,6 +357,24 @@
                      LongName="mlx4u32.dll" Name="mlx4u32.dll"\r
                      Source="..\bin\hca\amd64\mlx4u32.dll" />\r
             </Component>\r
+\r
+            <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\amd64\winverbs.sys" />\r
+              <File Id="winverbs.pdb" Compressed="yes" DiskId="1"\r
+                    LongName="winverbs.pdb" Name="winverbs.pdb"\r
+                    Source="..\bin\HCA\amd64\winverbs.pdb" />\r
+              <File Id="winverbs.dll" Compressed="yes" DiskId="1"\r
+                    LongName="winverbs.dll" Name="winvrbs.dll"\r
+                    Source="..\bin\HCA\amd64\winverbs.dll" />\r
+              <File Id="winverbsd.dll" Compressed="yes" DiskId="1"\r
+                    LongName="winverbsd.dll" Name="winvrbsd.dll"\r
+                    Source="..\bin\HCA\amd64\winverbsd.dll" />\r
+            </Component>\r
+\r
           </Directory>\r
 \r
           <Directory Id="dir_0" Name="Checked">\r
@@ -365,71 +383,99 @@
                            Guid="D96F299E-EEAA-44a5-BBC4-A862A158BA6B">\r
                   <CreateFolder />\r
 \r
-                  <File Id="chk0" Name="README.txt" DiskId="1" Compressed="yes"\r
-                    Source="..\..\README_checked.txt" />\r
-                  <File Id="chk1" Name="mthca.sys" DiskId="1" Compressed="yes"\r
-                    Source="..\bin\Chk\HCA\amd64\mthca.sys" />\r
-                  <File Id="cat1" Name="mthca.cat" DiskId="1" Compressed="yes"\r
-                    Source="..\bin\Chk\HCA\amd64\mthca.cat" />\r
-                  <File Id="sym1" Name="mthca.pdb" DiskId="1" Compressed="yes"\r
-                    Source="..\bin\Chk\HCA\amd64\mthca.pdb" />\r
-\r
-                  <File Id="chk2" Name="ibbus.sys" DiskId="1" Compressed="yes"\r
-                    Source="..\bin\Chk\HCA\amd64\ibbus.sys" />\r
-                  <File Id="sym2" Name="ibbus.pdb" DiskId="1" Compressed="yes"\r
-                    Source="..\bin\Chk\HCA\amd64\ibbus.pdb" />\r
-\r
-                  <File Id="chk3" Name="ibiou.sys" DiskId="1" Compressed="yes"\r
-                    Source="..\bin\Chk\HCA\amd64\ibiou.sys" />\r
-                  <File Id="cat3" Name="ib_iou.cat" DiskId="1" Compressed="yes"\r
-                    Source="..\bin\Chk\HCA\amd64\ib_iou.cat" />\r
-                  <File Id="sym3" Name="ibiou.pdb" DiskId="1" Compressed="yes"\r
-                    Source="..\bin\Chk\HCA\amd64\ibiou.pdb" />\r
-\r
-                  <File Id="chk4" Name="ipoib.sys" DiskId="1" Compressed="yes"\r
-                  Source="..\bin\Chk\net\amd64\ipoib.sys" />\r
-                  <File Id="cat4" Name="ipoib.cat" DiskId="1" Compressed="yes"\r
-                    Source="..\bin\Chk\net\amd64\ipoib.cat" />\r
-                  <File Id="sym4" Name="ipoib.pdb" DiskId="1" Compressed="yes"\r
-                    Source="..\bin\Chk\net\amd64\ipoib.pdb" />\r
+                  <File Id="chk0" DiskId="1" Compressed="yes"\r
+                        Name="README.txt"\r
+                        Source="..\..\README_checked.txt" />\r
+                  <File Id="chk1" DiskId="1" Compressed="yes"\r
+                        Name="mthca.sys"\r
+                        Source="..\bin\Chk\HCA\amd64\mthca.sys" />\r
+                  <File Id="cat1" DiskId="1" Compressed="yes"\r
+                        Name="mthca.cat"\r
+                        Source="..\bin\Chk\HCA\amd64\mthca.cat" />\r
+                  <File Id="sym1" DiskId="1" Compressed="yes"\r
+                        Name="mthca.pdb"\r
+                        Source="..\bin\Chk\HCA\amd64\mthca.pdb" />\r
+\r
+                  <File Id="chk2" DiskId="1" Compressed="yes"\r
+                        Name="ibbus.sys"\r
+                        Source="..\bin\Chk\HCA\amd64\ibbus.sys" />\r
+                  <File Id="sym2" DiskId="1" Compressed="yes"\r
+                        Name="ibbus.pdb"\r
+                        Source="..\bin\Chk\HCA\amd64\ibbus.pdb" />\r
+\r
+                  <File Id="chk3" DiskId="1" Compressed="yes"\r
+                        Name="ibiou.sys"\r
+                        Source="..\bin\Chk\HCA\amd64\ibiou.sys" />\r
+                  <File Id="cat3" DiskId="1" Compressed="yes"\r
+                        Name="ib_iou.cat"\r
+                        Source="..\bin\Chk\HCA\amd64\ib_iou.cat" />\r
+                  <File Id="sym3" DiskId="1" Compressed="yes"\r
+                        Name="ibiou.pdb"\r
+                        Source="..\bin\Chk\HCA\amd64\ibiou.pdb" />\r
+\r
+                  <File Id="chk4" DiskId="1" Compressed="yes"\r
+                        Name="ipoib.sys"\r
+                        Source="..\bin\Chk\net\amd64\ipoib.sys" />\r
+                  <File Id="cat4" DiskId="1" Compressed="yes"\r
+                        Name="ipoib.cat"\r
+                        Source="..\bin\Chk\net\amd64\ipoib.cat" />\r
+                  <File Id="sym4" DiskId="1" Compressed="yes"\r
+                        Name="ipoib.pdb"\r
+                        Source="..\bin\Chk\net\amd64\ipoib.pdb" />\r
 \r
                   <File Id="chk5" DiskId="1" Compressed="yes"\r
-                    Name="qlgcvnic.sys"\r
-                    Source="..\bin\Chk\net\amd64\qlgcvnic.sys" />\r
+                        Name="qlgcvnic.sys"\r
+                        Source="..\bin\Chk\net\amd64\qlgcvnic.sys" />\r
                   <File Id="cat5" DiskId="1" Compressed="yes"\r
-                    Name="netvnic.cat"\r
-                    Source="..\bin\Chk\net\amd64\netvnic.cat" />\r
+                        Name="netvnic.cat"\r
+                        Source="..\bin\Chk\net\amd64\netvnic.cat" />\r
                   <File Id="sym5" DiskId="1" Compressed="yes"\r
-                    Name="qlgcvnic.pdb"\r
-                    Source="..\bin\Chk\net\amd64\qlgcvnic.pdb" />\r
-\r
-                  <File Id="chk6" Name="ibsrp.sys" DiskId="1" Compressed="yes"\r
-                    Source="..\bin\Chk\storage\amd64\ibsrp.sys" />\r
-                  <File Id="cat6" Name="ibsrp.cat" DiskId="1" Compressed="yes"\r
-                    Source="..\bin\Chk\storage\amd64\ibsrp.cat" />\r
-                  <File Id="sym6" Name="ibsrp.pdb" DiskId="1" Compressed="yes"\r
-                    Source="..\bin\Chk\storage\amd64\ibsrp.pdb" />\r
+                        Name="qlgcvnic.pdb"\r
+                        Source="..\bin\Chk\net\amd64\qlgcvnic.pdb" />\r
+\r
+                  <File Id="chk6" DiskId="1" Compressed="yes"\r
+                        Name="ibsrp.sys"\r
+                        Source="..\bin\Chk\storage\amd64\ibsrp.sys" />\r
+                  <File Id="cat6" DiskId="1" Compressed="yes"\r
+                        Name="ibsrp.cat"\r
+                        Source="..\bin\Chk\storage\amd64\ibsrp.cat" />\r
+                  <File Id="sym6" DiskId="1" Compressed="yes"\r
+                        Name="ibsrp.pdb"\r
+                        Source="..\bin\Chk\storage\amd64\ibsrp.pdb" />\r
 \r
                   <File Id="chk7" DiskId="1" Compressed="yes"\r
-                    Name="mlx4_bus.sys"\r
-                    Source="..\bin\Chk\HCA\amd64\mlx4_bus.sys" />\r
+                        Name="mlx4_bus.sys"\r
+                        Source="..\bin\Chk\HCA\amd64\mlx4_bus.sys" />\r
                   <File Id="cat7" DiskId="1" Compressed="yes"\r
-                    Name="mlx4_bus.cat"\r
-                    Source="..\bin\Chk\HCA\amd64\mlx4_bus.cat" />\r
+                        Name="mlx4_bus.cat"\r
+                        Source="..\bin\Chk\HCA\amd64\mlx4_bus.cat" />\r
                   <File Id="sym7" DiskId="1" Compressed="yes"\r
-                    Name="mlx4_bus.pdb"\r
-                    Source="..\bin\Chk\HCA\amd64\mlx4_bus.pdb" />\r
+                        Name="mlx4_bus.pdb"\r
+                        Source="..\bin\Chk\HCA\amd64\mlx4_bus.pdb" />\r
 \r
                   <File Id="chk8" DiskId="1" Compressed="yes"\r
-                    Name="mlx4_hca.sys"\r
-                    Source="..\bin\Chk\HCA\amd64\mlx4_hca.sys" />\r
+                        Name="mlx4_hca.sys"\r
+                        Source="..\bin\Chk\HCA\amd64\mlx4_hca.sys" />\r
                   <File Id="cat8" DiskId="1" Compressed="yes"\r
-                    Name="mlx4_hca.cat"\r
-                    Source="..\bin\Chk\HCA\amd64\mlx4_hca.cat" />\r
+                        Name="mlx4_hca.cat"\r
+                        Source="..\bin\Chk\HCA\amd64\mlx4_hca.cat" />\r
                   <File Id="sym8" DiskId="1" Compressed="yes"\r
-                    Name="mlx4_hca.pdb"\r
-                    Source="..\bin\Chk\HCA\amd64\mlx4_hca.pdb" />\r
-\r
+                        Name="mlx4_hca.pdb"\r
+                        Source="..\bin\Chk\HCA\amd64\mlx4_hca.pdb" />\r
+\r
+                  <File Id="chk9" DiskId="1" Compressed="yes"\r
+                        Name="winverbs.sys"\r
+                        Source="..\bin\Chk\HCA\amd64\winverbs.sys" />\r
+                  <File Id="sym9" DiskId="1" Compressed="yes"\r
+                        Name="winverbs.pdb"\r
+                        Source="..\bin\Chk\HCA\amd64\winverbs.pdb" />\r
+                  <File Id="dll9" DiskId="1" Compressed="yes"\r
+                        Name="winverbs.dll"\r
+                        Source="..\bin\Chk\HCA\amd64\winverbs.dll" />\r
+                  <File Id="dlld9" DiskId="1" Compressed="yes"\r
+                        Name="winverbd.dll"\r
+                        LongName="winverbsd.dll"\r
+                        Source="..\bin\Chk\HCA\amd64\winverbsd.dll" />\r
                 </Component>\r
             </Directory>\r
       \r
@@ -503,70 +549,24 @@
             </Directory>\r
           </Directory>\r
      \r
-          <Directory Id="wvDir" Name="WinVerbs">\r
-             <Component Id="cWinVerbsKernel"\r
-                       Guid="F5FA1491-E2D2-4f22-9549-07C61F86BFEB">\r
-               <CreateFolder />\r
-\r
-               <File Id="winverbs.inf" Compressed="yes" DiskId="1"\r
-                     LongName="winverbs.inf" Name="winverbs.INF"\r
-                     Source="..\bin\HCA\amd64\winverbs.inf" />\r
-               <File Id="winverbs.sys" Compressed="yes" DiskId="1"\r
-                     LongName="winverbs.sys" Name="winverbs.sys"\r
-                     Source="..\bin\HCA\amd64\winverbs.sys" />\r
-               <File Id="winverbs.cat" Compressed="yes" DiskId="1"\r
-                     LongName="winverbs.cat" Name="winverbs.cat"\r
-                     Source="..\bin\HCA\amd64\winverbs.cat" />\r
-               <File Id="winverbs.dll" Compressed="yes" DiskId="1"\r
-                     LongName="winverbs.dll" Name="winvrbs.dll"\r
-                     Source="..\bin\HCA\amd64\winverbs.dll" />\r
-               <File Id="winverbsd.dll" Compressed="yes" DiskId="1"\r
-                     LongName="winverbsd.dll" Name="winvrbsd.dll"\r
-                     Source="..\bin\HCA\amd64\winverbsd.dll" />\r
-               <File Id="wvWdfCoinstaller" Compressed="yes" DiskId="1"\r
-                     LongName="WdfCoInstaller01007.dll" Name="WCO.dll"\r
-                     Source="..\bin\hca\amd64\WdfCoInstaller01007.dll" />\r
-             </Component>\r
-\r
-             <Component Id="cWinVerbsUser"\r
-                       Guid="20916BB0-5E16-49bb-BE9F-3A202D760E72">\r
-\r
-               <File Id="winverbs.lib" Compressed="yes" DiskId="1"\r
-                     LongName="winverbs.lib" Name="winverbs.lib"\r
-                     Source="..\bin\HCA\amd64\winverbs.lib" />\r
-               <CopyFile Id="dupWverbs.lib" FileId="winverbs.lib"\r
-                     DestinationName="winverbs.lib"\r
-                     DestinationProperty="WindowsFolder" />\r
+          <Component Id="cWinVerbsOFED"\r
+                     Guid="20916BB0-5E16-49bb-BE9F-3A202D760E72">\r
 \r
-               <File Id="winverbsd.lib" Compressed="yes" DiskId="1"\r
-                     LongName="winverbsd.lib" Name="winvrbsd.lib"\r
-                     Source="..\bin\HCA\amd64\winverbsd.lib" />\r
-\r
-               <File Id="libibverbs.dll" Compressed="yes" DiskId="1"\r
-                     LongName="libibverbs.dll" Name="ibverbs.dll"\r
-                     Source="..\bin\HCA\amd64\libibverbs.dll" />\r
+            <File Id="libibverbs.dll" Compressed="yes" DiskId="1"\r
+                  LongName="libibverbs.dll" Name="ibverbs.dll"\r
+                  Source="..\bin\HCA\amd64\libibverbs.dll" />\r
                <CopyFile Id="dupLibibv.dll" FileId="libibverbs.dll"\r
                      DestinationName="ibverbs.dll"\r
                      DestinationLongName="libibverbs.dll"\r
                      DestinationProperty="WindowsFolder" />\r
-\r
-               <File Id="libibverbs.lib" Compressed="yes" DiskId="1"\r
-                     LongName="libibverbs.lib" Name="ibverbs.lib"\r
-                     Source="..\bin\HCA\amd64\libibverbs.lib" />\r
-               <CopyFile Id="dupLibibv.lib" FileId="libibverbs.lib"\r
-                     DestinationName="ibverbs.lib"\r
-                     DestinationLongName="libibverbs.lib"\r
+            <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
-\r
-               <File Id="libibverbsd.dll" Compressed="yes" DiskId="1"\r
-                     LongName="libibverbsd.dll" Name="ibverbsd.dll"\r
-                     Source="..\bin\HCA\amd64\libibverbsd.dll" />\r
-\r
-               <File Id="libibverbsd.lib" Compressed="yes" DiskId="1"\r
-                     LongName="libibverbsd.lib" Name="ibverbsd.lib"\r
-                     Source="..\bin\HCA\amd64\libibverbsd.lib" />\r
-             </Component>\r
-          </Directory>\r
+          </Component>\r
 \r
           <Component Id="cWinVerbsUApps"\r
                     Guid="ECAB2829-AE65-4ef8-8214-9A89E5BBDB9A">\r
@@ -1064,6 +1064,22 @@
               <File Id="ibal32d.pdb" Compressed="yes" DiskId="1"\r
                     LongName="ibal32d.pdb" Name="ibal32d.pdb"\r
                     Source="..\bin\HCA\amd64\ibal32d.pdb" />\r
+\r
+              <File Id="winverbs.lib" Compressed="yes" DiskId="1"\r
+                    LongName="winverbs.lib" Name="winverbs.lib"\r
+                    Source="..\bin\HCA\amd64\winverbs.lib" />\r
+\r
+              <File Id="winverbsd.lib" Compressed="yes" DiskId="1"\r
+                    LongName="winverbsd.lib" Name="winvrbsd.lib"\r
+                    Source="..\bin\HCA\amd64\winverbsd.lib" />\r
+\r
+              <File Id="libibverbs.lib" Compressed="yes" DiskId="1"\r
+                    LongName="libibverbs.lib" Name="ibverbs.lib"\r
+                    Source="..\bin\HCA\amd64\libibverbs.lib" />\r
+\r
+              <File Id="libibverbsd.lib" Compressed="yes" DiskId="1"\r
+                    LongName="libibverbsd.lib" Name="ibverbsd.lib"\r
+                    Source="..\bin\HCA\amd64\libibverbsd.lib" />\r
             </Component>\r
           </Directory>\r
 \r
@@ -1339,6 +1355,7 @@
          Display="expand" ConfigurableDirectory="INSTALLDIR"\r
          AllowAdvertise='no' InstallDefault='local' Absent='disallow'>\r
       <ComponentRef Id="cIBcore" />\r
+      <ComponentRef Id="cWinVerbsDrivers" />\r
       <ComponentRef Id="Docs" />\r
       <ComponentRef Id="Tools" />\r
       <ComponentRef Id="OpenSMservice" />\r
@@ -1347,11 +1364,10 @@
     </Feature>\r
 \r
     <Feature Id="fWV" Title="WinVerbs"\r
-        Description="OFED verbs API for Windows"\r
-        Display="expand" Level="2" ConfigurableDirectory="INSTALLDIR"\r
+        Description="OFED verbs - Libraries + utilities"\r
+        Display="expand" Level="1" ConfigurableDirectory="INSTALLDIR"\r
         AllowAdvertise="no" InstallDefault="local" Absent="allow">\r
-        <ComponentRef Id="cWinVerbsKernel" />\r
-        <ComponentRef Id="cWinVerbsUser" />\r
+        <ComponentRef Id="cWinVerbsOFED" />\r
         <ComponentRef Id="cWinVerbsUApps" />\r
     </Feature>\r
 \r

diff --git a/trunk/WinOF/WIX/wlh/x86/wof.wxs b/trunk/WinOF/WIX/wlh/x86/wof.wxs
index cf282a2f27b4be3ec1331a18bfae14d5481f6e7c..06d334cd3dae6dd1f974cb2a77eff42fe0ac77e6 100644 (file)
--- a/trunk/WinOF/WIX/wlh/x86/wof.wxs
+++ b/trunk/WinOF/WIX/wlh/x86/wof.wxs
@@ -223,6 +223,9 @@
                         <File Id="devman.exe" Compressed="yes" DiskId="1"\r
                               LongName="devman.exe" Name="devman.exe"\r
                               Source="..\..\x86\devman.exe" />\r
+                        <File Id="WdfCoinstaller" Compressed="yes" DiskId="1"\r
+                              LongName="WdfCoInstaller01007.dll" Name="WCO.dll"\r
+                              Source="..\bin\HCA\x86\WdfCoInstaller01007.dll" />\r
                         <File Id="complib.dll" Compressed="yes" DiskId="1"\r
                               LongName="complib.dll" Name="COMPLIB.DLL"\r
                               Source="..\bin\HCA\x86\complib.dll" />\r
@@ -291,9 +294,6 @@
                         <File Id="mlx4_bus.pdb" Compressed="yes" DiskId="1"\r
                               Name="mlx4_bus.pdb"\r
                               Source="..\bin\hca\x86\mlx4_bus.pdb" />\r
-                        <File Id="wdfcoinstaller" Compressed="yes" DiskId="1"\r
-                              LongName="WdfCoInstaller01007.dll" Name="WCO.dll"\r
-                              Source="..\bin\hca\x86\WdfCoInstaller01007.dll" />\r
                         <File Id="mlx4_hca.inf" Compressed="yes" DiskId="1"\r
                               LongName="mlx4_hca.inf" Name="mlx4_hca.INF"\r
                               Source="..\bin\hca\x86\mlx4_hca.inf" />\r
@@ -313,6 +313,23 @@
                               LongName="mlx4ud.dll" Name="mlx4ud.dll"\r
                               Source="..\bin\hca\x86\mlx4ud.dll" />\r
                     </Component>\r
+\r
+                    <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" Compressed="yes" DiskId="1"\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
+                    </Component>\r
                 </Directory>\r
 \r
                 <Directory Id="dir_0" Name="Checked">\r
@@ -320,73 +337,100 @@
                     <Component Id="cCHK_kernel"\r
                                Guid="D96F299E-EEAA-44a5-BBC4-A862A158BA6B">\r
                       <CreateFolder />\r
-\r
-\r
-                  <File Id="chk0" Name="README.txt" DiskId="1" Compressed="yes"\r
-                    Source="..\..\README_checked.txt" />\r
-                  <File Id="chk1" Name="mthca.sys" DiskId="1" Compressed="yes"\r
-                    Source="..\bin\Chk\HCA\x86\mthca.sys" />\r
-                  <File Id="cat1" Name="mthca.cat" DiskId="1" Compressed="yes"\r
-                    Source="..\bin\Chk\HCA\x86\mthca.cat" />\r
-                  <File Id="sym1" Name="mthca.pdb" DiskId="1" Compressed="yes"\r
-                    Source="..\bin\Chk\HCA\x86\mthca.pdb" />\r
-\r
-                  <File Id="chk2" Name="ibbus.sys" DiskId="1" Compressed="yes"\r
-                    Source="..\bin\Chk\HCA\x86\ibbus.sys" />\r
-                  <File Id="sym2" Name="ibbus.pdb" DiskId="1" Compressed="yes"\r
-                    Source="..\bin\Chk\HCA\x86\ibbus.pdb" />\r
-\r
-                  <File Id="chk3" Name="ibiou.sys" DiskId="1" Compressed="yes"\r
-                    Source="..\bin\Chk\HCA\x86\ibiou.sys" />\r
-                  <File Id="cat3" Name="ib_iou.cat" DiskId="1" Compressed="yes"\r
-                    Source="..\bin\Chk\HCA\x86\ib_iou.cat" />\r
-                  <File Id="sym3" Name="ibiou.pdb" DiskId="1" Compressed="yes"\r
-                    Source="..\bin\Chk\HCA\x86\ibiou.pdb" />\r
-\r
-                  <File Id="chk4" Name="ipoib.sys" DiskId="1" Compressed="yes"\r
-                  Source="..\bin\Chk\net\x86\ipoib.sys" />\r
-                  <File Id="cat4" Name="ipoib.cat" DiskId="1" Compressed="yes"\r
-                    Source="..\bin\Chk\net\x86\ipoib.cat" />\r
-                  <File Id="sym4" Name="ipoib.pdb" DiskId="1" Compressed="yes"\r
-                    Source="..\bin\Chk\net\x86\ipoib.pdb" />\r
-\r
-                  <File Id="chk5" DiskId="1" Compressed="yes"\r
-                    Name="qlgcvnic.sys"\r
-                    Source="..\bin\Chk\net\x86\qlgcvnic.sys" />\r
-                  <File Id="cat5" DiskId="1" Compressed="yes"\r
-                    Name="netvnic.cat"\r
-                    Source="..\bin\Chk\net\x86\netvnic.cat" />\r
-                  <File Id="sym5" DiskId="1" Compressed="yes"\r
-                    Name="qlgcvnic.pdb"\r
-                    Source="..\bin\Chk\net\x86\qlgcvnic.pdb" />\r
-\r
-                  <File Id="chk6" Name="ibsrp.sys" DiskId="1" Compressed="yes"\r
-                    Source="..\bin\Chk\storage\x86\ibsrp.sys" />\r
-                  <File Id="cat6" Name="ibsrp.cat" DiskId="1" Compressed="yes"\r
-                    Source="..\bin\Chk\storage\x86\ibsrp.cat" />\r
-                  <File Id="sym6" Name="ibsrp.pdb" DiskId="1" Compressed="yes"\r
-                    Source="..\bin\Chk\storage\x86\ibsrp.pdb" />\r
-\r
-                  <File Id="chk7" DiskId="1" Compressed="yes"\r
-                    Name="mlx4_bus.sys"\r
-                    Source="..\bin\Chk\HCA\x86\mlx4_bus.sys" />\r
-                  <File Id="cat7" DiskId="1" Compressed="yes"\r
-                    Name="mlx4_bus.cat"\r
-                    Source="..\bin\Chk\HCA\x86\mlx4_bus.cat" />\r
-                  <File Id="sym7" DiskId="1" Compressed="yes"\r
-                    Name="mlx4_bus.pdb"\r
-                    Source="..\bin\Chk\HCA\x86\mlx4_bus.pdb" />\r
-\r
-                  <File Id="chk8" DiskId="1" Compressed="yes"\r
-                    Name="mlx4_hca.sys"\r
-                    Source="..\bin\Chk\HCA\x86\mlx4_hca.sys" />\r
-                  <File Id="cat8" DiskId="1" Compressed="yes"\r
-                    Name="mlx4_hca.cat"\r
-                    Source="..\bin\Chk\HCA\x86\mlx4_hca.cat" />\r
-                  <File Id="sym8" DiskId="1" Compressed="yes"\r
-                    Name="mlx4_hca.pdb"\r
-                    Source="..\bin\Chk\HCA\x86\mlx4_hca.pdb" />\r
-\r
+     \r
+                      <File Id="chk0" DiskId="1" Compressed="yes"\r
+                            Name="README.txt"\r
+                            Source="..\..\README_checked.txt" />\r
+                      <File Id="chk1" DiskId="1" Compressed="yes"\r
+                            Name="mthca.sys"\r
+                            Source="..\bin\Chk\HCA\x86\mthca.sys" />\r
+                      <File Id="cat1" DiskId="1" Compressed="yes"\r
+                            Name="mthca.cat"\r
+                            Source="..\bin\Chk\HCA\x86\mthca.cat" />\r
+                      <File Id="sym1" DiskId="1" Compressed="yes"\r
+                            Name="mthca.pdb"\r
+                            Source="..\bin\Chk\HCA\x86\mthca.pdb" />\r
+     \r
+                      <File Id="chk2" DiskId="1" Compressed="yes"\r
+                            Name="ibbus.sys"\r
+                            Source="..\bin\Chk\HCA\x86\ibbus.sys" />\r
+                      <File Id="sym2" DiskId="1" Compressed="yes"\r
+                            Name="ibbus.pdb"\r
+                            Source="..\bin\Chk\HCA\x86\ibbus.pdb" />\r
+     \r
+                      <File Id="chk3" DiskId="1" Compressed="yes"\r
+                            Name="ibiou.sys"\r
+                            Source="..\bin\Chk\HCA\x86\ibiou.sys" />\r
+                      <File Id="cat3" DiskId="1" Compressed="yes"\r
+                            Name="ib_iou.cat"\r
+                            Source="..\bin\Chk\HCA\x86\ib_iou.cat" />\r
+                      <File Id="sym3" DiskId="1" Compressed="yes"\r
+                            Name="ibiou.pdb"\r
+                            Source="..\bin\Chk\HCA\x86\ibiou.pdb" />\r
+     \r
+                      <File Id="chk4" DiskId="1" Compressed="yes"\r
+                            Name="ipoib.sys"\r
+                          Source="..\bin\Chk\net\x86\ipoib.sys" />\r
+                      <File Id="cat4" DiskId="1" Compressed="yes"\r
+                            Name="ipoib.cat"\r
+                            Source="..\bin\Chk\net\x86\ipoib.cat" />\r
+                      <File Id="sym4" DiskId="1" Compressed="yes"\r
+                            Name="ipoib.pdb"\r
+                            Source="..\bin\Chk\net\x86\ipoib.pdb" />\r
+     \r
+                      <File Id="chk5" DiskId="1" Compressed="yes"\r
+                            Name="qlgcvnic.sys"\r
+                            Source="..\bin\Chk\net\x86\qlgcvnic.sys" />\r
+                      <File Id="cat5" DiskId="1" Compressed="yes"\r
+                            Name="netvnic.cat"\r
+                            Source="..\bin\Chk\net\x86\netvnic.cat" />\r
+                      <File Id="sym5" DiskId="1" Compressed="yes"\r
+                            Name="qlgcvnic.pdb"\r
+                            Source="..\bin\Chk\net\x86\qlgcvnic.pdb" />\r
+     \r
+                      <File Id="chk6" DiskId="1" Compressed="yes"\r
+                            Name="ibsrp.sys"\r
+                            Source="..\bin\Chk\storage\x86\ibsrp.sys" />\r
+                      <File Id="cat6" DiskId="1" Compressed="yes"\r
+                            Name="ibsrp.cat"\r
+                            Source="..\bin\Chk\storage\x86\ibsrp.cat" />\r
+                      <File Id="sym6" DiskId="1" Compressed="yes"\r
+                            Name="ibsrp.pdb"\r
+                            Source="..\bin\Chk\storage\x86\ibsrp.pdb" />\r
+     \r
+                      <File Id="chk7" DiskId="1" Compressed="yes"\r
+                            Name="mlx4_bus.sys"\r
+                            Source="..\bin\Chk\HCA\x86\mlx4_bus.sys" />\r
+                       <File Id="cat7" DiskId="1" Compressed="yes"\r
+                            Name="mlx4_bus.cat"\r
+                            Source="..\bin\Chk\HCA\x86\mlx4_bus.cat" />\r
+                      <File Id="sym7" DiskId="1" Compressed="yes"\r
+                            Name="mlx4_bus.pdb"\r
+                            Source="..\bin\Chk\HCA\x86\mlx4_bus.pdb" />\r
+     \r
+                      <File Id="chk8" DiskId="1" Compressed="yes"\r
+                            Name="mlx4_hca.sys"\r
+                            Source="..\bin\Chk\HCA\x86\mlx4_hca.sys" />\r
+                      <File Id="cat8" DiskId="1" Compressed="yes"\r
+                            Name="mlx4_hca.cat"\r
+                             Source="..\bin\Chk\HCA\x86\mlx4_hca.cat" />\r
+                      <File Id="sym8" DiskId="1" Compressed="yes"\r
+                            Name="mlx4_hca.pdb"\r
+                            Source="..\bin\Chk\HCA\x86\mlx4_hca.pdb" />\r
+\r
+                      <File Id="chk9" DiskId="1" Compressed="yes"\r
+                            Name="winverbs.sys"\r
+                            Source="..\bin\Chk\HCA\x86\winverbs.sys" />\r
+                      <File Id="sym9" DiskId="1" Compressed="yes"\r
+                            Name="winverbs.pdb"\r
+                            Source="..\bin\Chk\HCA\x86\winverbs.pdb" />\r
+                      <File Id="dll9" DiskId="1" Compressed="yes"\r
+                            Name="winverbs.dll"\r
+                            Source="..\bin\Chk\HCA\x86\winverbs.dll" />\r
+                      <File Id="dlld9" DiskId="1" Compressed="yes"\r
+                            Name="winverbd.dll"\r
+                            LongName="winverbsd.dll"\r
+                            Source="..\bin\Chk\HCA\x86\winverbsd.dll" />\r
                     </Component>\r
                   </Directory>\r
             \r
@@ -457,70 +501,25 @@
                   </Directory>\r
                 </Directory>\r
 \r
-                <Directory Id="wvDir" Name="WinVerbs">\r
-                   <Component Id="cWinVerbsKernel"\r
-                             Guid="F5FA1491-E2D2-4f22-9549-07C61F86BFEB">\r
-                     <CreateFolder />\r
-\r
-                     <File Id="winverbs.inf" Compressed="yes" DiskId="1"\r
-                           LongName="winverbs.inf" Name="winverbs.INF"\r
-                           Source="..\bin\HCA\x86\winverbs.inf" />\r
-                     <File Id="winverbs.sys" Compressed="yes" DiskId="1"\r
-                           LongName="winverbs.sys" Name="winverbs.sys"\r
-                           Source="..\bin\HCA\x86\winverbs.sys" />\r
-                     <File Id="winverbs.cat" Compressed="yes" DiskId="1"\r
-                           LongName="winverbs.cat" Name="winverbs.cat"\r
-                           Source="..\bin\HCA\x86\winverbs.cat" />\r
-                     <File Id="winverbs.dll" Compressed="yes" DiskId="1"\r
-                           LongName="winverbs.dll" Name="winvrbs.dll"\r
-                           Source="..\bin\HCA\x86\winverbs.dll" />\r
-                     <File Id="winverbsd.dll" Compressed="yes" DiskId="1"\r
-                           LongName="winverbsd.dll" Name="winvrbsd.dll"\r
-                           Source="..\bin\HCA\x86\winverbsd.dll" />\r
-                     <File Id="wvWdfCoinstaller" Compressed="yes" DiskId="1"\r
-                           LongName="WdfCoInstaller01007.dll" Name="WCO.dll"\r
-                           Source="..\bin\HCA\x86\WdfCoInstaller01007.dll" />\r
-                   </Component>\r
-\r
-                   <Component Id="cWinVerbsUser"\r
-                             Guid="20916BB0-5E16-49bb-BE9F-3A202D760E72">\r
-\r
-                     <File Id="winverbs.lib" Compressed="yes" DiskId="1"\r
-                           LongName="winverbs.lib" Name="winverbs.lib"\r
-                           Source="..\bin\HCA\x86\winverbs.lib" />\r
-                     <CopyFile Id="dupWverbs.lib" FileId="winverbs.lib"\r
-                           DestinationName="winverbs.lib"\r
-                           DestinationProperty="WindowsFolder" />\r
-\r
-                     <File Id="winverbsd.lib" Compressed="yes" DiskId="1"\r
-                           LongName="winverbsd.lib" Name="winvrbsd.lib"\r
-                           Source="..\bin\HCA\x86\winverbsd.lib" />\r
+                <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\x86\libibverbs.dll" />\r
+                  <File Id="libibverbs.dll" Compressed="yes" DiskId="1"\r
+                        LongName="libibverbs.dll" Name="ibverbs.dll"\r
+                        Source="..\bin\HCA\x86\libibverbs.dll" />\r
                      <CopyFile Id="dupLibibv.dll" FileId="libibverbs.dll"\r
                            DestinationName="ibverbs.dll"\r
                            DestinationLongName="libibverbs.dll"\r
                            DestinationProperty="WindowsFolder" />\r
 \r
-                     <File Id="libibverbs.lib" Compressed="yes" DiskId="1"\r
-                           LongName="libibverbs.lib" Name="ibverbs.lib"\r
-                           Source="..\bin\HCA\x86\libibverbs.lib" />\r
-                     <CopyFile Id="dupLibibv.lib" FileId="libibverbs.lib"\r
-                           DestinationName="ibverbs.lib"\r
-                           DestinationLongName="libibverbs.lib"\r
+                  <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
+                           DestinationName="ibverbsd.dll"\r
+                           DestinationLongName="libibverbsd.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\x86\libibverbsd.dll" />\r
-\r
-                     <File Id="libibverbsd.lib" Compressed="yes" DiskId="1"\r
-                           LongName="libibverbsd.lib" Name="ibverbsd.lib"\r
-                           Source="..\bin\HCA\x86\libibverbsd.lib" />\r
-                   </Component>\r
-                </Directory>\r
+                </Component>\r
 \r
                 <Component Id="cWinVerbsUApps"\r
                           Guid="ECAB2829-AE65-4ef8-8214-9A89E5BBDB9A">\r
@@ -962,6 +961,22 @@
               <File Id="complibd.pdb" Compressed="yes" DiskId="1"\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
              </Component>\r
            </Directory>\r
 \r
@@ -1233,6 +1248,7 @@
         ConfigurableDirectory="INSTALLDIR" AllowAdvertise="no"\r
         InstallDefault="local" Absent="disallow">\r
         <ComponentRef Id="cIBcore" />\r
+        <ComponentRef Id="cWinVerbsDrivers" />\r
         <ComponentRef Id="Docs" />\r
         <ComponentRef Id="Tools" />\r
         <ComponentRef Id="OpenSMservice" />\r
@@ -1241,11 +1257,10 @@
     </Feature>\r
 \r
     <Feature Id="fWV" Title="WinVerbs"\r
-        Description="OFED verbs API for Windows"\r
-        Display="expand" Level="2" ConfigurableDirectory="INSTALLDIR"\r
+        Description="OFED verbs - Libraries + utilities"\r
+        Display="expand" Level="1" ConfigurableDirectory="INSTALLDIR"\r
         AllowAdvertise="no" InstallDefault="local" Absent="allow">\r
-        <ComponentRef Id="cWinVerbsKernel" />\r
-        <ComponentRef Id="cWinVerbsUser" />\r
+        <ComponentRef Id="cWinVerbsOFED" />\r
         <ComponentRef Id="cWinVerbsUApps" />\r
     </Feature>\r
 \r

diff --git a/trunk/WinOF/WIX/wnet/ia64/wof.wxs b/trunk/WinOF/WIX/wnet/ia64/wof.wxs
index cbc41c4df1d55139307a3cd69aafb5b2e6361583..816ed583e38e66b65e40ed889e7839ff99180527 100644 (file)
--- a/trunk/WinOF/WIX/wnet/ia64/wof.wxs
+++ b/trunk/WinOF/WIX/wnet/ia64/wof.wxs
@@ -228,6 +228,9 @@
               <File Id="devman.exe" Compressed="yes" DiskId="1"\r
                      LongName="devman.exe" Name="devman.exe"\r
                      Source="..\..\ia64\devman.exe" />\r
+              <File Id="wdfcoinstaller" Compressed="yes" DiskId="1"\r
+                     LongName="WdfCoInstaller01007.dll" Name="WCO.dll"\r
+                     Source="..\bin\hca\ia64\WdfCoInstaller01007.dll" />\r
               <File Id="cl32.dll" Compressed="yes" DiskId="1"\r
                      LongName="cl32.dll" Name="CL32.DLL"\r
                      Source="..\bin\HCA\ia64\cl32.dll" />\r
@@ -310,7 +313,6 @@
                      Source="..\bin\HCA\ia64\mthcaud.dll" />\r
             </Component>\r
 \r
-<!-- Remove when ConnectX works on ia64\r
             <Component Id="cConnectXDriver"\r
                        Guid="C1EFF4D6-CE55-432a-9D92-E46AB983D9E3">\r
               <File Id="mlx4_bus.inf" Compressed="yes" DiskId="1"\r
@@ -322,15 +324,9 @@
               <File Id="mlx4_bus.sys" Compressed="yes" DiskId="1"\r
                      LongName="mlx4_bus.sys" Name="mlx4_bus.sys"\r
                      Source="..\bin\hca\ia64\mlx4_bus.sys" />\r
-              <File Id="mlx4_bus.pdb" Compressed="yes" DiskId="1"\r
-                     LongName="mlx4_bus.pdb"\r
-                     Source="..\bin\hca\ia64\mlx4_bus.pdb" />\r
               <File Id="mlx4_bus.pdb" Compressed="yes" DiskId="1"\r
                      LongName="mlx4_bus.pdb" Name="mlx4_bus.pdb"\r
                      Source="..\bin\hca\ia64\mlx4_bus.pdb" />\r
-              <File Id="wdfcoinstaller" Compressed="yes" DiskId="1"\r
-                     LongName="WdfCoInstaller01007.dll" Name="WCO.dll"\r
-                     Source="..\bin\hca\ia64\WdfCoInstaller01007.dll" />\r
               <File Id="mlx4_hca.inf" Compressed="yes" DiskId="1"\r
                      LongName="mlx4_hca.inf" Name="mlx4_hca.INF"\r
                      Source="..\bin\hca\ia64\mlx4_hca.inf" />\r
@@ -350,7 +346,7 @@
                      LongName="mlx4ud.dll" Name="mlx4ud.dll"\r
                      Source="..\bin\hca\ia64\mlx4ud.dll" />\r
 \r
-                         <!++ copy 32-bit binaries for 32b in ia64 ++> \r
+                         <!-- copy 32-bit binaries --> \r
               <File Id="mlx4u32d.dll" Compressed="yes" DiskId="1"\r
                      LongName="mlx4u32d.dll" Name="mlx4u32.dll"\r
                      Source="..\bin\hca\ia64\mlx4u32d.dll" />\r
@@ -358,8 +354,23 @@
                      LongName="mlx4u32.dll" Name="mlx4u32.dll"\r
                      Source="..\bin\hca\ia64\mlx4u32.dll" />\r
             </Component>\r
-End Remove -->\r
 \r
+            <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\ia64\winverbs.sys" />\r
+              <File Id="winverbs.pdb" Compressed="yes" DiskId="1"\r
+                    LongName="winverbs.pdb" Name="winverbs.pdb"\r
+                    Source="..\bin\HCA\ia64\winverbs.pdb" />\r
+              <File Id="winverbs.dll" Compressed="yes" DiskId="1"\r
+                    LongName="winverbs.dll" Name="winvrbs.dll"\r
+                    Source="..\bin\HCA\ia64\winverbs.dll" />\r
+              <File Id="winverbsd.dll" Compressed="yes" DiskId="1"\r
+                    LongName="winverbsd.dll" Name="winvrbsd.dll"\r
+                    Source="..\bin\HCA\ia64\winverbsd.dll" />\r
+             </Component>\r
           </Directory>\r
 \r
           <Directory Id="dir_0" Name="Checked">\r
@@ -369,70 +380,84 @@ End Remove -->
                 <CreateFolder />\r
 \r
                 <File Id="chk0" Name="README.txt" DiskId="1" Compressed="yes"\r
-                  Source="..\..\README_checked.txt" />\r
+                      Source="..\..\README_checked.txt" />\r
                 <File Id="chk1" Name="mthca.sys" DiskId="1" Compressed="yes"\r
-                  Source="..\bin\Chk\HCA\ia64\mthca.sys" />\r
+                      Source="..\bin\Chk\HCA\ia64\mthca.sys" />\r
                 <File Id="cat1" Name="mthca.cat" DiskId="1" Compressed="yes"\r
-                  Source="..\bin\Chk\HCA\ia64\mthca.cat" />\r
+                      Source="..\bin\Chk\HCA\ia64\mthca.cat" />\r
                 <File Id="sym1" Name="mthca.pdb" DiskId="1" Compressed="yes"\r
-                  Source="..\bin\Chk\HCA\ia64\mthca.pdb" />\r
+                      Source="..\bin\Chk\HCA\ia64\mthca.pdb" />\r
 \r
                 <File Id="chk2" Name="ibbus.sys" DiskId="1" Compressed="yes"\r
-                  Source="..\bin\Chk\HCA\ia64\ibbus.sys" />\r
+                      Source="..\bin\Chk\HCA\ia64\ibbus.sys" />\r
                 <File Id="sym2" Name="ibbus.pdb" DiskId="1" Compressed="yes"\r
-                  Source="..\bin\Chk\HCA\ia64\ibbus.pdb" />\r
+                      Source="..\bin\Chk\HCA\ia64\ibbus.pdb" />\r
 \r
                 <File Id="chk3" Name="ibiou.sys" DiskId="1" Compressed="yes"\r
-                  Source="..\bin\Chk\HCA\ia64\ibiou.sys" />\r
+                      Source="..\bin\Chk\HCA\ia64\ibiou.sys" />\r
                 <File Id="cat3" Name="ib_iou.cat" DiskId="1" Compressed="yes"\r
-                  Source="..\bin\Chk\HCA\ia64\ib_iou.cat" />\r
+                      Source="..\bin\Chk\HCA\ia64\ib_iou.cat" />\r
                 <File Id="sym3" Name="ibiou.pdb" DiskId="1" Compressed="yes"\r
-                  Source="..\bin\Chk\HCA\ia64\ibiou.pdb" />\r
-\r
-                  <File Id="chk4" Name="ipoib.sys" DiskId="1" Compressed="yes"\r
-                  Source="..\bin\Chk\net\ia64\ipoib.sys" />\r
-                  <File Id="cat4" Name="ipoib.cat" DiskId="1" Compressed="yes"\r
-                    Source="..\bin\Chk\net\ia64\ipoib.cat" />\r
-                  <File Id="sym4" Name="ipoib.pdb" DiskId="1" Compressed="yes"\r
-                    Source="..\bin\Chk\net\ia64\ipoib.pdb" />\r
-\r
-                  <File Id="chk5" DiskId="1" Compressed="yes"\r
-                    Name="qlgcvnic.sys"\r
-                    Source="..\bin\Chk\net\ia64\qlgcvnic.sys" />\r
-                  <File Id="cat5" DiskId="1" Compressed="yes"\r
-                    Name="netvnic.cat"\r
-                    Source="..\bin\Chk\net\ia64\netvnic.cat" />\r
-                  <File Id="sym5" DiskId="1" Compressed="yes"\r
-                    Name="qlgcvnic.pdb"\r
-                    Source="..\bin\Chk\net\ia64\qlgcvnic.pdb" />\r
-\r
-                  <File Id="chk6" Name="ibsrp.sys" DiskId="1" Compressed="yes"\r
-                    Source="..\bin\Chk\storage\ia64\ibsrp.sys" />\r
-                  <File Id="cat6" Name="ibsrp.cat" DiskId="1" Compressed="yes"\r
-                    Source="..\bin\Chk\storage\ia64\ibsrp.cat" />\r
-                  <File Id="sym6" Name="ibsrp.pdb" DiskId="1" Compressed="yes"\r
-                    Source="..\bin\Chk\storage\ia64\ibsrp.pdb" />\r
+                      Source="..\bin\Chk\HCA\ia64\ibiou.pdb" />\r
+\r
+                <File Id="chk4" Name="ipoib.sys" DiskId="1" Compressed="yes"\r
+                      Source="..\bin\Chk\net\ia64\ipoib.sys" />\r
+                <File Id="cat4" Name="ipoib.cat" DiskId="1" Compressed="yes"\r
+                      Source="..\bin\Chk\net\ia64\ipoib.cat" />\r
+                <File Id="sym4" Name="ipoib.pdb" DiskId="1" Compressed="yes"\r
+                      Source="..\bin\Chk\net\ia64\ipoib.pdb" />\r
+\r
+                <File Id="chk5" DiskId="1" Compressed="yes"\r
+                      Name="qlgcvnic.sys"\r
+                      Source="..\bin\Chk\net\ia64\qlgcvnic.sys" />\r
+                <File Id="cat5" DiskId="1" Compressed="yes"\r
+                      Name="netvnic.cat"\r
+                      Source="..\bin\Chk\net\ia64\netvnic.cat" />\r
+                <File Id="sym5" DiskId="1" Compressed="yes"\r
+                      Name="qlgcvnic.pdb"\r
+                      Source="..\bin\Chk\net\ia64\qlgcvnic.pdb" />\r
+\r
+                <File Id="chk6" Name="ibsrp.sys" DiskId="1" Compressed="yes"\r
+                      Source="..\bin\Chk\storage\ia64\ibsrp.sys" />\r
+                <File Id="cat6" Name="ibsrp.cat" DiskId="1" Compressed="yes"\r
+                      Source="..\bin\Chk\storage\ia64\ibsrp.cat" />\r
+                <File Id="sym6" Name="ibsrp.pdb" DiskId="1" Compressed="yes"\r
+                      Source="..\bin\Chk\storage\ia64\ibsrp.pdb" />\r
 <!-- when ConnectX works on ia64\r
-                  <File Id="chk7" DiskId="1" Compressed="yes"\r
-                    Name="mlx4_bus.sys"\r
-                    Source="..\bin\Chk\HCA\ia64\mlx4_bus.sys" />\r
-                  <File Id="cat7" DiskId="1" Compressed="yes"\r
-                    Name="mlx4_bus.cat"\r
-                    Source="..\bin\Chk\HCA\ia64\mlx4_bus.cat" />\r
-                  <File Id="sym7" DiskId="1" Compressed="yes"\r
-                    Name="mlx4_bus.pdb"\r
-                    Source="..\bin\Chk\HCA\ia64\mlx4_bus.pdb" />\r
-\r
-                  <File Id="chk8" DiskId="1" Compressed="yes"\r
-                    Name="mlx4_hca.sys"\r
-                    Source="..\bin\Chk\HCA\ia64\mlx4_hca.sys" />\r
-                  <File Id="cat8" DiskId="1" Compressed="yes"\r
-                    Name="mlx4_hca.cat"\r
-                    Source="..\bin\Chk\HCA\ia64\mlx4_hca.cat" />\r
-                  <File Id="sym8" DiskId="1" Compressed="yes"\r
-                    Name="mlx4_hca.pdb"\r
-                    Source="..\bin\Chk\HCA\ia64\mlx4_hca.pdb" />\r
+                <File Id="chk7" DiskId="1" Compressed="yes"\r
+                      Name="mlx4_bus.sys"\r
+                      Source="..\bin\Chk\HCA\ia64\mlx4_bus.sys" />\r
+                <File Id="cat7" DiskId="1" Compressed="yes"\r
+                      Name="mlx4_bus.cat"\r
+                      Source="..\bin\Chk\HCA\ia64\mlx4_bus.cat" />\r
+                <File Id="sym7" DiskId="1" Compressed="yes"\r
+                      Name="mlx4_bus.pdb"\r
+                      Source="..\bin\Chk\HCA\ia64\mlx4_bus.pdb" />\r
+\r
+                <File Id="chk8" DiskId="1" Compressed="yes"\r
+                      Name="mlx4_hca.sys"\r
+                      Source="..\bin\Chk\HCA\ia64\mlx4_hca.sys" />\r
+                <File Id="cat8" DiskId="1" Compressed="yes"\r
+                      Name="mlx4_hca.cat"\r
+                      Source="..\bin\Chk\HCA\ia64\mlx4_hca.cat" />\r
+                <File Id="sym8" DiskId="1" Compressed="yes"\r
+                      Name="mlx4_hca.pdb"\r
+                      Source="..\bin\Chk\HCA\ia64\mlx4_hca.pdb" />\r
 End ConnectX remove -->\r
+\r
+                <File Id="chk9" DiskId="1" Compressed="yes"\r
+                      Name="winverbs.sys"\r
+                      Source="..\bin\Chk\HCA\ia64\winverbs.sys" />\r
+                <File Id="sym9" DiskId="1" Compressed="yes"\r
+                      Name="winverbs.pdb"\r
+                      Source="..\bin\Chk\HCA\ia64\winverbs.pdb" />\r
+                <File Id="dll9" DiskId="1" Compressed="yes"\r
+                      Name="winverbs.dll"\r
+                      Source="..\bin\Chk\HCA\ia64\winverbs.dll" />\r
+                <File Id="dlld9" DiskId="1" Compressed="yes"\r
+                      Name="winverbd.dll"\r
+                      LongName="winverbsd.dll"\r
+                      Source="..\bin\Chk\HCA\ia64\winverbsd.dll" />\r
               </Component>\r
             </Directory>\r
       \r
@@ -484,70 +509,24 @@ End ConnectX remove -->
             </Directory>\r
           </Directory>\r
 \r
-          <Directory Id="wvDir" Name="WinVerbs">\r
-             <Component Id="cWinVerbsKernel"\r
-                       Guid="F5FA1491-E2D2-4f22-9549-07C61F86BFEB">\r
-               <CreateFolder />\r
-\r
-               <File Id="winverbs.inf" Compressed="yes" DiskId="1"\r
-                     LongName="winverbs.inf" Name="winverbs.INF"\r
-                     Source="..\bin\HCA\ia64\winverbs.inf" />\r
-               <File Id="winverbs.sys" Compressed="yes" DiskId="1"\r
-                     LongName="winverbs.sys" Name="winverbs.sys"\r
-                     Source="..\bin\HCA\ia64\winverbs.sys" />\r
-               <File Id="winverbs.cat" Compressed="yes" DiskId="1"\r
-                     LongName="winverbs.cat" Name="winverbs.cat"\r
-                     Source="..\bin\HCA\ia64\winverbs.cat" />\r
-               <File Id="winverbs.dll" Compressed="yes" DiskId="1"\r
-                     LongName="winverbs.dll" Name="winvrbs.dll"\r
-                     Source="..\bin\HCA\ia64\winverbs.dll" />\r
-               <File Id="winverbsd.dll" Compressed="yes" DiskId="1"\r
-                     LongName="winverbsd.dll" Name="winvrbsd.dll"\r
-                     Source="..\bin\HCA\ia64\winverbsd.dll" />\r
-               <File Id="wvWdfCoinstaller" Compressed="yes" DiskId="1"\r
-                     LongName="WdfCoInstaller01007.dll" Name="WCO.dll"\r
-                     Source="..\bin\HCA\ia64\WdfCoInstaller01007.dll" />\r
-             </Component>\r
-\r
-             <Component Id="cWinVerbsUser"\r
+          <Component Id="cWinVerbsOFED"\r
                        Guid="20916BB0-5E16-49bb-BE9F-3A202D760E72">\r
 \r
-               <File Id="winverbs.lib" Compressed="yes" DiskId="1"\r
-                     LongName="winverbs.lib" Name="winverbs.lib"\r
-                     Source="..\bin\HCA\ia64\winverbs.lib" />\r
-               <CopyFile Id="dupWverbs.lib" FileId="winverbs.lib"\r
-                     DestinationName="winverbs.lib"\r
-                     DestinationProperty="WindowsFolder" />\r
-\r
-               <File Id="winverbsd.lib" Compressed="yes" DiskId="1"\r
-                     LongName="winverbsd.lib" Name="winvrbsd.lib"\r
-                     Source="..\bin\HCA\ia64\winverbsd.lib" />\r
-\r
-               <File Id="libibverbs.dll" Compressed="yes" DiskId="1"\r
-                     LongName="libibverbs.dll" Name="ibverbs.dll"\r
-                     Source="..\bin\HCA\ia64\libibverbs.dll" />\r
-               <CopyFile Id="dupLibibv.dll" FileId="libibverbs.dll"\r
-                     DestinationName="ibverbs.dll"\r
-                     DestinationLongName="libibverbs.dll"\r
-                     DestinationProperty="WindowsFolder" />\r
-\r
-               <File Id="libibverbs.lib" Compressed="yes" DiskId="1"\r
-                     LongName="libibverbs.lib" Name="ibverbs.lib"\r
-                     Source="..\bin\HCA\ia64\libibverbs.lib" />\r
-               <CopyFile Id="dupLibibv.lib" FileId="libibverbs.lib"\r
-                     DestinationName="ibverbs.lib"\r
-                     DestinationLongName="libibverbs.lib"\r
-                     DestinationProperty="WindowsFolder" />\r
-\r
-               <File Id="libibverbsd.dll" Compressed="yes" DiskId="1"\r
-                     LongName="libibverbsd.dll" Name="ibverbsd.dll"\r
-                     Source="..\bin\HCA\ia64\libibverbsd.dll" />\r
-\r
-               <File Id="libibverbsd.lib" Compressed="yes" DiskId="1"\r
-                     LongName="libibverbsd.lib" Name="ibverbsd.lib"\r
-                     Source="..\bin\HCA\ia64\libibverbsd.lib" />\r
-             </Component>\r
-          </Directory>\r
+            <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
+            <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
+          </Component>\r
 \r
           <Component Id="cWinVerbsUApps"\r
                     Guid="ECAB2829-AE65-4ef8-8214-9A89E5BBDB9A">\r
@@ -1044,6 +1023,22 @@ End ConnectX remove -->
               <File Id="ibal32d.pdb" Compressed="yes" DiskId="1"\r
                     LongName="ibal32d.pdb" Name="ibal32d.pdb"\r
                     Source="..\bin\HCA\ia64\ibal32d.pdb" />\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
+              <File Id="winverbsd.lib" Compressed="yes" DiskId="1"\r
+                    LongName="winverbsd.lib" Name="winvrbsd.lib"\r
+                    Source="..\bin\HCA\ia64\winverbsd.lib" />\r
+\r
+              <File Id="libibverbs.lib" Compressed="yes" DiskId="1"\r
+                    LongName="libibverbs.lib" Name="ibverbs.lib"\r
+                    Source="..\bin\HCA\ia64\libibverbs.lib" />\r
+\r
+              <File Id="libibverbsd.lib" Compressed="yes" DiskId="1"\r
+                    LongName="libibverbsd.lib" Name="ibverbsd.lib"\r
+                    Source="..\bin\HCA\ia64\libibverbsd.lib" />\r
               </Component>\r
             </Directory>\r
 \r
@@ -1313,14 +1308,12 @@ End ConnectX remove -->
         <ComponentRef Id="cMthcaDriver" />\r
       </Feature>\r
 \r
-<!-- remove until ConnectX works on ia64\r
       <Feature Id="hca_connectX" Title="ConnectX" Level="5"\r
            Description="ConnectX only - mlx4"\r
            Display="expand" ConfigurableDirectory="INSTALLDIR"\r
            AllowAdvertise='no' InstallDefault='local' Absent='allow'>\r
         <ComponentRef Id="cConnectXDriver" />\r
       </Feature>\r
-End Remove -->\r
     </Feature>\r
 \r
     <Feature Id="IBcore" Title="InfiniBand Core" Level="1"\r
@@ -1328,6 +1321,7 @@ End Remove -->
          Display="expand" ConfigurableDirectory="INSTALLDIR"\r
          AllowAdvertise='no' InstallDefault='local' Absent='disallow'>\r
       <ComponentRef Id="cIBcore" />\r
+      <ComponentRef Id="cWinVerbsDrivers" />\r
       <ComponentRef Id="Docs" />\r
       <ComponentRef Id="Tools" />\r
       <ComponentRef Id="OpenSMservice" />\r
@@ -1336,11 +1330,10 @@ End Remove -->
     </Feature>\r
 \r
     <Feature Id="fWV" Title="WinVerbs"\r
-        Description="OFED verbs API for Windows"\r
-        Display="expand" Level="2" ConfigurableDirectory="INSTALLDIR"\r
+        Description="OFED verbs - Libraries + utilities"\r
+        Display="expand" Level="1" ConfigurableDirectory="INSTALLDIR"\r
         AllowAdvertise="no" InstallDefault="local" Absent="allow">\r
-        <ComponentRef Id="cWinVerbsKernel" />\r
-        <ComponentRef Id="cWinVerbsUser" />\r
+        <ComponentRef Id="cWinVerbsOFED" />\r
         <ComponentRef Id="cWinVerbsUApps" />\r
     </Feature>\r
 \r

diff --git a/trunk/WinOF/WIX/wnet/x64/wof.wxs b/trunk/WinOF/WIX/wnet/x64/wof.wxs
index 93a0006ad9d38ded9e439f43c0224d5fbdcde88a..c764a22d99d33b9888ef0c3816ec9426f356bea0 100644 (file)
--- a/trunk/WinOF/WIX/wnet/x64/wof.wxs
+++ b/trunk/WinOF/WIX/wnet/x64/wof.wxs
@@ -229,6 +229,9 @@
               <File Id="devman.exe" Compressed="yes" DiskId="1"\r
                      LongName="devman.exe" Name="devman.exe"\r
                      Source="..\..\x64\devman.exe" />\r
+              <File Id="wdfcoinstaller" Compressed="yes" DiskId="1"\r
+                     LongName="WdfCoInstaller01007.dll" Name="WCO.dll"\r
+                     Source="..\bin\hca\amd64\WdfCoInstaller01007.dll" />\r
               <File Id="cl32.dll" Compressed="yes" DiskId="1"\r
                      LongName="cl32.dll" Name="CL32.DLL"\r
                      Source="..\bin\HCA\amd64\cl32.dll" />\r
@@ -327,9 +330,6 @@
               <File Id="mlx4_bus.pdb" Compressed="yes" DiskId="1"\r
                      Name="mlx4_bus.pdb"\r
                      Source="..\bin\hca\amd64\mlx4_bus.pdb" />\r
-              <File Id="wdfcoinstaller" Compressed="yes" DiskId="1"\r
-                     LongName="WdfCoInstaller01007.dll" Name="WCO.dll"\r
-                     Source="..\bin\hca\amd64\WdfCoInstaller01007.dll" />\r
               <File Id="mlx4_hca.inf" Compressed="yes" DiskId="1"\r
                      LongName="mlx4_hca.inf" Name="mlx4_hca.INF"\r
                      Source="..\bin\hca\amd64\mlx4_hca.inf" />\r
@@ -357,6 +357,23 @@
                      LongName="mlx4u32.dll" Name="mlx4u32.dll"\r
                      Source="..\bin\hca\amd64\mlx4u32.dll" />\r
             </Component>\r
+\r
+            <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\amd64\winverbs.sys" />\r
+               <File Id="winverbs.pdb" Compressed="yes" DiskId="1"\r
+                     LongName="winverbs.pdb" Name="winverbs.pdb"\r
+                     Source="..\bin\HCA\amd64\winverbs.pdb" />\r
+               <File Id="winverbs.dll" Compressed="yes" DiskId="1"\r
+                     LongName="winverbs.dll" Name="winvrbs.dll"\r
+                     Source="..\bin\HCA\amd64\winverbs.dll" />\r
+               <File Id="winverbsd.dll" Compressed="yes" DiskId="1"\r
+                     LongName="winverbsd.dll" Name="winvrbsd.dll"\r
+                     Source="..\bin\HCA\amd64\winverbsd.dll" />\r
+             </Component>\r
           </Directory>\r
 \r
           <Directory Id="dir_0" Name="Checked">\r
@@ -366,69 +383,83 @@
                   <CreateFolder />\r
 \r
                   <File Id="chk0" Name="README.txt" DiskId="1" Compressed="yes"\r
-                    Source="..\..\README_checked.txt" />\r
+                        Source="..\..\README_checked.txt" />\r
                   <File Id="chk1" Name="mthca.sys" DiskId="1" Compressed="yes"\r
-                    Source="..\bin\Chk\HCA\amd64\mthca.sys" />\r
+                        Source="..\bin\Chk\HCA\amd64\mthca.sys" />\r
                   <File Id="cat1" Name="mthca.cat" DiskId="1" Compressed="yes"\r
-                    Source="..\bin\Chk\HCA\amd64\mthca.cat" />\r
+                        Source="..\bin\Chk\HCA\amd64\mthca.cat" />\r
                   <File Id="sym1" Name="mthca.pdb" DiskId="1" Compressed="yes"\r
-                    Source="..\bin\Chk\HCA\amd64\mthca.pdb" />\r
+                        Source="..\bin\Chk\HCA\amd64\mthca.pdb" />\r
 \r
                   <File Id="chk2" Name="ibbus.sys" DiskId="1" Compressed="yes"\r
-                    Source="..\bin\Chk\HCA\amd64\ibbus.sys" />\r
+                        Source="..\bin\Chk\HCA\amd64\ibbus.sys" />\r
                   <File Id="sym2" Name="ibbus.pdb" DiskId="1" Compressed="yes"\r
-                    Source="..\bin\Chk\HCA\amd64\ibbus.pdb" />\r
+                        Source="..\bin\Chk\HCA\amd64\ibbus.pdb" />\r
 \r
                   <File Id="chk3" Name="ibiou.sys" DiskId="1" Compressed="yes"\r
-                    Source="..\bin\Chk\HCA\amd64\ibiou.sys" />\r
+                        Source="..\bin\Chk\HCA\amd64\ibiou.sys" />\r
                   <File Id="cat3" Name="ib_iou.cat" DiskId="1" Compressed="yes"\r
-                    Source="..\bin\Chk\HCA\amd64\ib_iou.cat" />\r
+                        Source="..\bin\Chk\HCA\amd64\ib_iou.cat" />\r
                   <File Id="sym3" Name="ibiou.pdb" DiskId="1" Compressed="yes"\r
-                    Source="..\bin\Chk\HCA\amd64\ibiou.pdb" />\r
+                        Source="..\bin\Chk\HCA\amd64\ibiou.pdb" />\r
 \r
                   <File Id="chk4" Name="ipoib.sys" DiskId="1" Compressed="yes"\r
-                  Source="..\bin\Chk\net\amd64\ipoib.sys" />\r
+                      Source="..\bin\Chk\net\amd64\ipoib.sys" />\r
                   <File Id="cat4" Name="ipoib.cat" DiskId="1" Compressed="yes"\r
-                    Source="..\bin\Chk\net\amd64\ipoib.cat" />\r
+                        Source="..\bin\Chk\net\amd64\ipoib.cat" />\r
                   <File Id="sym4" Name="ipoib.pdb" DiskId="1" Compressed="yes"\r
-                    Source="..\bin\Chk\net\amd64\ipoib.pdb" />\r
+                        Source="..\bin\Chk\net\amd64\ipoib.pdb" />\r
 \r
                   <File Id="chk5" DiskId="1" Compressed="yes"\r
-                    Name="qlgcvnic.sys"\r
-                    Source="..\bin\Chk\net\amd64\qlgcvnic.sys" />\r
+                        Name="qlgcvnic.sys"\r
+                        Source="..\bin\Chk\net\amd64\qlgcvnic.sys" />\r
                   <File Id="cat5" DiskId="1" Compressed="yes"\r
-                    Name="netvnic.cat"\r
-                    Source="..\bin\Chk\net\amd64\netvnic.cat" />\r
+                        Name="netvnic.cat"\r
+                        Source="..\bin\Chk\net\amd64\netvnic.cat" />\r
                   <File Id="sym5" DiskId="1" Compressed="yes"\r
-                    Name="qlgcvnic.pdb"\r
-                    Source="..\bin\Chk\net\amd64\qlgcvnic.pdb" />\r
+                        Name="qlgcvnic.pdb"\r
+                        Source="..\bin\Chk\net\amd64\qlgcvnic.pdb" />\r
 \r
                   <File Id="chk6" Name="ibsrp.sys" DiskId="1" Compressed="yes"\r
-                    Source="..\bin\Chk\storage\amd64\ibsrp.sys" />\r
+                        Source="..\bin\Chk\storage\amd64\ibsrp.sys" />\r
                   <File Id="cat6" Name="ibsrp.cat" DiskId="1" Compressed="yes"\r
-                    Source="..\bin\Chk\storage\amd64\ibsrp.cat" />\r
+                        Source="..\bin\Chk\storage\amd64\ibsrp.cat" />\r
                   <File Id="sym6" Name="ibsrp.pdb" DiskId="1" Compressed="yes"\r
-                    Source="..\bin\Chk\storage\amd64\ibsrp.pdb" />\r
+                        Source="..\bin\Chk\storage\amd64\ibsrp.pdb" />\r
 \r
                   <File Id="chk7" DiskId="1" Compressed="yes"\r
-                    Name="mlx4_bus.sys"\r
-                    Source="..\bin\Chk\HCA\amd64\mlx4_bus.sys" />\r
+                        Name="mlx4_bus.sys"\r
+                        Source="..\bin\Chk\HCA\amd64\mlx4_bus.sys" />\r
                   <File Id="cat7" DiskId="1" Compressed="yes"\r
-                    Name="mlx4_bus.cat"\r
-                    Source="..\bin\Chk\HCA\amd64\mlx4_bus.cat" />\r
+                        Name="mlx4_bus.cat"\r
+                        Source="..\bin\Chk\HCA\amd64\mlx4_bus.cat" />\r
                   <File Id="sym7" DiskId="1" Compressed="yes"\r
-                    Name="mlx4_bus.pdb"\r
-                    Source="..\bin\Chk\HCA\amd64\mlx4_bus.pdb" />\r
+                        Name="mlx4_bus.pdb"\r
+                        Source="..\bin\Chk\HCA\amd64\mlx4_bus.pdb" />\r
 \r
                   <File Id="chk8" DiskId="1" Compressed="yes"\r
-                    Name="mlx4_hca.sys"\r
-                    Source="..\bin\Chk\HCA\amd64\mlx4_hca.sys" />\r
+                        Name="mlx4_hca.sys"\r
+                        Source="..\bin\Chk\HCA\amd64\mlx4_hca.sys" />\r
                   <File Id="cat8" DiskId="1" Compressed="yes"\r
-                    Name="mlx4_hca.cat"\r
-                    Source="..\bin\Chk\HCA\amd64\mlx4_hca.cat" />\r
+                        Name="mlx4_hca.cat"\r
+                        Source="..\bin\Chk\HCA\amd64\mlx4_hca.cat" />\r
                   <File Id="sym8" DiskId="1" Compressed="yes"\r
-                    Name="mlx4_hca.pdb"\r
-                    Source="..\bin\Chk\HCA\amd64\mlx4_hca.pdb" />\r
+                        Name="mlx4_hca.pdb"\r
+                        Source="..\bin\Chk\HCA\amd64\mlx4_hca.pdb" />\r
+\r
+                  <File Id="chk9" DiskId="1" Compressed="yes"\r
+                        Name="winverbs.sys"\r
+                        Source="..\bin\Chk\HCA\amd64\winverbs.sys" />\r
+                  <File Id="sym9" DiskId="1" Compressed="yes"\r
+                        Name="winverbs.pdb"\r
+                        Source="..\bin\Chk\HCA\amd64\winverbs.pdb" />\r
+                  <File Id="dll9" DiskId="1" Compressed="yes"\r
+                        Name="winverbs.dll"\r
+                        Source="..\bin\Chk\HCA\amd64\winverbs.dll" />\r
+                  <File Id="dlld9" DiskId="1" Compressed="yes"\r
+                        Name="winverbd.dll"\r
+                        LongName="winverbsd.dll"\r
+                        Source="..\bin\Chk\HCA\amd64\winverbsd.dll" />\r
 \r
                 </Component>\r
             </Directory>\r
@@ -503,70 +534,25 @@
             </Directory>\r
           </Directory>\r
      \r
-          <Directory Id="wvDir" Name="WinVerbs">\r
-             <Component Id="cWinVerbsKernel"\r
-                       Guid="F5FA1491-E2D2-4f22-9549-07C61F86BFEB">\r
-               <CreateFolder />\r
-\r
-               <File Id="winverbs.inf" Compressed="yes" DiskId="1"\r
-                     LongName="winverbs.inf" Name="winverbs.INF"\r
-                     Source="..\bin\HCA\amd64\winverbs.inf" />\r
-               <File Id="winverbs.sys" Compressed="yes" DiskId="1"\r
-                     LongName="winverbs.sys" Name="winverbs.sys"\r
-                     Source="..\bin\HCA\amd64\winverbs.sys" />\r
-               <File Id="winverbs.cat" Compressed="yes" DiskId="1"\r
-                     LongName="winverbs.cat" Name="winverbs.cat"\r
-                     Source="..\bin\HCA\amd64\winverbs.cat" />\r
-               <File Id="winverbs.dll" Compressed="yes" DiskId="1"\r
-                     LongName="winverbs.dll" Name="winvrbs.dll"\r
-                     Source="..\bin\HCA\amd64\winverbs.dll" />\r
-               <File Id="winverbsd.dll" Compressed="yes" DiskId="1"\r
-                     LongName="winverbsd.dll" Name="winvrbsd.dll"\r
-                     Source="..\bin\HCA\amd64\winverbsd.dll" />\r
-               <File Id="wvWdfCoinstaller" Compressed="yes" DiskId="1"\r
-                     LongName="WdfCoInstaller01007.dll" Name="WCO.dll"\r
-                     Source="..\bin\hca\amd64\WdfCoInstaller01007.dll" />\r
-             </Component>\r
-\r
-             <Component Id="cWinVerbsUser"\r
+          <Component Id="cWinVerbsOFED"\r
                        Guid="20916BB0-5E16-49bb-BE9F-3A202D760E72">\r
 \r
-               <File Id="winverbs.lib" Compressed="yes" DiskId="1"\r
-                     LongName="winverbs.lib" Name="winverbs.lib"\r
-                     Source="..\bin\HCA\amd64\winverbs.lib" />\r
-               <CopyFile Id="dupWverbs.lib" FileId="winverbs.lib"\r
-                     DestinationName="winverbs.lib"\r
-                     DestinationProperty="WindowsFolder" />\r
-\r
-               <File Id="winverbsd.lib" Compressed="yes" DiskId="1"\r
-                     LongName="winverbsd.lib" Name="winvrbsd.lib"\r
-                     Source="..\bin\HCA\amd64\winverbsd.lib" />\r
-\r
-               <File Id="libibverbs.dll" Compressed="yes" DiskId="1"\r
-                     LongName="libibverbs.dll" Name="ibverbs.dll"\r
-                     Source="..\bin\HCA\amd64\libibverbs.dll" />\r
+             <File Id="libibverbs.dll" Compressed="yes" DiskId="1"\r
+                   LongName="libibverbs.dll" Name="ibverbs.dll"\r
+                   Source="..\bin\HCA\amd64\libibverbs.dll" />\r
                <CopyFile Id="dupLibibv.dll" FileId="libibverbs.dll"\r
-                     DestinationName="ibverbs.dll"\r
-                     DestinationLongName="libibverbs.dll"\r
-                     DestinationProperty="WindowsFolder" />\r
-\r
-               <File Id="libibverbs.lib" Compressed="yes" DiskId="1"\r
-                     LongName="libibverbs.lib" Name="ibverbs.lib"\r
-                     Source="..\bin\HCA\amd64\libibverbs.lib" />\r
-               <CopyFile Id="dupLibibv.lib" FileId="libibverbs.lib"\r
-                     DestinationName="ibverbs.lib"\r
-                     DestinationLongName="libibverbs.lib"\r
-                     DestinationProperty="WindowsFolder" />\r
-\r
-               <File Id="libibverbsd.dll" Compressed="yes" DiskId="1"\r
-                     LongName="libibverbsd.dll" Name="ibverbsd.dll"\r
-                     Source="..\bin\HCA\amd64\libibverbsd.dll" />\r
-\r
-               <File Id="libibverbsd.lib" Compressed="yes" DiskId="1"\r
-                     LongName="libibverbsd.lib" Name="ibverbsd.lib"\r
-                     Source="..\bin\HCA\amd64\libibverbsd.lib" />\r
-             </Component>\r
-          </Directory>\r
+                      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
+          </Component>\r
 \r
           <Component Id="cWinVerbsUApps"\r
                     Guid="ECAB2829-AE65-4ef8-8214-9A89E5BBDB9A">\r
@@ -1064,6 +1050,22 @@
               <File Id="ibal32d.pdb" Compressed="yes" DiskId="1"\r
                     LongName="ibal32d.pdb" Name="ibal32d.pdb"\r
                     Source="..\bin\HCA\amd64\ibal32d.pdb" />\r
+\r
+              <File Id="winverbs.lib" Compressed="yes" DiskId="1"\r
+                    LongName="winverbs.lib" Name="winverbs.lib"\r
+                    Source="..\bin\HCA\amd64\winverbs.lib" />\r
+\r
+              <File Id="winverbsd.lib" Compressed="yes" DiskId="1"\r
+                    LongName="winverbsd.lib" Name="winvrbsd.lib"\r
+                    Source="..\bin\HCA\amd64\winverbsd.lib" />\r
+\r
+              <File Id="libibverbs.lib" Compressed="yes" DiskId="1"\r
+                    LongName="libibverbs.lib" Name="ibverbs.lib"\r
+                    Source="..\bin\HCA\amd64\libibverbs.lib" />\r
+\r
+              <File Id="libibverbsd.lib" Compressed="yes" DiskId="1"\r
+                    LongName="libibverbsd.lib" Name="ibverbsd.lib"\r
+                    Source="..\bin\HCA\amd64\libibverbsd.lib" />\r
             </Component>\r
           </Directory>\r
 \r
@@ -1352,6 +1354,7 @@
          Display="expand" ConfigurableDirectory="INSTALLDIR"\r
          AllowAdvertise='no' InstallDefault='local' Absent='disallow'>\r
       <ComponentRef Id="cIBcore" />\r
+      <ComponentRef Id="cWinVerbsDrivers" />\r
       <ComponentRef Id="Docs" />\r
       <ComponentRef Id="Tools" />\r
       <ComponentRef Id="OpenSMservice" />\r
@@ -1360,11 +1363,10 @@
     </Feature>\r
 \r
     <Feature Id="fWV" Title="WinVerbs"\r
-        Description="OFED verbs API for Windows"\r
-        Display="expand" Level="2" ConfigurableDirectory="INSTALLDIR"\r
+        Description="OFED verbs - Libraries + utilities"\r
+        Display="expand" Level="1" ConfigurableDirectory="INSTALLDIR"\r
         AllowAdvertise="no" InstallDefault="local" Absent="allow">\r
-        <ComponentRef Id="cWinVerbsKernel" />\r
-        <ComponentRef Id="cWinVerbsUser" />\r
+        <ComponentRef Id="cWinVerbsOFED" />\r
         <ComponentRef Id="cWinVerbsUApps" />\r
     </Feature>\r
 \r

diff --git a/trunk/WinOF/WIX/wnet/x86/wof.wxs b/trunk/WinOF/WIX/wnet/x86/wof.wxs
index 19a0e40e13babe92ff8d3ed980ede51b92e63aec..93b2f43532b2f132dd9b560bd987c06113454bac 100644 (file)
--- a/trunk/WinOF/WIX/wnet/x86/wof.wxs
+++ b/trunk/WinOF/WIX/wnet/x86/wof.wxs
@@ -223,6 +223,10 @@
                         <File Id="devman.exe" Compressed="yes" DiskId="1"\r
                               LongName="devman.exe" Name="devman.exe"\r
                               Source="..\..\x86\devman.exe" />\r
+                        <File Id="wdfcoinstaller" Compressed="yes" DiskId="1"\r
+                              LongName="WdfCoInstaller01007.dll"\r
+                              Name="WCO.dll"\r
+                              Source="..\bin\HCA\x86\WdfCoInstaller01007.dll" />\r
                         <File Id="complib.dll" Compressed="yes" DiskId="1"\r
                               LongName="complib.dll" Name="COMPLIB.DLL"\r
                               Source="..\bin\HCA\x86\complib.dll" />\r
@@ -291,10 +295,6 @@
                         <File Id="mlx4_bus.pdb" Compressed="yes" DiskId="1"\r
                               Name="mlx4_bus.pdb"\r
                               Source="..\bin\hca\x86\mlx4_bus.pdb" />\r
-                        <File Id="wdfcoinstaller" Compressed="yes" DiskId="1"\r
-                              LongName="WdfCoInstaller01007.dll"\r
-                              Name="WCO.dll"\r
-                              Source="..\bin\hca\x86\WdfCoInstaller01007.dll" />\r
                         <File Id="mlx4_hca.inf" Compressed="yes" DiskId="1"\r
                               LongName="mlx4_hca.inf" Name="mlx4_hca.INF"\r
                               Source="..\bin\hca\x86\mlx4_hca.inf" />\r
@@ -314,6 +314,25 @@
                               LongName="mlx4ud.dll" Name="mlx4ud.dll"\r
                               Source="..\bin\hca\x86\mlx4ud.dll" />\r
                     </Component>\r
+\r
+                    <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
+                   </Component>\r
+\r
+\r
                 </Directory>\r
 \r
                 <Directory Id="dir_0" Name="Checked">\r
@@ -322,75 +341,101 @@
                                Guid="D96F299E-EEAA-44a5-BBC4-A862A158BA6B">\r
                       <CreateFolder />\r
 \r
-\r
-                  <File Id="chk0" Name="README.txt" DiskId="1" Compressed="yes"\r
-                    Source="..\..\README_checked.txt" />\r
-                  <File Id="chk1" Name="mthca.sys" DiskId="1" Compressed="yes"\r
-                    Source="..\bin\Chk\HCA\x86\mthca.sys" />\r
-                  <File Id="cat1" Name="mthca.cat" DiskId="1" Compressed="yes"\r
-                    Source="..\bin\Chk\HCA\x86\mthca.cat" />\r
-                  <File Id="sym1" Name="mthca.pdb" DiskId="1" Compressed="yes"\r
-                    Source="..\bin\Chk\HCA\x86\mthca.pdb" />\r
-\r
-                  <File Id="chk2" Name="ibbus.sys" DiskId="1" Compressed="yes"\r
-                    Source="..\bin\Chk\HCA\x86\ibbus.sys" />\r
-                  <File Id="sym2" Name="ibbus.pdb" DiskId="1" Compressed="yes"\r
-                    Source="..\bin\Chk\HCA\x86\ibbus.pdb" />\r
-\r
-                  <File Id="chk3" Name="ibiou.sys" DiskId="1" Compressed="yes"\r
-                    Source="..\bin\Chk\HCA\x86\ibiou.sys" />\r
-                  <File Id="cat3" Name="ib_iou.cat" DiskId="1" Compressed="yes"\r
-                    Source="..\bin\Chk\HCA\x86\ib_iou.cat" />\r
-                  <File Id="sym3" Name="ibiou.pdb" DiskId="1" Compressed="yes"\r
-                    Source="..\bin\Chk\HCA\x86\ibiou.pdb" />\r
-\r
-                  <File Id="chk4" Name="ipoib.sys" DiskId="1" Compressed="yes"\r
-                  Source="..\bin\Chk\net\x86\ipoib.sys" />\r
-                  <File Id="cat4" Name="ipoib.cat" DiskId="1" Compressed="yes"\r
-                    Source="..\bin\Chk\net\x86\ipoib.cat" />\r
-                  <File Id="sym4" Name="ipoib.pdb" DiskId="1" Compressed="yes"\r
-                    Source="..\bin\Chk\net\x86\ipoib.pdb" />\r
-\r
-                  <File Id="chk5" DiskId="1" Compressed="yes"\r
-                    Name="qlgcvnic.sys"\r
-                    Source="..\bin\Chk\net\x86\qlgcvnic.sys" />\r
-                  <File Id="cat5" DiskId="1" Compressed="yes"\r
-                    Name="netvnic.cat"\r
-                    Source="..\bin\Chk\net\x86\netvnic.cat" />\r
-                  <File Id="sym5" DiskId="1" Compressed="yes"\r
-                    Name="qlgcvnic.pdb"\r
-                    Source="..\bin\Chk\net\x86\qlgcvnic.pdb" />\r
-\r
-                  <File Id="chk6" Name="ibsrp.sys" DiskId="1" Compressed="yes"\r
-                    Source="..\bin\Chk\storage\x86\ibsrp.sys" />\r
-                  <File Id="cat6" Name="ibsrp.cat" DiskId="1" Compressed="yes"\r
-                    Source="..\bin\Chk\storage\x86\ibsrp.cat" />\r
-                  <File Id="sym6" Name="ibsrp.pdb" DiskId="1" Compressed="yes"\r
-                    Source="..\bin\Chk\storage\x86\ibsrp.pdb" />\r
-\r
-                  <File Id="chk7" DiskId="1" Compressed="yes"\r
-                    Name="mlx4_bus.sys"\r
-                    Source="..\bin\Chk\HCA\x86\mlx4_bus.sys" />\r
-                  <File Id="cat7" DiskId="1" Compressed="yes"\r
-                    Name="mlx4_bus.cat"\r
-                    Source="..\bin\Chk\HCA\x86\mlx4_bus.cat" />\r
-                  <File Id="sym7" DiskId="1" Compressed="yes"\r
-                    Name="mlx4_bus.pdb"\r
-                    Source="..\bin\Chk\HCA\x86\mlx4_bus.pdb" />\r
-\r
-                  <File Id="chk8" DiskId="1" Compressed="yes"\r
-                    Name="mlx4_hca.sys"\r
-                    Source="..\bin\Chk\HCA\x86\mlx4_hca.sys" />\r
-                  <File Id="cat8" DiskId="1" Compressed="yes"\r
-                    Name="mlx4_hca.cat"\r
-                    Source="..\bin\Chk\HCA\x86\mlx4_hca.cat" />\r
-                  <File Id="sym8" DiskId="1" Compressed="yes"\r
-                    Name="mlx4_hca.pdb"\r
-                    Source="..\bin\Chk\HCA\x86\mlx4_hca.pdb" />\r
-\r
+                          <File Id="chk0" DiskId="1" Compressed="yes"\r
+                            Name="README.txt"\r
+                            Source="..\..\README_checked.txt" />\r
+                      <File Id="chk1" DiskId="1" Compressed="yes"\r
+                            Name="mthca.sys"\r
+                            Source="..\bin\Chk\HCA\x86\mthca.sys" />\r
+                      <File Id="cat1" DiskId="1" Compressed="yes"\r
+                            Name="mthca.cat"\r
+                            Source="..\bin\Chk\HCA\x86\mthca.cat" />\r
+                      <File Id="sym1" DiskId="1" Compressed="yes"\r
+                            Name="mthca.pdb"\r
+                            Source="..\bin\Chk\HCA\x86\mthca.pdb" />\r
+\r
+                      <File Id="chk2" DiskId="1" Compressed="yes"\r
+                            Name="ibbus.sys"\r
+                            Source="..\bin\Chk\HCA\x86\ibbus.sys" />\r
+                      <File Id="sym2" DiskId="1" Compressed="yes"\r
+                            Name="ibbus.pdb"\r
+                            Source="..\bin\Chk\HCA\x86\ibbus.pdb" />\r
+                      <File Id="chk3" DiskId="1" Compressed="yes"\r
+                            Name="ibiou.sys"\r
+                            Source="..\bin\Chk\HCA\x86\ibiou.sys" />\r
+                      <File Id="cat3" DiskId="1" Compressed="yes"\r
+                            Name="ib_iou.cat"\r
+                            Source="..\bin\Chk\HCA\x86\ib_iou.cat" />\r
+                      <File Id="sym3" DiskId="1" Compressed="yes"\r
+                            Name="ibiou.pdb"\r
+                            Source="..\bin\Chk\HCA\x86\ibiou.pdb" />\r
+\r
+                      <File Id="chk4" DiskId="1" Compressed="yes"\r
+                            Name="ipoib.sys"\r
+                          Source="..\bin\Chk\net\x86\ipoib.sys" />\r
+                      <File Id="cat4" DiskId="1" Compressed="yes"\r
+                            Name="ipoib.cat"\r
+                            Source="..\bin\Chk\net\x86\ipoib.cat" />\r
+                      <File Id="sym4" DiskId="1" Compressed="yes"\r
+                            Name="ipoib.pdb"\r
+                            Source="..\bin\Chk\net\x86\ipoib.pdb" />\r
+\r
+                      <File Id="chk5" DiskId="1" Compressed="yes"\r
+                            Name="qlgcvnic.sys"\r
+                            Source="..\bin\Chk\net\x86\qlgcvnic.sys" />\r
+                      <File Id="cat5" DiskId="1" Compressed="yes"\r
+                            Name="netvnic.cat"\r
+                            Source="..\bin\Chk\net\x86\netvnic.cat" />\r
+                      <File Id="sym5" DiskId="1" Compressed="yes"\r
+                            Name="qlgcvnic.pdb"\r
+                            Source="..\bin\Chk\net\x86\qlgcvnic.pdb" />\r
+\r
+                      <File Id="chk6" DiskId="1" Compressed="yes"\r
+                            Name="ibsrp.sys"\r
+                            Source="..\bin\Chk\storage\x86\ibsrp.sys" />\r
+                      <File Id="cat6" DiskId="1" Compressed="yes"\r
+                            Name="ibsrp.cat"\r
+                            Source="..\bin\Chk\storage\x86\ibsrp.cat" />\r
+                      <File Id="sym6" DiskId="1" Compressed="yes"\r
+                            Name="ibsrp.pdb"\r
+                            Source="..\bin\Chk\storage\x86\ibsrp.pdb" />\r
+\r
+                      <File Id="chk7" DiskId="1" Compressed="yes"\r
+                            Name="mlx4_bus.sys"\r
+                            Source="..\bin\Chk\HCA\x86\mlx4_bus.sys" />\r
+                      <File Id="cat7" DiskId="1" Compressed="yes"\r
+                            Name="mlx4_bus.cat"\r
+                            Source="..\bin\Chk\HCA\x86\mlx4_bus.cat" />\r
+                      <File Id="sym7" DiskId="1" Compressed="yes"\r
+                            Name="mlx4_bus.pdb"\r
+                            Source="..\bin\Chk\HCA\x86\mlx4_bus.pdb" />\r
+\r
+                      <File Id="chk8" DiskId="1" Compressed="yes"\r
+                            Name="mlx4_hca.sys"\r
+                            Source="..\bin\Chk\HCA\x86\mlx4_hca.sys" />\r
+                      <File Id="cat8" DiskId="1" Compressed="yes"\r
+                            Name="mlx4_hca.cat"\r
+                            Source="..\bin\Chk\HCA\x86\mlx4_hca.cat" />\r
+                      <File Id="sym8" DiskId="1" Compressed="yes"\r
+                            Name="mlx4_hca.pdb"\r
+                            Source="..\bin\Chk\HCA\x86\mlx4_hca.pdb" />\r
+\r
+                      <File Id="chk9" DiskId="1" Compressed="yes"\r
+                            Name="winverbs.sys"\r
+                            Source="..\bin\Chk\HCA\x86\winverbs.sys" />\r
+                      <File Id="sym9" DiskId="1" Compressed="yes"\r
+                            Name="winverbs.pdb"\r
+                            Source="..\bin\Chk\HCA\x86\winverbs.pdb" />\r
+                      <File Id="dll9" DiskId="1" Compressed="yes"\r
+                            Name="winverbs.dll"\r
+                            Source="..\bin\Chk\HCA\x86\winverbs.dll" />\r
+                      <File Id="dlld9" DiskId="1" Compressed="yes"\r
+                            Name="winverbd.dll"\r
+                            LongName="winverbsd.dll"\r
+                            Source="..\bin\Chk\HCA\x86\winverbsd.dll" />\r
                     </Component>\r
                   </Directory>\r
-            \r
+\r
                   <Directory Id="dir_14" Name="user">\r
                     <Component Id="cCHK_user"\r
                                Guid="A4AC788B-6517-47b2-A898-0493ADC794D5">\r
@@ -458,70 +503,26 @@
                   </Directory>\r
                 </Directory>\r
 \r
-                <Directory Id="wvDir" Name="WinVerbs">\r
-                   <Component Id="cWinVerbsKernel"\r
-                             Guid="F5FA1491-E2D2-4f22-9549-07C61F86BFEB">\r
-                     <CreateFolder />\r
-\r
-                     <File Id="winverbs.inf" Compressed="yes" DiskId="1"\r
-                           LongName="winverbs.inf" Name="winverbs.INF"\r
-                           Source="..\bin\HCA\x86\winverbs.inf" />\r
-                     <File Id="winverbs.sys" Compressed="yes" DiskId="1"\r
-                           LongName="winverbs.sys" Name="winverbs.sys"\r
-                           Source="..\bin\HCA\x86\winverbs.sys" />\r
-                     <File Id="winverbs.cat" Compressed="yes" DiskId="1"\r
-                           LongName="winverbs.cat" Name="winverbs.cat"\r
-                           Source="..\bin\HCA\x86\winverbs.cat" />\r
-                     <File Id="winverbs.dll" Compressed="yes" DiskId="1"\r
-                           LongName="winverbs.dll" Name="winvrbs.dll"\r
-                           Source="..\bin\HCA\x86\winverbs.dll" />\r
-                     <File Id="winverbsd.dll" Compressed="yes" DiskId="1"\r
-                           LongName="winverbsd.dll" Name="winvrbsd.dll"\r
-                           Source="..\bin\HCA\x86\winverbsd.dll" />\r
-                     <File Id="wvWdfCoinstaller" Compressed="yes" DiskId="1"\r
-                           LongName="WdfCoInstaller01007.dll" Name="WCO.dll"\r
-                           Source="..\bin\HCA\x86\WdfCoInstaller01007.dll" />\r
-                   </Component>\r
+                <Component Id="cWinVerbsOFED"\r
+                           Guid="20916BB0-5E16-49bb-BE9F-3A202D760E72">\r
 \r
-                   <Component Id="cWinVerbsUser"\r
-                             Guid="20916BB0-5E16-49bb-BE9F-3A202D760E72">\r
-\r
-                     <File Id="winverbs.lib" Compressed="yes" DiskId="1"\r
-                           LongName="winverbs.lib" Name="winverbs.lib"\r
-                           Source="..\bin\HCA\x86\winverbs.lib" />\r
-                     <CopyFile Id="dupWverbs.lib" FileId="winverbs.lib"\r
-                           DestinationName="winverbs.lib"\r
-                           DestinationProperty="WindowsFolder" />\r
-\r
-                     <File Id="winverbsd.lib" Compressed="yes" DiskId="1"\r
-                           LongName="winverbsd.lib" Name="winvrbsd.lib"\r
-                           Source="..\bin\HCA\x86\winverbsd.lib" />\r
-\r
-                     <File Id="libibverbs.dll" Compressed="yes" DiskId="1"\r
-                           LongName="libibverbs.dll" Name="ibverbs.dll"\r
-                           Source="..\bin\HCA\x86\libibverbs.dll" />\r
-                     <CopyFile Id="dupLibibv.dll" FileId="libibverbs.dll"\r
+                  <File Id="libibverbs.dll" Compressed="yes" DiskId="1"\r
+                        LongName="libibverbs.dll" Name="ibverbs.dll"\r
+                        Source="..\bin\HCA\x86\libibverbs.dll" />\r
+                    <CopyFile Id="dupLibibv.dll" FileId="libibverbs.dll"\r
                            DestinationName="ibverbs.dll"\r
                            DestinationLongName="libibverbs.dll"\r
                            DestinationProperty="WindowsFolder" />\r
 \r
-                     <File Id="libibverbs.lib" Compressed="yes" DiskId="1"\r
-                           LongName="libibverbs.lib" Name="ibverbs.lib"\r
-                           Source="..\bin\HCA\x86\libibverbs.lib" />\r
-                     <CopyFile Id="dupLibibv.lib" FileId="libibverbs.lib"\r
-                           DestinationName="ibverbs.lib"\r
-                           DestinationLongName="libibverbs.lib"\r
+                  <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
+                           DestinationName="ibverbsd.dll"\r
+                           DestinationLongName="libibverbsd.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\x86\libibverbsd.dll" />\r
-\r
-                     <File Id="libibverbsd.lib" Compressed="yes" DiskId="1"\r
-                           LongName="libibverbsd.lib" Name="ibverbsd.lib"\r
-                           Source="..\bin\HCA\x86\libibverbsd.lib" />\r
-                   </Component>\r
-                </Directory>\r
+                </Component>\r
 \r
                 <Component Id="cWinVerbsUApps"\r
                           Guid="ECAB2829-AE65-4ef8-8214-9A89E5BBDB9A">\r
@@ -951,18 +952,40 @@
                <File Id="complib.pdb" Compressed="yes" DiskId="1"\r
                      LongName="complib.pdb" Name="complib.pdb"\r
                      Source="..\bin\HCA\x86\complib.pdb" />\r
-              <File Id="ibald.lib" Compressed="yes" DiskId="1"\r
-                    LongName="ibald.lib" Name="ibald.lib"\r
-                    Source="..\bin\HCA\x86\ibald.lib" />\r
-              <File Id="ibald.pdb" Compressed="yes" DiskId="1"\r
-                    LongName="ibald.pdb" Name="ibald.pdb"\r
-                    Source="..\bin\HCA\x86\ibald.pdb" />\r
-              <File Id="complibd.lib" Compressed="yes" DiskId="1"\r
-                    LongName="complibd.lib" Name="complibd.lib"\r
-                    Source="..\bin\HCA\x86\complibd.lib" />\r
-              <File Id="complibd.pdb" Compressed="yes" DiskId="1"\r
-                    LongName="complibd.pdb" Name="complibd.pdb"\r
-                    Source="..\bin\HCA\x86\complibd.pdb" />\r
+               <File Id="ibald.lib" Compressed="yes" DiskId="1"\r
+                     LongName="ibald.lib" Name="ibald.lib"\r
+                     Source="..\bin\HCA\x86\ibald.lib" />\r
+               <File Id="ibald.pdb" Compressed="yes" DiskId="1"\r
+                     LongName="ibald.pdb" Name="ibald.pdb"\r
+                     Source="..\bin\HCA\x86\ibald.pdb" />\r
+               <File Id="complibd.lib" Compressed="yes" DiskId="1"\r
+                     LongName="complibd.lib" Name="complibd.lib"\r
+                     Source="..\bin\HCA\x86\complibd.lib" />\r
+               <File Id="complibd.pdb" Compressed="yes" DiskId="1"\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
+               <File Id="libibverbs.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
+                     LongName="libibverbsd.pdb" Name="ibverbsd.pdb"\r
+                     Source="..\bin\HCA\x86\libibverbsd.pdb" />\r
+\r
              </Component>\r
            </Directory>\r
 \r
@@ -1246,6 +1269,7 @@
         ConfigurableDirectory="INSTALLDIR" AllowAdvertise="no"\r
         InstallDefault="local" Absent="disallow">\r
         <ComponentRef Id="cIBcore" />\r
+        <ComponentRef Id="cWinVerbsDrivers" />\r
         <ComponentRef Id="Docs" />\r
         <ComponentRef Id="Tools" />\r
         <ComponentRef Id="OpenSMservice" />\r
@@ -1254,11 +1278,10 @@
     </Feature>\r
 \r
     <Feature Id="fWV" Title="WinVerbs"\r
-        Description="OFED verbs API for Windows"\r
-        Display="expand" Level="2" ConfigurableDirectory="INSTALLDIR"\r
+        Description="OFED verbs - Libraries + utilities"\r
+        Display="expand" Level="1" ConfigurableDirectory="INSTALLDIR"\r
         AllowAdvertise="no" InstallDefault="local" Absent="allow">\r
-        <ComponentRef Id="cWinVerbsKernel" />\r
-        <ComponentRef Id="cWinVerbsUser" />\r
+        <ComponentRef Id="cWinVerbsOFED" />\r
         <ComponentRef Id="cWinVerbsUApps" />\r
     </Feature>\r
 \r

diff --git a/trunk/WinOF/WIX/wxp/x86/wof.wxs b/trunk/WinOF/WIX/wxp/x86/wof.wxs
index 1a1fc85b759cd946dcbf2a5e75195052ddea6cd9..77415a1db2ddd7941ff1cdf81e1bb3f07ea79c50 100644 (file)
--- a/trunk/WinOF/WIX/wxp/x86/wof.wxs
+++ b/trunk/WinOF/WIX/wxp/x86/wof.wxs
@@ -223,6 +223,10 @@
                         <File Id="devman.exe" Compressed="yes" DiskId="1"\r
                               LongName="devman.exe" Name="devman.exe"\r
                               Source="..\..\x86\devman.exe" />\r
+                        <File Id="wdfcoinstaller" Compressed="yes" DiskId="1"\r
+                              LongName="WdfCoInstaller01007.dll"\r
+                              Name="WDFCOIN.dll"\r
+                              Source="..\bin\hca\x86\WdfCoInstaller01007.dll" />\r
                         <File Id="complib.dll" Compressed="yes" DiskId="1"\r
                               LongName="complib.dll" Name="COMPLIB.DLL"\r
                               Source="..\bin\HCA\x86\complib.dll" />\r
@@ -291,10 +295,6 @@
                         <File Id="mlx4_bus.pdb" Compressed="yes" DiskId="1"\r
                               Name="mlx4_bus.pdb"\r
                               Source="..\bin\hca\x86\mlx4_bus.pdb" />\r
-                        <File Id="wdfcoinstaller" Compressed="yes" DiskId="1"\r
-                              LongName="WdfCoInstaller01007.dll"\r
-                              Name="WCO.dll"\r
-                              Source="..\bin\hca\x86\WdfCoInstaller01007.dll" />\r
                         <File Id="mlx4_hca.inf" Compressed="yes" DiskId="1"\r
                               LongName="mlx4_hca.inf" Name="mlx4_hca.INF"\r
                               Source="..\bin\hca\x86\mlx4_hca.inf" />\r
@@ -314,6 +314,23 @@
                               LongName="mlx4ud.dll" Name="mlx4ud.dll"\r
                               Source="..\bin\hca\x86\mlx4ud.dll" />\r
                     </Component>\r
+\r
+                    <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" Compressed="yes" DiskId="1"\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
+                    </Component>\r
                 </Directory>\r
 \r
                 <Directory Id="dir_0" Name="Checked">\r
@@ -321,73 +338,99 @@
                     <Component Id="cCHK_kernel"\r
                                Guid="D96F299E-EEAA-44a5-BBC4-A862A158BA6B">\r
                       <CreateFolder />\r
-\r
-\r
-                  <File Id="chk0" Name="README.txt" DiskId="1" Compressed="yes"\r
-                    Source="..\..\README_checked.txt" />\r
-                  <File Id="chk1" Name="mthca.sys" DiskId="1" Compressed="yes"\r
-                    Source="..\bin\Chk\HCA\x86\mthca.sys" />\r
-                  <File Id="cat1" Name="mthca.cat" DiskId="1" Compressed="yes"\r
-                    Source="..\bin\Chk\HCA\x86\mthca.cat" />\r
-                  <File Id="sym1" Name="mthca.pdb" DiskId="1" Compressed="yes"\r
-                    Source="..\bin\Chk\HCA\x86\mthca.pdb" />\r
-\r
-                  <File Id="chk2" Name="ibbus.sys" DiskId="1" Compressed="yes"\r
-                    Source="..\bin\Chk\HCA\x86\ibbus.sys" />\r
-                  <File Id="sym2" Name="ibbus.pdb" DiskId="1" Compressed="yes"\r
-                    Source="..\bin\Chk\HCA\x86\ibbus.pdb" />\r
-\r
-                  <File Id="chk3" Name="ibiou.sys" DiskId="1" Compressed="yes"\r
-                    Source="..\bin\Chk\HCA\x86\ibiou.sys" />\r
-                  <File Id="cat3" Name="ib_iou.cat" DiskId="1" Compressed="yes"\r
-                    Source="..\bin\Chk\HCA\x86\ib_iou.cat" />\r
-                  <File Id="sym3" Name="ibiou.pdb" DiskId="1" Compressed="yes"\r
-                    Source="..\bin\Chk\HCA\x86\ibiou.pdb" />\r
-\r
-                  <File Id="chk4" Name="ipoib.sys" DiskId="1" Compressed="yes"\r
-                  Source="..\bin\Chk\net\x86\ipoib.sys" />\r
-                  <File Id="cat4" Name="ipoib.cat" DiskId="1" Compressed="yes"\r
-                    Source="..\bin\Chk\net\x86\ipoib.cat" />\r
-                  <File Id="sym4" Name="ipoib.pdb" DiskId="1" Compressed="yes"\r
-                    Source="..\bin\Chk\net\x86\ipoib.pdb" />\r
-\r
-                  <File Id="chk5" DiskId="1" Compressed="yes"\r
-                    Name="qlgcvnic.sys"\r
-                    Source="..\bin\Chk\net\x86\qlgcvnic.sys" />\r
-                  <File Id="cat5" DiskId="1" Compressed="yes"\r
-                    Name="netvnic.cat"\r
-                    Source="..\bin\Chk\net\x86\netvnic.cat" />\r
-                  <File Id="sym5" DiskId="1" Compressed="yes"\r
-                    Name="qlgcvnic.pdb"\r
-                    Source="..\bin\Chk\net\x86\qlgcvnic.pdb" />\r
-\r
-                  <File Id="chk6" Name="ibsrp.sys" DiskId="1" Compressed="yes"\r
-                    Source="..\bin\Chk\storage\x86\ibsrp.sys" />\r
-                  <File Id="cat6" Name="ibsrp.cat" DiskId="1" Compressed="yes"\r
-                    Source="..\bin\Chk\storage\x86\ibsrp.cat" />\r
-                  <File Id="sym6" Name="ibsrp.pdb" DiskId="1" Compressed="yes"\r
-                    Source="..\bin\Chk\storage\x86\ibsrp.pdb" />\r
-\r
-                  <File Id="chk7" DiskId="1" Compressed="yes"\r
-                    Name="mlx4_bus.sys"\r
-                    Source="..\bin\Chk\HCA\x86\mlx4_bus.sys" />\r
-                  <File Id="cat7" DiskId="1" Compressed="yes"\r
-                    Name="mlx4_bus.cat"\r
-                    Source="..\bin\Chk\HCA\x86\mlx4_bus.cat" />\r
-                  <File Id="sym7" DiskId="1" Compressed="yes"\r
-                    Name="mlx4_bus.pdb"\r
-                    Source="..\bin\Chk\HCA\x86\mlx4_bus.pdb" />\r
-\r
-                  <File Id="chk8" DiskId="1" Compressed="yes"\r
-                    Name="mlx4_hca.sys"\r
-                    Source="..\bin\Chk\HCA\x86\mlx4_hca.sys" />\r
-                  <File Id="cat8" DiskId="1" Compressed="yes"\r
-                    Name="mlx4_hca.cat"\r
-                    Source="..\bin\Chk\HCA\x86\mlx4_hca.cat" />\r
-                  <File Id="sym8" DiskId="1" Compressed="yes"\r
-                    Name="mlx4_hca.pdb"\r
-                    Source="..\bin\Chk\HCA\x86\mlx4_hca.pdb" />\r
-\r
+                        <File Id="chk0" DiskId="1" Compressed="yes"\r
+                              Name="README.txt"\r
+                              Source="..\..\README_checked.txt" />\r
+                        <File Id="chk1" DiskId="1" Compressed="yes"\r
+                              Name="mthca.sys"\r
+                              Source="..\bin\Chk\HCA\x86\mthca.sys" />\r
+                        <File Id="cat1" DiskId="1" Compressed="yes"\r
+                              Name="mthca.cat"\r
+                              Source="..\bin\Chk\HCA\x86\mthca.cat" />\r
+                        <File Id="sym1" DiskId="1" Compressed="yes"\r
+                              Name="mthca.pdb"\r
+                              Source="..\bin\Chk\HCA\x86\mthca.pdb" />\r
+  \r
+                        <File Id="chk2" DiskId="1" Compressed="yes"\r
+                              Name="ibbus.sys"\r
+                              Source="..\bin\Chk\HCA\x86\ibbus.sys" />\r
+                        <File Id="sym2" DiskId="1" Compressed="yes"\r
+                              Name="ibbus.pdb"\r
+                              Source="..\bin\Chk\HCA\x86\ibbus.pdb" />\r
+  \r
+                        <File Id="chk3" DiskId="1" Compressed="yes"\r
+                              Name="ibiou.sys"\r
+                              Source="..\bin\Chk\HCA\x86\ibiou.sys" />\r
+                        <File Id="cat3"\r
+                              Name="ib_iou.cat" DiskId="1" Compressed="yes"\r
+                              Source="..\bin\Chk\HCA\x86\ib_iou.cat" />\r
+                        <File Id="sym3" DiskId="1" Compressed="yes"\r
+                              Name="ibiou.pdb"\r
+                              Source="..\bin\Chk\HCA\x86\ibiou.pdb" />\r
+  \r
+                        <File Id="chk4" DiskId="1" Compressed="yes"\r
+                              Name="ipoib.sys"\r
+                              Source="..\bin\Chk\net\x86\ipoib.sys" />\r
+                        <File Id="cat4" DiskId="1" Compressed="yes"\r
+                              Name="ipoib.cat"\r
+                              Source="..\bin\Chk\net\x86\ipoib.cat" />\r
+                        <File Id="sym4" DiskId="1" Compressed="yes"\r
+                              Name="ipoib.pdb"\r
+                              Source="..\bin\Chk\net\x86\ipoib.pdb" />\r
+  \r
+                        <File Id="chk5" DiskId="1" Compressed="yes"\r
+                              Name="qlgcvnic.sys"\r
+                              Source="..\bin\Chk\net\x86\qlgcvnic.sys" />\r
+                        <File Id="cat5" DiskId="1" Compressed="yes"\r
+                              Name="netvnic.cat"\r
+                              Source="..\bin\Chk\net\x86\netvnic.cat" />\r
+                        <File Id="sym5" DiskId="1" Compressed="yes"\r
+                              Name="qlgcvnic.pdb"\r
+                              Source="..\bin\Chk\net\x86\qlgcvnic.pdb" />\r
+  \r
+                        <File Id="chk6" DiskId="1" Compressed="yes"\r
+                              Name="ibsrp.sys"\r
+                              Source="..\bin\Chk\storage\x86\ibsrp.sys" />\r
+                        <File Id="cat6" DiskId="1" Compressed="yes"\r
+                              Name="ibsrp.cat"\r
+                              Source="..\bin\Chk\storage\x86\ibsrp.cat" />\r
+                        <File Id="sym6" DiskId="1" Compressed="yes"\r
+                              Name="ibsrp.pdb"\r
+                              Source="..\bin\Chk\storage\x86\ibsrp.pdb" />\r
+  \r
+                        <File Id="chk7" DiskId="1" Compressed="yes"\r
+                              Name="mlx4_bus.sys"\r
+                              Source="..\bin\Chk\HCA\x86\mlx4_bus.sys" />\r
+                        <File Id="cat7" DiskId="1" Compressed="yes"\r
+                              Name="mlx4_bus.cat"\r
+                              Source="..\bin\Chk\HCA\x86\mlx4_bus.cat" />\r
+                        <File Id="sym7" DiskId="1" Compressed="yes"\r
+                              Name="mlx4_bus.pdb"\r
+                              Source="..\bin\Chk\HCA\x86\mlx4_bus.pdb" />\r
+  \r
+                        <File Id="chk8" DiskId="1" Compressed="yes"\r
+                              Name="mlx4_hca.sys"\r
+                              Source="..\bin\Chk\HCA\x86\mlx4_hca.sys" />\r
+                        <File Id="cat8" DiskId="1" Compressed="yes"\r
+                              Name="mlx4_hca.cat"\r
+                              Source="..\bin\Chk\HCA\x86\mlx4_hca.cat" />\r
+                        <File Id="sym8" DiskId="1" Compressed="yes"\r
+                              Name="mlx4_hca.pdb"\r
+                              Source="..\bin\Chk\HCA\x86\mlx4_hca.pdb" />\r
+  \r
+                        <File Id="chk9" DiskId="1" Compressed="yes"\r
+                              Name="winverbs.sys"\r
+                              Source="..\bin\Chk\HCA\x86\winverbs.sys" />\r
+                        <File Id="sym9" DiskId="1" Compressed="yes"\r
+                              Name="winverbs.pdb"\r
+                              Source="..\bin\Chk\HCA\x86\winverbs.pdb" />\r
+                        <File Id="dll9" DiskId="1" Compressed="yes"\r
+                              Name="winverbs.dll"\r
+                              Source="..\bin\Chk\HCA\x86\winverbs.dll" />\r
+                        <File Id="dlld9" DiskId="1" Compressed="yes"\r
+                              Name="winverbd.dll"\r
+                              LongName="winverbsd.dll"\r
+                              Source="..\bin\Chk\HCA\x86\winverbsd.dll" />\r
                     </Component>\r
                   </Directory>\r
             \r
@@ -451,70 +494,25 @@
                   </Directory>\r
                 </Directory>\r
 \r
-                <Directory Id="wvDir" Name="WinVerbs">\r
-                   <Component Id="cWinVerbsKernel"\r
-                             Guid="F5FA1491-E2D2-4f22-9549-07C61F86BFEB">\r
-                     <CreateFolder />\r
-\r
-                     <File Id="winverbs.inf" Compressed="yes" DiskId="1"\r
-                           LongName="winverbs.inf" Name="winverbs.INF"\r
-                           Source="..\bin\HCA\x86\winverbs.inf" />\r
-                     <File Id="winverbs.sys" Compressed="yes" DiskId="1"\r
-                           LongName="winverbs.sys" Name="winverbs.sys"\r
-                           Source="..\bin\HCA\x86\winverbs.sys" />\r
-                     <File Id="winverbs.cat" Compressed="yes" DiskId="1"\r
-                           LongName="winverbs.cat" Name="winverbs.cat"\r
-                           Source="..\bin\HCA\x86\winverbs.cat" />\r
-                     <File Id="winverbs.dll" Compressed="yes" DiskId="1"\r
-                           LongName="winverbs.dll" Name="winvrbs.dll"\r
-                           Source="..\bin\HCA\x86\winverbs.dll" />\r
-                     <File Id="winverbsd.dll" Compressed="yes" DiskId="1"\r
-                           LongName="winverbsd.dll" Name="winvrbsd.dll"\r
-                           Source="..\bin\HCA\x86\winverbsd.dll" />\r
-                     <File Id="wvWdfCoinstaller" Compressed="yes" DiskId="1"\r
-                           LongName="WdfCoInstaller01007.dll" Name="WCO.dll"\r
-                           Source="..\bin\HCA\x86\WdfCoInstaller01007.dll" />\r
-                   </Component>\r
-\r
-                   <Component Id="cWinVerbsUser"\r
-                             Guid="20916BB0-5E16-49bb-BE9F-3A202D760E72">\r
-\r
-                     <File Id="winverbs.lib" Compressed="yes" DiskId="1"\r
-                           LongName="winverbs.lib" Name="winverbs.lib"\r
-                           Source="..\bin\HCA\x86\winverbs.lib" />\r
-                     <CopyFile Id="dupWverbs.lib" FileId="winverbs.lib"\r
-                           DestinationName="winverbs.lib"\r
-                           DestinationProperty="WindowsFolder" />\r
-\r
-                     <File Id="winverbsd.lib" Compressed="yes" DiskId="1"\r
-                           LongName="winverbsd.lib" Name="winvrbsd.lib"\r
-                           Source="..\bin\HCA\x86\winverbsd.lib" />\r
+                <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\x86\libibverbs.dll" />\r
-                     <CopyFile Id="dupLibibv.dll" FileId="libibverbs.dll"\r
+                  <File Id="libibverbs.dll" Compressed="yes" DiskId="1"\r
+                        LongName="libibverbs.dll" Name="ibverbs.dll"\r
+                        Source="..\bin\HCA\x86\libibverbs.dll" />\r
+                    <CopyFile Id="dupLibibv.dll" FileId="libibverbs.dll"\r
                            DestinationName="ibverbs.dll"\r
                            DestinationLongName="libibverbs.dll"\r
                            DestinationProperty="WindowsFolder" />\r
 \r
-                     <File Id="libibverbs.lib" Compressed="yes" DiskId="1"\r
-                           LongName="libibverbs.lib" Name="ibverbs.lib"\r
-                           Source="..\bin\HCA\x86\libibverbs.lib" />\r
-                     <CopyFile Id="dupLibibv.lib" FileId="libibverbs.lib"\r
-                           DestinationName="ibverbs.lib"\r
-                           DestinationLongName="libibverbs.lib"\r
+                  <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
+                           DestinationName="ibverbsd.dll"\r
+                           DestinationLongName="libibverbsd.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\x86\libibverbsd.dll" />\r
-\r
-                     <File Id="libibverbsd.lib" Compressed="yes" DiskId="1"\r
-                           LongName="libibverbsd.lib" Name="ibverbsd.lib"\r
-                           Source="..\bin\HCA\x86\libibverbsd.lib" />\r
-                   </Component>\r
-                </Directory>\r
+                </Component>\r
 \r
                 <Component Id="cWinVerbsUApps"\r
                           Guid="ECAB2829-AE65-4ef8-8214-9A89E5BBDB9A">\r
@@ -958,6 +956,22 @@
               <File Id="complibd.pdb" Compressed="yes" DiskId="1"\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
              </Component>\r
            </Directory>\r
 \r
@@ -1241,6 +1255,7 @@
         ConfigurableDirectory="INSTALLDIR" AllowAdvertise="no"\r
         InstallDefault="local" Absent="disallow">\r
         <ComponentRef Id="cIBcore" />\r
+        <ComponentRef Id="cWinVerbsDrivers" />\r
         <ComponentRef Id="Docs" />\r
         <ComponentRef Id="Tools" />\r
         <ComponentRef Id="OpenSMservice" />\r
@@ -1248,11 +1263,10 @@
     </Feature>\r
 \r
     <Feature Id="fWV" Title="WinVerbs"\r
-        Description="OFED verbs API for Windows"\r
-        Display="expand" Level="2" ConfigurableDirectory="INSTALLDIR"\r
+        Description="OFED verbs - Libraries + applications"\r
+        Display="expand" Level="1" ConfigurableDirectory="INSTALLDIR"\r
         AllowAdvertise="no" InstallDefault="local" Absent="allow">\r
-        <ComponentRef Id="cWinVerbsKernel" />\r
-        <ComponentRef Id="cWinVerbsUser" />\r
+        <ComponentRef Id="cWinVerbsOFED" />\r
         <ComponentRef Id="cWinVerbsUApps" />\r
     </Feature>\r
 \r