]> git.openfabrics.org - ~shefty/rdma-win.git/commitdiff
{WinOF] IBSDK - InfiniBand software development kit.
authorstansmith <stansmith@ad392aa1-c5ef-ae45-8dd8-e69d62a5ef86>
Thu, 6 Dec 2007 01:20:05 +0000 (01:20 +0000)
committerstansmith <stansmith@ad392aa1-c5ef-ae45-8dd8-e69d62a5ef86>
Thu, 6 Dec 2007 01:20:05 +0000 (01:20 +0000)
\IBSDK\
  Inc\
  Libs\
  Samples\

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

12 files changed:
branches/WinOF/WIX/CustomActions.vbs
branches/WinOF/WIX/SDK_Samples/DDK/README.txt [new file with mode: 0644]
branches/WinOF/WIX/SDK_Samples/DDK/SOURCES [new file with mode: 0644]
branches/WinOF/WIX/SDK_Samples/DDK/cmtest.rc [new file with mode: 0644]
branches/WinOF/WIX/SDK_Samples/DDK/makefile [new file with mode: 0644]
branches/WinOF/WIX/SDK_Samples/VS/README.txt [new file with mode: 0644]
branches/WinOF/WIX/SDK_Samples/VS/cmtest.rc [new file with mode: 0644]
branches/WinOF/WIX/ia64/wof.wxs
branches/WinOF/WIX/x64/wof.wxs
branches/WinOF/WIX/x86/wof.wxs
trunk/docs/Manual.htm
trunk/etc/makebin.bat

index b5db75731f8fb980a1158ca2176bdf5f5516f117..af4dc7b7fc35d6e92588f6094a14755e20562917 100644 (file)
@@ -114,6 +114,65 @@ Function FileMove(filename,destination)
 End Function\r
 \r
 \r
+' Remove the specified folder and all sub-folders & files. \r
+' What rmdir does from the cmd line but will not do from vbs?\r
+\r
+Sub RemoveFolder(objStartFolder)\r
+\r
+Set objFSO = CreateObject("Scripting.FileSystemObject")\r
+\r
+If Not objFSO.FolderExists(objStartFolder) Then\r
+    Exit Sub\r
+End if\r
+\r
+Set objFolder = objFSO.GetFolder(objStartFolder)\r
+'Wscript.Echo objFolder.Path\r
+Set colFiles = objFolder.Files\r
+\r
+' del files in top-level folder\r
+For Each objFile in colFiles\r
+    objFSO.DeleteFile(objFolder.Path & "\" & objFile.Name)\r
+    If Err Then\r
+        ErrMsg("Del err on " & objFolder.Path & "\" & objFile.Name)\r
+    End if\r
+Next\r
+\r
+ShowSubfolders objFSO.GetFolder(objStartFolder), objFSO\r
+\r
+On Error Resume Next\r
+objFSO.DeleteFolder(objStartFolder)\r
+If Err Then\r
+    ErrMsg("DelFolder err on " & objStartFolder)\r
+End if\r
+\r
+End Sub\r
+\r
+\r
+Sub ShowSubFolders(Folder,FSO)\r
+    On Error Resume Next\r
+    For Each Subfolder in Folder.SubFolders\r
+'        Wscript.Echo Subfolder.Path\r
+        Set objFolder = FSO.GetFolder(Subfolder.Path)\r
+        Set colFiles = objFolder.Files\r
+        For Each objFile in colFiles\r
+'            Wscript.Echo Subfolder.Path & "\" & objFile.Name\r
+            FSO.DeleteFile(Subfolder.Path & "\" & objFile.Name)\r
+            If Err Then\r
+                ErrMsg("DelFile err on " & Subfolder.Path & "\" & objFile.Name)\r
+            End if\r
+        Next\r
+'        Wscript.Echo\r
+        ShowSubFolders Subfolder, FSO\r
+        FSO.DeleteFolder(Subfolder.Path)\r
+        If Err Then\r
+            ErrMsg("DelFolder err on " & Subfolder.Path)\r
+        End if\r
+    Next\r
+End Sub\r
+\r
+\r
+\r
+\r
 ' Attempt to clean out driver installed files which fail to be uninstalled\r
 ' when the driver is uninstalled. Win2K3/x64 files persist, XP & Win2K3/x86\r
 ' the driver files are correctly remove?\r
@@ -157,7 +216,7 @@ Function RemoveDriverFiles()
     FileDelete(sDRIVERS & "vnic.sys")\r
     \r
     If (MTARCH="amd64") Then\r
-       ' System64Folder = System32, SystemFolder = Syswow64\r
+       ' System64Folder = System32, SystemFolder = SysWOW64\r
                ' check/remove from .dll cache prior to removal from system32\\r
                Dim dllCache\r
         dllCache = sSystem64Folder & "dllcache\"\r
@@ -199,7 +258,7 @@ Function RemoveDriverFiles()
        FileDelete(sSystemFolder & "ibwsd.dll")\r
        \r
        FileDelete(Win & "lastgood\system32\ibwsd.dll")\r
-       FileDelete(Win & "lastgood\sys64wow\ibwsd.dll")\r
+       FileDelete(Win & "lastgood\SysWOW64\ibwsd.dll")\r
     \r
     ' delete opensm files\r
     Dim fso\r
@@ -1157,6 +1216,8 @@ Sub HammerTime
         RC = wshShell.Run(cmd,0,true)\r
     End if\r
 \r
+    RemoveFolder "C:\IBSDK"\r
+\r
     ' WIX does this - SysPathRemove(sInstallDir)\r
 \r
 End Sub\r
diff --git a/branches/WinOF/WIX/SDK_Samples/DDK/README.txt b/branches/WinOF/WIX/SDK_Samples/DDK/README.txt
new file mode 100644 (file)
index 0000000..bfaea6c
--- /dev/null
@@ -0,0 +1,44 @@
+\r
+DDK (Driver Development Kit) Build Environment Example [12-06-07]\r
+-----------------------------------------------------------------\r
+\r
+Install the Windows Server 2003 (SP1) DDK see http://www.microsoft.com/whdc/devtools/ddk/default.mspx .\r
+Why use the DDK? Windows Server 2003 DDK (SP1) is what's used to build the WinOF distribution.\r
+Installing the DDK first requires burning a CD of what you have just downloaded - sigh...\r
+\r
+Due to the problematic nature of spaces in path names, Windows Server 2003 DDK does not allow spaces in\r
+pathnames; this is why IBSDK is not installed under WinOF.\r
+\r
+\r
+Building CM test example\r
+------------------------\r
+\r
+Start a 'Free/Release' type DDK command prompt for you respective architecture [x86,amd64,ia64].\r
+\r
+cd to C:\IBAL\Sampes\DDK\r
+\r
+build -wg\r
+\r
+The executable will be created in a processor specific directory:\r
+  x64 (Release/Free) example:  C:\IBAL\Sampes\DDK\objfre_wnet_amd64\amd64\cmtest.exe\r
+  x64 (Checked/Debug)) example:  C:\IBAL\Sampes\DDK\objchk_wnet_amd64\amd64\cmtest.exe\r
+\r
+\r
+Executing cmtest.exe\r
+--------------------\r
+\r
+cmtest.exe passes messages between the server and client over a reliable IB queue-pair connection (RC).\r
+Connection end-points (hosts) are identified by IB port LID (hex integer, as displayed by the vstat command).\r
+Note: <spaces> are not allowed between command line switch and it's argument.\r
+\r
+Server side:    cmtest -s -l0xlll -r0xrrr -m1024 -n100\r
+\r
+Client side:   cmtest.exe -l0xlll -r0xrrr -m1024 -n100\r
+\r
+where:\r
+  lll == local port lid as displayed by vstat command.\r
+  rrr == Remote port lid as displayed by vstat; lll == rrr for local loopback operation.\r
+  -m  == bytes per message\r
+  -n  == number of messages to send.\r
+  -c  == number of connections (default is -c1)\r
+  cmtest -h reveals all...\r
diff --git a/branches/WinOF/WIX/SDK_Samples/DDK/SOURCES b/branches/WinOF/WIX/SDK_Samples/DDK/SOURCES
new file mode 100644 (file)
index 0000000..99254f9
--- /dev/null
@@ -0,0 +1,21 @@
+TARGETNAME=cmtest\r
+TARGETPATH=obj$(BUILD_ALT_DIR)\r
+TARGETTYPE=PROGRAM\r
+UMTYPE=console\r
+USE_CRTDLL=1\r
+_LIBS=..\..\Lib\r
+\r
+SOURCES=cmtest.c cmtest.rc\r
+\r
+INCLUDES=..\..\Inc;\r
+\r
+TARGETLIBS= \\r
+!if $(FREEBUILD)\r
+                       $(_LIBS)\complib.lib \\r
+                       $(_LIBS)\ibal.lib\r
+!else\r
+                       $(_LIBS)\complibd.lib \\r
+                       $(_LIBS)\ibald.lib\r
+!endif\r
+\r
+MSC_WARNING_LEVEL= /W3\r
diff --git a/branches/WinOF/WIX/SDK_Samples/DDK/cmtest.rc b/branches/WinOF/WIX/SDK_Samples/DDK/cmtest.rc
new file mode 100644 (file)
index 0000000..3c02ca9
--- /dev/null
@@ -0,0 +1,48 @@
+/*\r
+ * Copyright (c) 2007 Intel Corporation.  All rights reserved.\r
+ *\r
+ * This software is available to you under the OpenIB.org BSD license\r
+ * below:\r
+ *\r
+ *     Redistribution and use in source and binary forms, with or\r
+ *     without modification, are permitted provided that the following\r
+ *     conditions are met:\r
+ *\r
+ *      - Redistributions of source code must retain the above\r
+ *        copyright notice, this list of conditions and the following\r
+ *        disclaimer.\r
+ *\r
+ *      - Redistributions in binary form must reproduce the above\r
+ *        copyright notice, this list of conditions and the following\r
+ *        disclaimer in the documentation and/or other materials\r
+ *        provided with the distribution.\r
+ *\r
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,\r
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF\r
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND\r
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS\r
+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN\r
+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN\r
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE\r
+ * SOFTWARE.\r
+ *\r
+ * $Id$\r
+ */\r
+\r
+\r
+#include <oib_ver.h>\r
+\r
+#define VER_FILETYPE                   VFT_DLL\r
+#define VER_FILESUBTYPE                        VFT2_UNKNOWN\r
+\r
+#if DBG\r
+#define VER_FILEDESCRIPTION_STR                "Connection Manager Test (Debug)"\r
+#define VER_INTERNALNAME_STR           "cmtest.exe"\r
+#define VER_ORIGINALFILENAME_STR       "cmtest.exe"\r
+#else\r
+#define VER_FILEDESCRIPTION_STR                "Connection Manager Test (Release)"\r
+#define VER_INTERNALNAME_STR           "cmtest.exe"\r
+#define VER_ORIGINALFILENAME_STR       "cmtest.exe"\r
+#endif\r
+\r
+#include <common.ver>\r
diff --git a/branches/WinOF/WIX/SDK_Samples/DDK/makefile b/branches/WinOF/WIX/SDK_Samples/DDK/makefile
new file mode 100644 (file)
index 0000000..f86adf8
--- /dev/null
@@ -0,0 +1,7 @@
+#\r
+# DO NOT EDIT THIS FILE!!!  Edit .\sources. if you want to add a new source\r
+# file to this component.  This file merely indirects to the real make file\r
+# that is shared by all the driver components of the OpenIB Windows project.\r
+#\r
+\r
+!INCLUDE C:\IBSDK\Inc\openib.def\r
diff --git a/branches/WinOF/WIX/SDK_Samples/VS/README.txt b/branches/WinOF/WIX/SDK_Samples/VS/README.txt
new file mode 100644 (file)
index 0000000..0cf2b6a
--- /dev/null
@@ -0,0 +1,44 @@
+\r
+Visual Studio 8/5.0 (C++) Build Environment [12-06-07]\r
+-----------------------------------------------------------------\r
+\r
+Install Microsoft Visual Studio 8/5.0 (C++ env)\r
+\r
+Building CM test example\r
+------------------------\r
+\r
+\r
+cd to C:\IBAL\Samples\VS\r
+\r
+copy ..\DDK\cmtest.c cmtest.c\r
+\r
+Create a New Solution 'Project from Existing Code', using cmtest.c & cmtest.rc\r
+Select a C++ console application project.\r
+\r
+Salient Solution points:\r
+  compile as a C program\r
+  set additional Include path as C:\IBSDK\Inc\r
+  set additional Resource Include path as C:\IBSDK\Inc\r
+  Set additional Library path as C:\IBSDK\Lib\r
+  Link with additional libraries ibal.lib & complib.lib\r
+  If building a win32 application on a 64-bit platform then link with lbal32.lib & complib32.lib\r
+  \r
+\r
+Executing cmtest.exe\r
+--------------------\r
+\r
+cmtest.exe passes messages between the server and client over a reliable IB queue-pair connection (RC).\r
+Connection end-points (hosts) are identified by IB port LID (hex integer, as displayed by the vstat command).\r
+Note: <spaces> are not allowed between command line switch and it's argument.\r
+\r
+Server side:    cmtest -s -l0xlll -r0xrrr -m1024 -n100\r
+\r
+Client side:   cmtest.exe -l0xlll -r0xrrr -m1024 -n100\r
+\r
+where:\r
+  lll == local port lid as displayed by vstat command.\r
+  rrr == Remote port lid as displayed by vstat; lll == rrr for local loopback operation.\r
+  -m  == bytes per message\r
+  -n  == number of messages to send.\r
+  -c  == number of connections (default is -c1)\r
+  cmtest -h reveals all...\r
diff --git a/branches/WinOF/WIX/SDK_Samples/VS/cmtest.rc b/branches/WinOF/WIX/SDK_Samples/VS/cmtest.rc
new file mode 100644 (file)
index 0000000..b0a596b
--- /dev/null
@@ -0,0 +1,55 @@
+/*\r
+ * Copyright (c) 2007 Intel Corporation.  All rights reserved.\r
+ *\r
+ * This software is available to you under the OpenIB.org BSD license\r
+ * below:\r
+ *\r
+ *     Redistribution and use in source and binary forms, with or\r
+ *     without modification, are permitted provided that the following\r
+ *     conditions are met:\r
+ *\r
+ *      - Redistributions of source code must retain the above\r
+ *        copyright notice, this list of conditions and the following\r
+ *        disclaimer.\r
+ *\r
+ *      - Redistributions in binary form must reproduce the above\r
+ *        copyright notice, this list of conditions and the following\r
+ *        disclaimer in the documentation and/or other materials\r
+ *        provided with the distribution.\r
+ *\r
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,\r
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF\r
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND\r
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS\r
+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN\r
+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN\r
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE\r
+ * SOFTWARE.\r
+ *\r
+ * $Id$\r
+ */\r
+\r
+#define IB_COMPANYNAME "OpenFabricsAlliance\x20Windows"\r
+#define IB_PRODUCTNAME "WinOF"\r
+#define VER_FILEMAJORVERSION 1\r
+#define VER_FILEMINORVERSION 0\r
+#define VER_FILEBUILD 1\r
+#define VER_FILEREV 906\r
+\r
+#include <oib_ver.h>\r
+\r
+#define VER_FILETYPE                   VFT_DLL\r
+#define VER_FILESUBTYPE                        VFT2_UNKNOWN\r
+\r
+\r
+#if DBG\r
+#define VER_FILEDESCRIPTION_STR                "Connection Manager Test (Debug)"\r
+#define VER_INTERNALNAME_STR           "cmtest.exe"\r
+#define VER_ORIGINALFILENAME_STR       "cmtest.exe"\r
+#else\r
+#define VER_FILEDESCRIPTION_STR                "Connection Manager Test (Release)"\r
+#define VER_INTERNALNAME_STR           "cmtest.exe"\r
+#define VER_ORIGINALFILENAME_STR       "cmtest.exe"\r
+#endif\r
+\r
+#include <common.ver>\r
index 4a1ce4a7a38300a1fde126265026cbdfee751dd0..f8d5357bd594d7f7a69778c842e802026769f2b7 100644 (file)
@@ -3,17 +3,18 @@
    WinOF 1.0.1 for IA64 Itanium (IPF) on Win2K3 or XP\r
 -->\r
 <Wix xmlns="http://schemas.microsoft.com/wix/2003/01/wi">\r
-  <Product Name="Windows Open Fabrics InfiniBand v1.0.1"\r
+  <Product Name="Windows Open Fabrics InfiniBand v1.1"\r
     Id="3A6A276E-A636-48e8-8624-9A0DE3F2A15E"\r
     UpgradeCode='E38964D6-359D-4E38-9BBF-8C79D84DF6CF' \r
+    Version="1.1.0"\r
     Language="1033" Codepage="1252"\r
-    Version="1.0.1"\r
     Manufacturer="Open Fabrics Alliance Windows">\r
 \r
     <Package Id="????????-????-????-????-????????????"\r
      Keywords="Installer, InfiniBand" Description="WinOF Installer"\r
+     InstallPrivileges='elevated'\r
      Comments="Windows Open Fabrics Alliance InfiniBand stack"\r
-     Manufacturer="Open Fabrics Alliance Windows" InstallerVersion="100"\r
+     Manufacturer="Open Fabrics Alliance Windows" InstallerVersion="200"\r
      Languages="1033" Compressed="yes" SummaryCodepage="1252" />\r
 \r
     <Condition Message="Administrator required to install [ProductName].">\r
@@ -79,7 +80,7 @@
     </Condition>\r
 \r
     <Media Id="1" Cabinet="Sample.cab" EmbedCab="yes" DiskPrompt="CD-ROM #1" />\r
-    <Property Id="DiskPrompt" Value="WinOF 1.0 Installation [1]" />\r
+    <Property Id="DiskPrompt" Value="WinOF 1.1 Installation [1]" />\r
 \r
     <Directory Id="TARGETDIR" Name="SourceDir">\r
       <Directory Id="ProgramMenuFolder" Name="PMenu" LongName="Programs">\r
@@ -98,7 +99,7 @@
             <!-- implies WIX build only from an svn structured tree.  -->\r
             <File Id="manual.htm" Compressed="yes" DiskId="1" Name="Manual.htm"\r
                     LongName="Manual.htm"\r
-                    Source="..\..\..\..\trunk\docs\Manual.htm" Vital="yes" />\r
+                    Source="..\bin\Misc\Manual.htm" Vital="yes" />\r
 \r
             <Shortcut Id="Manual.htm" Directory="ProgramMenuDir"\r
                     Name="Manual.htm" LongName="Manual"\r
                      Guid="3A148CF8-129D-4AE0-A769-5FC0E0828B5E">\r
           </Component>\r
         </Directory>\r
-      </Directory>\r
+        </Directory>\r
 \r
       <!-- copy DAT header files -->\r
 \r
-      <Directory Id="WindowsFolder" Name="Root" SourceName="Windows" > \r
+      <Directory Id="WindowsVolume" Name="Root" SourceName="WinRoot">    \r
 \r
-      <Directory Id="WindowsVolume" SourceName="WinRoot">    \r
           <Directory Id="dDATD" Name="DAT">\r
             <Component Id="cDatCfg" Guid="54A4F997-AC33-45D8-9899-6332E40B62A8">\r
+              <CreateFolder />\r
               <File Id="_dat.conf" Compressed="yes" DiskId="1" KeyPath="yes"\r
                      LongName="dat.conf" Name="dat.conf"\r
                      Source="..\dat.conf" />\r
               </Component>    \r
             </Directory>    \r
 \r
-          </Directory>\r
-      </Directory> <!-- DAT -->   \r
-      </Directory> <!-- WinRoot -->   \r
+          </Directory> <!-- DAT -->   \r
+\r
+          <Directory Id="IBSDK" Name="IBSDK">\r
+            <Directory Id="IB_libs" Name="lib">\r
+              <Component Id="cIBAL_Libs"\r
+                         Guid="12E15947-F84E-49d0-B5DF-FFC505C3F5C9">\r
+                <CreateFolder />\r
+                <File Id="ibal.lib" Compressed="yes" DiskId="1"\r
+                      LongName="ibal.lib" Name="ibal.lib"\r
+                      Source="..\bin\HCA\ia64\ibal.lib" />\r
+                <File Id="ibal.pdb" Compressed="yes" DiskId="1"\r
+                      LongName="ibal.pdb" Name="ibal.pdb"\r
+                      Source="..\bin\HCA\ia64\ibal.pdb" />\r
+                <File Id="complib.lib" Compressed="yes" DiskId="1"\r
+                      LongName="complib.lib" Name="complib.lib"\r
+                      Source="..\bin\HCA\ia64\complib.lib" />\r
+                <File Id="complib.pdb" Compressed="yes" DiskId="1"\r
+                      LongName="complib.pdb" Name="complib.pdb"\r
+                      Source="..\bin\HCA\ia64\complib.pdb" />\r
+              <File Id="ibald.lib" Compressed="yes" DiskId="1"\r
+                    LongName="ibald.lib" Name="ibald.lib"\r
+                    Source="..\bin\HCA\ia64\ibald.lib" />\r
+              <File Id="ibald.pdb" Compressed="yes" DiskId="1"\r
+                    LongName="ibald.pdb" Name="ibald.pdb"\r
+                    Source="..\bin\HCA\ia64\ibald.pdb" />\r
+              <File Id="complibd.lib" Compressed="yes" DiskId="1"\r
+                    LongName="complibd.lib" Name="complibd.lib"\r
+                    Source="..\bin\HCA\ia64\complibd.lib" />\r
+              <File Id="complibd.pdb" Compressed="yes" DiskId="1"\r
+                    LongName="complibd.pdb" Name="complibd.pdb"\r
+                    Source="..\bin\HCA\ia64\complibd.pdb" />\r
+\r
+              <!-- SysWOW64\ 32-bit libs -->\r
+              <File Id="cl32.lib" Compressed="yes" DiskId="1"\r
+                    LongName="complib32.lib" Name="cl32.lib"\r
+                    Source="..\bin\HCA\ia64\cl32.lib" />\r
+              <File Id="cl32.pdb" Compressed="yes" DiskId="1"\r
+                    LongName="complib32.pdb" Name="cl32.pdb"\r
+                    Source="..\bin\HCA\ia64\cl32.pdb" />\r
+              <File Id="cl32d.lib" Compressed="yes" DiskId="1"\r
+                    LongName="complib32d.lib" Name="cl32d.lib"\r
+                    Source="..\bin\HCA\ia64\cl32d.lib" />\r
+              <File Id="cl32d.pdb" Compressed="yes" DiskId="1"\r
+                    LongName="complib32d.pdb" Name="cl32d.pdb"\r
+                    Source="..\bin\HCA\ia64\cl32d.pdb" />\r
+              <File Id="ibal32.lib" Compressed="yes" DiskId="1"\r
+                    LongName="ibal32.lib" Name="ibal32.lib"\r
+                    Source="..\bin\HCA\ia64\ibal32.lib" />\r
+              <File Id="ibal32.pdb" Compressed="yes" DiskId="1"\r
+                    LongName="ibal32.pdb" Name="ibal32.pdb"\r
+                    Source="..\bin\HCA\ia64\ibal32.pdb" />\r
+              <File Id="ibal32d.lib" Compressed="yes" DiskId="1"\r
+                    LongName="ibal32d.lib" Name="ibal32d.lib"\r
+                    Source="..\bin\HCA\ia64\ibal32d.lib" />\r
+              <File Id="ibal32d.pdb" Compressed="yes" DiskId="1"\r
+                    LongName="ibal32d.pdb" Name="ibal32d.pdb"\r
+                    Source="..\bin\HCA\ia64\ibal32d.pdb" />\r
+              </Component>\r
+            </Directory>\r
+\r
+            <Directory Id="IB_inc" Name="Inc">\r
+              <Component Id="cIBAL_Incs"\r
+                         Guid="54C2903E-65DF-4c62-B31D-21DB1AFB5819">\r
+                <CreateFolder />\r
+\r
+                <File Id="oib_ver.h" Compressed="yes" DiskId="1"\r
+                       LongName="oib_ver.h" Name="oib_ver.h"\r
+                       Source="..\bin\Inc\oib_ver.h" />\r
+                <File Id="openib.def" Compressed="yes" DiskId="1"\r
+                       LongName="openib.def" Name="openib.def"\r
+                       Source="..\bin\Inc\openib.def" />\r
+              </Component>\r
+\r
+              <Directory Id="IB_complib" Name="complib">\r
+                <Component Id="cIBAL_Complib"\r
+                           Guid="9F9EE1F2-5ACE-47c7-89F8-B0EA1D4363AF">\r
+                  <CreateFolder />\r
+                  <File Id="cl_async_proc.h" Compressed="yes" DiskId="1"\r
+                        LongName="cl_async_proc.h" Name="CL_ASYN.H" \r
+                        Source="..\bin\Inc\complib\cl_async_proc.h" />\r
+                  <File Id="cl_atomic.h" Compressed="yes" DiskId="1"\r
+                        LongName="cl_atomic.h" Name="CL_ATOM.H" \r
+                        Source="..\bin\Inc\complib\cl_atomic.h" />\r
+                  <File Id="cl_atomic_osd.h" Compressed="yes" DiskId="1"\r
+                        LongName="cl_atomic_osd.h" Name="CL_ATOM1.H" \r
+                        Source="..\bin\Inc\complib\cl_atomic_osd.h" />\r
+                  <File Id="cl_byteswap.h" Compressed="yes" DiskId="1"\r
+                        LongName="cl_byteswap.h" Name="CL_BYTE.H" \r
+                        Source="..\bin\Inc\complib\cl_byteswap.h" />\r
+                  <File Id="cl_byteswap_osd.h" Compressed="yes" DiskId="1"\r
+                        LongName="cl_byteswap_osd.h" Name="CL_BYTE1.H" \r
+                        Source="..\bin\Inc\complib\cl_byteswap_osd.h" />\r
+                  <File Id="cl_comppool.h" Compressed="yes" DiskId="1"\r
+                        LongName="cl_comppool.h" Name="CL_COMP.H" \r
+                        Source="..\bin\Inc\complib\cl_comppool.h" />\r
+                  <File Id="cl_debug.h" Compressed="yes" DiskId="1"\r
+                        LongName="cl_debug.h" Name="CL_DEBU.H" \r
+                        Source="..\bin\Inc\complib\cl_debug.h" />\r
+                  <File Id="cl_debug_osd.h" Compressed="yes" DiskId="1"\r
+                        LongName="cl_debug_osd.h" Name="CL_DEBU1.H" \r
+                        Source="..\bin\Inc\complib\cl_debug_osd.h" />\r
+                  <File Id="cl_event.h" Compressed="yes" DiskId="1"\r
+                        LongName="cl_event.h" Name="CL_EVEN.H" \r
+                        Source="..\bin\Inc\complib\cl_event.h" />\r
+                  <File Id="cl_event_osd.h" Compressed="yes" DiskId="1"\r
+                        LongName="cl_event_osd.h" Name="CL_EVEN1.H" \r
+                        Source="..\bin\Inc\complib\cl_event_osd.h" />\r
+                  <File Id="cl_fleximap.h" Compressed="yes" DiskId="1"\r
+                        LongName="cl_fleximap.h" Name="CL_FLEX.H" \r
+                        Source="..\bin\Inc\complib\cl_fleximap.h" />\r
+                  <File Id="cl_ioctl.h" Compressed="yes" DiskId="1"\r
+                        LongName="cl_ioctl.h" Name="CL_IOCT.H" \r
+                        Source="..\bin\Inc\complib\cl_ioctl.h" />\r
+                  <File Id="cl_ioctl_osd.h" Compressed="yes" DiskId="1"\r
+                        LongName="cl_ioctl_osd.h" Name="CL_IOCT1.H" \r
+                        Source="..\bin\Inc\complib\cl_ioctl_osd.h" />\r
+                  <File Id="cl_irqlock.h" Compressed="yes" DiskId="1"\r
+                        LongName="cl_irqlock.h" Name="CL_IRQL.H" \r
+                        Source="..\bin\Inc\complib\cl_irqlock.h" />\r
+                  <File Id="cl_list.h" Compressed="yes" DiskId="1"\r
+                        LongName="cl_list.h" Name="CL_LIST.H" \r
+                        Source="..\bin\Inc\complib\cl_list.h" />\r
+                  <File Id="cl_log.h" Compressed="yes" DiskId="1"\r
+                        LongName="cl_log.h" Name="CL_LOG.H" \r
+                        Source="..\bin\Inc\complib\cl_log.h" />\r
+                  <File Id="cl_map.h" Compressed="yes" DiskId="1"\r
+                        LongName="cl_map.h" Name="CL_MAP.H" \r
+                        Source="..\bin\Inc\complib\cl_map.h" />\r
+                  <File Id="cl_math.h" Compressed="yes" DiskId="1"\r
+                        LongName="cl_math.h" Name="CL_MATH.H" \r
+                        Source="..\bin\Inc\complib\cl_math.h" />\r
+                  <File Id="cl_memory.h" Compressed="yes" DiskId="1"\r
+                        LongName="cl_memory.h" Name="CL_MEMO.H" \r
+                        Source="..\bin\Inc\complib\cl_memory.h" />\r
+                  <File Id="cl_memory_osd.h" Compressed="yes" DiskId="1"\r
+                        LongName="cl_memory_osd.h" Name="CL_MEMO1.H" \r
+                        Source="..\bin\Inc\complib\cl_memory_osd.h" />\r
+                  <File Id="cl_mutex.h" Compressed="yes" DiskId="1"\r
+                        LongName="cl_mutex.h" Name="CL_MUTE.H" \r
+                        Source="..\bin\Inc\complib\cl_mutex.h" />\r
+                  <File Id="cl_mutex_osd.h" Compressed="yes" DiskId="1"\r
+                        LongName="cl_mutex_osd.h" Name="CL_MUTE1.H" \r
+                        Source="..\bin\Inc\complib\cl_mutex_osd.h" />\r
+                  <File Id="cl_obj.h" Compressed="yes" DiskId="1"\r
+                        LongName="cl_obj.h" Name="CL_OBJ.H" \r
+                        Source="..\bin\Inc\complib\cl_obj.h" />\r
+                  <File Id="cl_packoff.h" Compressed="yes" DiskId="1"\r
+                        LongName="cl_packoff.h" Name="CL_PACK.H" \r
+                        Source="..\bin\Inc\complib\cl_packoff.h" />\r
+                  <File Id="cl_packon.h" Compressed="yes" DiskId="1"\r
+                        LongName="cl_packon.h" Name="CL_PACK1.H" \r
+                        Source="..\bin\Inc\complib\cl_packon.h" />\r
+                  <File Id="cl_passivelock.h" Compressed="yes" DiskId="1"\r
+                        LongName="cl_passivelock.h" Name="CL_PASS.H" \r
+                        Source="..\bin\Inc\complib\cl_passivelock.h" />\r
+                  <File Id="cl_perf.h" Compressed="yes" DiskId="1"\r
+                        LongName="cl_perf.h" Name="CL_PERF.H" \r
+                        Source="..\bin\Inc\complib\cl_perf.h" />\r
+                  <File Id="cl_pool.h" Compressed="yes" DiskId="1"\r
+                        LongName="cl_pool.h" Name="CL_POOL.H" \r
+                        Source="..\bin\Inc\complib\cl_pool.h" />\r
+                  <File Id="cl_ptr_vector.h" Compressed="yes" DiskId="1"\r
+                        LongName="cl_ptr_vector.h" Name="CL_PTR_.H" \r
+                        Source="..\bin\Inc\complib\cl_ptr_vector.h" />\r
+                  <File Id="cl_qcomppool.h" Compressed="yes" DiskId="1"\r
+                        LongName="cl_qcomppool.h" Name="CL_QCOM.H" \r
+                        Source="..\bin\Inc\complib\cl_qcomppool.h" />\r
+                  <File Id="cl_qlist.h" Compressed="yes" DiskId="1"\r
+                        LongName="cl_qlist.h" Name="CL_QLIS.H" \r
+                        Source="..\bin\Inc\complib\cl_qlist.h" />\r
+                  <File Id="cl_qlockpool.h" Compressed="yes" DiskId="1"\r
+                        LongName="cl_qlockpool.h" Name="CL_QLOC.H" \r
+                        Source="..\bin\Inc\complib\cl_qlockpool.h" />\r
+                  <File Id="cl_qmap.h" Compressed="yes" DiskId="1"\r
+                        LongName="cl_qmap.h" Name="CL_QMAP.H" \r
+                        Source="..\bin\Inc\complib\cl_qmap.h" />\r
+                  <File Id="cl_qpool.h" Compressed="yes" DiskId="1"\r
+                        LongName="cl_qpool.h" Name="CL_QPOO.H" \r
+                        Source="..\bin\Inc\complib\cl_qpool.h" />\r
+                  <File Id="cl_rbmap.h" Compressed="yes" DiskId="1"\r
+                        LongName="cl_rbmap.h" Name="CL_RBMA.H" \r
+                        Source="..\bin\Inc\complib\cl_rbmap.h" />\r
+                  <File Id="cl_reqmgr.h" Compressed="yes" DiskId="1"\r
+                        LongName="cl_reqmgr.h" Name="CL_REQM.H" \r
+                        Source="..\bin\Inc\complib\cl_reqmgr.h" />\r
+                  <File Id="cl_spinlock.h" Compressed="yes" DiskId="1"\r
+                        LongName="cl_spinlock.h" Name="CL_SPIN.H" \r
+                        Source="..\bin\Inc\complib\cl_spinlock.h" />\r
+                  <File Id="cl_spinlock_osd.h" Compressed="yes" DiskId="1"\r
+                        LongName="cl_spinlock_osd.h" Name="CL_SPIN1.H" \r
+                        Source="..\bin\Inc\complib\cl_spinlock_osd.h" />\r
+                  <File Id="cl_syscallback.h" Compressed="yes" DiskId="1"\r
+                        LongName="cl_syscallback.h" Name="CL_SYSC.H" \r
+                        Source="..\bin\Inc\complib\cl_syscallback.h" />\r
+                  <File Id="cl_syscallback_osd.h" Compressed="yes" DiskId="1"\r
+                        LongName="cl_syscallback_osd.h" Name="CL_SYSC1.H" \r
+                        Source="..\bin\Inc\complib\cl_syscallback_osd.h" />\r
+                  <File Id="cl_thread.h" Compressed="yes" DiskId="1"\r
+                        LongName="cl_thread.h" Name="CL_THRE.H" \r
+                        Source="..\bin\Inc\complib\cl_thread.h" />\r
+                  <File Id="cl_thread_osd.h" Compressed="yes" DiskId="1"\r
+                        LongName="cl_thread_osd.h" Name="CL_THRE1.H" \r
+                        Source="..\bin\Inc\complib\cl_thread_osd.h" />\r
+                  <File Id="cl_threadpool.h" Compressed="yes" DiskId="1"\r
+                        LongName="cl_threadpool.h" Name="CL_THRE2.H" \r
+                        Source="..\bin\Inc\complib\cl_threadpool.h" />\r
+                  <File Id="cl_timer.h" Compressed="yes" DiskId="1"\r
+                        LongName="cl_timer.h" Name="CL_TIME.H" \r
+                        Source="..\bin\Inc\complib\cl_timer.h" />\r
+                  <File Id="cl_timer_osd.h" Compressed="yes" DiskId="1"\r
+                        LongName="cl_timer_osd.h" Name="CL_TIME1.H" \r
+                        Source="..\bin\Inc\complib\cl_timer_osd.h" />\r
+                  <File Id="cl_types.h" Compressed="yes" DiskId="1"\r
+                        LongName="cl_types.h" Name="CL_TYPE.H" \r
+                        Source="..\bin\Inc\complib\cl_types.h" />\r
+                  <File Id="cl_types_osd.h" Compressed="yes" DiskId="1"\r
+                        LongName="cl_types_osd.h" Name="CL_TYPE1.H" \r
+                        Source="..\bin\Inc\complib\cl_types_osd.h" />\r
+                  <File Id="cl_vector.h" Compressed="yes" DiskId="1"\r
+                        LongName="cl_vector.h" Name="CL_VECT.H" \r
+                        Source="..\bin\Inc\complib\cl_vector.h" />\r
+                  <File Id="cl_waitobj.h" Compressed="yes" DiskId="1"\r
+                        LongName="cl_waitobj.h" Name="CL_WAIT.H" \r
+                        Source="..\bin\Inc\complib\cl_waitobj.h" />\r
+                  <File Id="cl_waitobj_osd.h" Compressed="yes" DiskId="1"\r
+                        LongName="cl_waitobj_osd.h" Name="CL_WAIT1.H" \r
+                        Source="..\bin\Inc\complib\cl_waitobj_osd.h" />\r
+                  <File Id="comp_lib.h" Compressed="yes" DiskId="1"\r
+                        LongName="comp_lib.h" Name="COMP_LI.H" \r
+                        Source="..\bin\Inc\complib\comp_lib.h" />\r
+                </Component>\r
+              </Directory>\r
+\r
+              <Directory Id="IB_iba" Name="iba">\r
+                <Component Id="cIBAL_IBA"\r
+                           Guid="2EC5C324-734D-4a06-AE35-D7B80D76B77A">\r
+                  <CreateFolder />\r
+                  <File Id="ib_al.h" Compressed="yes" DiskId="1"\r
+                        LongName="ib_al.h" Name="ib_al.h"\r
+                        Source="..\bin\Inc\iba\ib_al.h" />\r
+                  <File Id="ib_al_ioctl.h" Compressed="yes" DiskId="1"\r
+                        LongName="ib_al_ioctl.h" Name="ib_ioctl.h"\r
+                        Source="..\bin\Inc\iba\ib_al_ioctl.h" />\r
+                  <File Id="ib_at_ioctl.h" Compressed="yes" DiskId="1"\r
+                        LongName="ib_at_ioctl.h" Name="ib_iocat.h"\r
+                        Source="..\bin\Inc\iba\ib_at_ioctl.h" />\r
+                  <File Id="ib_ci.h" Compressed="yes" DiskId="1"\r
+                        LongName="ib_ci.h" Name="ib_ci.h"\r
+                        Source="..\bin\Inc\iba\ib_ci.h" />\r
+                  <File Id="ib_types.h" Compressed="yes" DiskId="1"\r
+                        LongName="ib_types.h" Name="ib_types.h"\r
+                        Source="..\bin\Inc\iba\ib_types.h" />\r
+                  <File Id="ib_uvp.h" Compressed="yes" DiskId="1"\r
+                        LongName="ib_uvp.h" Name="ib_uvp.h"\r
+                        Source="..\bin\Inc\iba\ib_uvp.h" />\r
+                </Component>\r
+              </Directory>\r
+            </Directory>\r
+\r
+            <Directory Id="IB_samples" Name="Samples">\r
+              <Directory Id="sample_DDK" Name="DDK">\r
+                <Component Id="cDDK_example"\r
+                           Guid="8C27B926-FCFE-4f46-83B4-A27482A5EB3B">\r
+                  <CreateFolder />\r
+                      <File Id="cmtest.c" Compressed="yes" DiskId="1"\r
+                            LongName="cmtest.c" Name="cmtest.c"\r
+                            Source="..\bin\Misc\cmtest.c" />\r
+                      <File Id="makefile" Compressed="yes" DiskId="1"\r
+                            LongName="makefile" Name="makefile"\r
+                            Source="..\..\SDK_Samples\DDK\makefile" />\r
+                      <File Id="SOURCES" Compressed="yes" DiskId="1"\r
+                            LongName="SOURCES" Name="SOURCES"\r
+                            Source="..\..\SDK_Samples\DDK\SOURCES" />\r
+                      <File Id="README.txt" Compressed="yes" DiskId="1"\r
+                            LongName="README.txt" Name="README.txt"\r
+                            Source="..\..\SDK_Samples\DDK\README.txt" />\r
+                </Component>\r
+              </Directory>    <!-- End DDK -->\r
+              <Directory Id="sample_VS" Name="VS">\r
+                <Component Id="cVS_example"\r
+                           Guid="35E03D7E-E943-4346-8F63-7E991AF68F53">\r
+                  <CreateFolder />\r
+                      <File Id="vs_cmtest.c" Compressed="yes" DiskId="1"\r
+                            LongName="cmtest.c" Name="cmtest.c"\r
+                            Source="..\bin\misc\cmtest.c" />\r
+                      <File Id="vscmtest.rc" Compressed="yes" DiskId="1"\r
+                            LongName="cmtest.rc" Name="cmtest.rc"\r
+                            Source="..\..\SDK_Samples\VS\cmtest.rc" />\r
+                      <File Id="vsREADME.txt" Compressed="yes" DiskId="1"\r
+                            LongName="README.txt" Name="README.txt"\r
+                            Source="..\..\SDK_Samples\VS\README.txt" />\r
+                </Component>\r
+              </Directory>    <!-- End VS -->\r
+            </Directory>    <!-- End Samples -->\r
+          </Directory>    <!-- End IBSDK -->\r
+\r
+      </Directory>   <!-- WinRoot -->   \r
     </Directory> <!-- TARGETDIR --> \r
 \r
 <!--\r
       <ComponentRef Id="OpenSMservice" />\r
     </Feature>\r
 \r
+    <Feature Id="fIBsdk" Title="InfiniBand SDK" Level="2"\r
+         Description="InfiniBand Software Development Kit (Headers + Libs)"\r
+         Display="expand" ConfigurableDirectory="INSTALLDIR"\r
+         AllowAdvertise='no' InstallDefault='local' Absent='disallow'>\r
+      <ComponentRef Id="cIBAL_Libs" />\r
+      <ComponentRef Id="cIBAL_Incs" />\r
+      <ComponentRef Id="cIBAL_Complib" />\r
+      <ComponentRef Id="cIBAL_IBA" />\r
+      <ComponentRef Id="cDDK_example" />\r
+      <ComponentRef Id="cVS_example" />\r
+    </Feature>\r
+\r
     <Feature Id="fIPoIB" Title="IPoIB" Level="1"\r
          Description="Internet Protocols over InfiniBand" Display="expand"\r
          ConfigurableDirectory="INSTALLDIR"\r
index 3f56662b201e8d0798a09532fe69a55dbe4b0c92..ef1105eeb0df1a5d0910f1d4be2055588eb0786b 100644 (file)
@@ -3,16 +3,19 @@
    WinOF 1.0.1 for x64 Win2K3 or XP\r
 -->\r
 <Wix xmlns="http://schemas.microsoft.com/wix/2003/01/wi">\r
-  <Product Name="Windows Open Fabrics InfiniBand v1.0.1"\r
+  <Product Name="Windows Open Fabrics InfiniBand v1.1"\r
     Id="3A6A276E-A636-48e8-8624-9A0DE3F2A15E"\r
     UpgradeCode='E38964D6-359D-4E38-9BBF-8C79D84DF6CF' \r
-    Language="1033" Codepage="1252" Version="1.0.1"\r
+    Version="1.1.0"\r
+    Language="1033" Codepage="1252"\r
     Manufacturer="Open Fabrics Alliance Windows">\r
 \r
     <Package Id="????????-????-????-????-????????????"\r
-     Keywords="Installer, InfiniBand" Description="WinOF Installer"\r
+     Keywords="Installer, InfiniBand, WinOF, OpenFabrics"\r
+     InstallPrivileges='elevated'\r
+     Description="WinOF Installer"\r
      Comments="Windows Open Fabrics Alliance InfiniBand stack"\r
-     Manufacturer="Open Fabrics Alliance Windows" InstallerVersion="100"\r
+     Manufacturer="Open Fabrics Alliance Windows" InstallerVersion="200"\r
      Languages="1033" Compressed="yes" SummaryCodepage="1252" />\r
 \r
     <Condition Message="Administrator required to install [ProductName].">\r
             <!-- implies WIX build only from an svn structured tree.  -->\r
             <File Id="manual.htm" Compressed="yes" DiskId="1" Name="Manual.htm"\r
                     LongName="Manual.htm"\r
-                    Source="..\..\..\..\trunk\docs\Manual.htm" Vital="yes" />\r
+                    Source="..\bin\Misc\Manual.htm" Vital="yes" />\r
 \r
             <Shortcut Id="Manual.htm" Directory="ProgramMenuDir"\r
                     Name="Manual.htm" LongName="Manual"\r
               <File Id="cl32.dll" Compressed="yes" DiskId="1"\r
                      LongName="cl32.dll" Name="CL32.DLL"\r
                      Source="..\bin\HCA\amd64\cl32.dll" />\r
-                <CopyFile Id="dup_cl32" FileId="cl32.dll"\r
+                <!-- SystemFolder == SysWOW64 on 64-bit installers -->\r
+                <CopyFile Id="SW_cl32" FileId="cl32.dll"\r
                         DestinationName="complib.dll"\r
                         DestinationProperty="SystemFolder" />\r
               <File Id="cl32d.dll" Compressed="yes" DiskId="1"\r
                      LongName="cl32d.dll" Name="CL32D.DLL"\r
                      Source="..\bin\HCA\amd64\cl32d.dll" />\r
-                <CopyFile Id="dup_cl32d" FileId="cl32d.dll"\r
+                <CopyFile Id="SW_cl32d" FileId="cl32d.dll"\r
                         DestinationName="complibd.dll"\r
                         DestinationProperty="SystemFolder" />\r
               <File Id="complib.dll" Compressed="yes" DiskId="1"\r
               <File Id="ibal32.dll" Compressed="yes" DiskId="1"\r
                      LongName="ibal32.dll" Name="IBAL32.DLL"\r
                      Source="..\bin\HCA\amd64\ibal32.dll" />\r
-                <CopyFile Id="dup_ibal32" FileId="ibal32.dll"\r
+                <CopyFile Id="SW_ibal32" FileId="ibal32.dll"\r
                         DestinationName="ibal.dll"\r
                         DestinationProperty="SystemFolder" />\r
               <File Id="ibal32d.dll" Compressed="yes" DiskId="1"\r
                      LongName="ibal32d.dll" Name="IBAL32D.DLL"\r
                      Source="..\bin\HCA\amd64\ibal32d.dll" />\r
-                <CopyFile Id="dup_ibal32d" FileId="ibal32d.dll"\r
+                <CopyFile Id="SW_ibal32d" FileId="ibal32d.dll"\r
                         DestinationName="ibald.dll"\r
                         DestinationProperty="SystemFolder" />\r
               <File Id="ibal.dll" Compressed="yes" DiskId="1"\r
               <File Id="mtuvp32.dll" Compressed="yes" DiskId="1"\r
                      LongName="mtuvp32.dll" Name="MTUVP321.DLL"\r
                      Source="..\bin\HCA\amd64\mtuvp32.dll" />\r
-                <CopyFile Id="dup_mtuvp32" FileId="mtuvp32.dll"\r
+                <CopyFile Id="SW_mtuvp32" FileId="mtuvp32.dll"\r
                         DestinationName="mthcau.dll"\r
                         DestinationProperty="SystemFolder" />\r
               <File Id="mtuvp32d.dll" Compressed="yes" DiskId="1"\r
                                     LongName="mtuvp32d.dll" Name="MTUVP32.DLL"\r
                                     Source="..\bin\HCA\amd64\mtuvp32d.dll" />\r
-                <CopyFile Id="dup_mtuvp32d" FileId="mtuvp32d.dll"\r
+                <CopyFile Id="SW_mtuvp32d" FileId="mtuvp32d.dll"\r
                         DestinationName="mthcaud.dll"\r
                         DestinationProperty="SystemFolder" />\r
             </Component>\r
         </Directory>\r
       </Directory>\r
 \r
+      <Directory Id="WindowsVolume" Name="Root" SourceName="WinRoot"> \r
+\r
       <!-- copy DAT header files to\r
-           %SystemDrive%\DAT\v1-1\DAT\r
-           %SystemDrive%\DAT\v2-0\DAT\r
+         %SystemDrive%\DAT\v1-1\DAT\r
+         %SystemDrive%\DAT\v2-0\DAT\r
       -->\r
-      <Directory Id="WindowsVolume" Name="Root" SourceName="WinRoot">    \r
 \r
         <Directory Id="dDATD" Name="DAT">\r
             <Component Id="cDatCfg"\r
                        Guid="54A4F997-AC33-45D8-9899-6332E40B62A8" >\r
+              <CreateFolder />\r
               <File Id="_dat.conf" Compressed="yes" DiskId="1" KeyPath="yes"\r
                      LongName="dat.conf" Name="dat.conf"\r
                      Source="..\dat.conf" />\r
             </Directory>    \r
 \r
         </Directory>    \r
-      </Directory>    \r
-    </Directory> <!-- End TARGETDIR --> \r
+\r
+        <Directory Id="IBSDK" Name="IBSDK">\r
+          <Directory Id="IB_libs" Name="lib">\r
+            <Component Id="cIBAL_Libs"\r
+                       Guid="12E15947-F84E-49d0-B5DF-FFC505C3F5C9">\r
+              <CreateFolder />\r
+              <File Id="ibal.lib" Compressed="yes" DiskId="1"\r
+                    LongName="ibal.lib" Name="ibal.lib"\r
+                    Source="..\bin\HCA\amd64\ibal.lib" />\r
+              <File Id="ibal.pdb" Compressed="yes" DiskId="1"\r
+                    LongName="ibal.pdb" Name="ibal.pdb"\r
+                    Source="..\bin\HCA\amd64\ibal.pdb" />\r
+              <File Id="complib.lib" Compressed="yes" DiskId="1"\r
+                    LongName="complib.lib" Name="complib.lib"\r
+                    Source="..\bin\HCA\amd64\complib.lib" />\r
+              <File Id="complib.pdb" Compressed="yes" DiskId="1"\r
+                    LongName="complib.pdb" Name="complib.pdb"\r
+                    Source="..\bin\HCA\amd64\complib.pdb" />\r
+              <File Id="ibald.lib" Compressed="yes" DiskId="1"\r
+                    LongName="ibald.lib" Name="ibald.lib"\r
+                    Source="..\bin\HCA\amd64\ibald.lib" />\r
+              <File Id="ibald.pdb" Compressed="yes" DiskId="1"\r
+                    LongName="ibald.pdb" Name="ibald.pdb"\r
+                    Source="..\bin\HCA\amd64\ibald.pdb" />\r
+              <File Id="complibd.lib" Compressed="yes" DiskId="1"\r
+                    LongName="complibd.lib" Name="complibd.lib"\r
+                    Source="..\bin\HCA\amd64\complibd.lib" />\r
+              <File Id="complibd.pdb" Compressed="yes" DiskId="1"\r
+                    LongName="complibd.pdb" Name="complibd.pdb"\r
+                    Source="..\bin\HCA\amd64\complibd.pdb" />\r
+\r
+               <!-- SysWOW64\ 32-bit libs -->\r
+              <File Id="cl32.lib" Compressed="yes" DiskId="1"\r
+                    LongName="complib32.lib" Name="cl32.lib"\r
+                    Source="..\bin\HCA\amd64\cl32.lib" />\r
+              <File Id="cl32.pdb" Compressed="yes" DiskId="1"\r
+                    LongName="complib32.pdb" Name="cl32.pdb"\r
+                    Source="..\bin\HCA\amd64\cl32.pdb" />\r
+              <File Id="cl32d.lib" Compressed="yes" DiskId="1"\r
+                    LongName="complib32d.lib" Name="cl32d.lib"\r
+                    Source="..\bin\HCA\amd64\cl32d.lib" />\r
+              <File Id="cl32d.pdb" Compressed="yes" DiskId="1"\r
+                    LongName="complib32d.pdb" Name="cl32d.pdb"\r
+                    Source="..\bin\HCA\amd64\cl32d.pdb" />\r
+              <File Id="ibal32.lib" Compressed="yes" DiskId="1"\r
+                    LongName="ibal32.lib" Name="ibal32.lib"\r
+                    Source="..\bin\HCA\amd64\ibal32.lib" />\r
+              <File Id="ibal32.pdb" Compressed="yes" DiskId="1"\r
+                    LongName="ibal32.pdb" Name="ibal32.pdb"\r
+                    Source="..\bin\HCA\amd64\ibal32.pdb" />\r
+              <File Id="ibal32d.lib" Compressed="yes" DiskId="1"\r
+                    LongName="ibal32d.lib" Name="ibal32d.lib"\r
+                    Source="..\bin\HCA\amd64\ibal32d.lib" />\r
+              <File Id="ibal32d.pdb" Compressed="yes" DiskId="1"\r
+                    LongName="ibal32d.pdb" Name="ibal32d.pdb"\r
+                    Source="..\bin\HCA\amd64\ibal32d.pdb" />\r
+            </Component>\r
+          </Directory>\r
+\r
+          <Directory Id="IB_inc" Name="Inc">\r
+            <Component Id="cIBAL_Incs"\r
+                       Guid="54C2903E-65DF-4c62-B31D-21DB1AFB5819">\r
+              <CreateFolder />\r
+\r
+              <File Id="oib_ver.h" Compressed="yes" DiskId="1"\r
+                     LongName="oib_ver.h" Name="oib_ver.h"\r
+                     Source="..\bin\Inc\oib_ver.h" />\r
+              <File Id="openib.def" Compressed="yes" DiskId="1"\r
+                     LongName="openib.def" Name="openib.def"\r
+                     Source="..\bin\Inc\openib.def" />\r
+            </Component>\r
+\r
+            <Directory Id="IB_complib" Name="complib">\r
+              <Component Id="cIBAL_Complib"\r
+                         Guid="9F9EE1F2-5ACE-47c7-89F8-B0EA1D4363AF">\r
+                <CreateFolder />\r
+                <File Id="cl_async_proc.h" Compressed="yes" DiskId="1"\r
+                      LongName="cl_async_proc.h" Name="CL_ASYN.H" \r
+                      Source="..\bin\Inc\complib\cl_async_proc.h" />\r
+                <File Id="cl_atomic.h" Compressed="yes" DiskId="1"\r
+                      LongName="cl_atomic.h" Name="CL_ATOM.H" \r
+                      Source="..\bin\Inc\complib\cl_atomic.h" />\r
+                <File Id="cl_atomic_osd.h" Compressed="yes" DiskId="1"\r
+                      LongName="cl_atomic_osd.h" Name="CL_ATOM1.H" \r
+                      Source="..\bin\Inc\complib\cl_atomic_osd.h" />\r
+                <File Id="cl_byteswap.h" Compressed="yes" DiskId="1"\r
+                      LongName="cl_byteswap.h" Name="CL_BYTE.H" \r
+                      Source="..\bin\Inc\complib\cl_byteswap.h" />\r
+                <File Id="cl_byteswap_osd.h" Compressed="yes" DiskId="1"\r
+                      LongName="cl_byteswap_osd.h" Name="CL_BYTE1.H" \r
+                      Source="..\bin\Inc\complib\cl_byteswap_osd.h" />\r
+                <File Id="cl_comppool.h" Compressed="yes" DiskId="1"\r
+                      LongName="cl_comppool.h" Name="CL_COMP.H" \r
+                      Source="..\bin\Inc\complib\cl_comppool.h" />\r
+                <File Id="cl_debug.h" Compressed="yes" DiskId="1"\r
+                      LongName="cl_debug.h" Name="CL_DEBU.H" \r
+                      Source="..\bin\Inc\complib\cl_debug.h" />\r
+                <File Id="cl_debug_osd.h" Compressed="yes" DiskId="1"\r
+                      LongName="cl_debug_osd.h" Name="CL_DEBU1.H" \r
+                      Source="..\bin\Inc\complib\cl_debug_osd.h" />\r
+                <File Id="cl_event.h" Compressed="yes" DiskId="1"\r
+                      LongName="cl_event.h" Name="CL_EVEN.H" \r
+                      Source="..\bin\Inc\complib\cl_event.h" />\r
+                <File Id="cl_event_osd.h" Compressed="yes" DiskId="1"\r
+                      LongName="cl_event_osd.h" Name="CL_EVEN1.H" \r
+                      Source="..\bin\Inc\complib\cl_event_osd.h" />\r
+                <File Id="cl_fleximap.h" Compressed="yes" DiskId="1"\r
+                      LongName="cl_fleximap.h" Name="CL_FLEX.H" \r
+                      Source="..\bin\Inc\complib\cl_fleximap.h" />\r
+                <File Id="cl_ioctl.h" Compressed="yes" DiskId="1"\r
+                      LongName="cl_ioctl.h" Name="CL_IOCT.H" \r
+                      Source="..\bin\Inc\complib\cl_ioctl.h" />\r
+                <File Id="cl_ioctl_osd.h" Compressed="yes" DiskId="1"\r
+                      LongName="cl_ioctl_osd.h" Name="CL_IOCT1.H" \r
+                      Source="..\bin\Inc\complib\cl_ioctl_osd.h" />\r
+                <File Id="cl_irqlock.h" Compressed="yes" DiskId="1"\r
+                      LongName="cl_irqlock.h" Name="CL_IRQL.H" \r
+                      Source="..\bin\Inc\complib\cl_irqlock.h" />\r
+                <File Id="cl_list.h" Compressed="yes" DiskId="1"\r
+                      LongName="cl_list.h" Name="CL_LIST.H" \r
+                      Source="..\bin\Inc\complib\cl_list.h" />\r
+                <File Id="cl_log.h" Compressed="yes" DiskId="1"\r
+                      LongName="cl_log.h" Name="CL_LOG.H" \r
+                      Source="..\bin\Inc\complib\cl_log.h" />\r
+                <File Id="cl_map.h" Compressed="yes" DiskId="1"\r
+                      LongName="cl_map.h" Name="CL_MAP.H" \r
+                      Source="..\bin\Inc\complib\cl_map.h" />\r
+                <File Id="cl_math.h" Compressed="yes" DiskId="1"\r
+                      LongName="cl_math.h" Name="CL_MATH.H" \r
+                      Source="..\bin\Inc\complib\cl_math.h" />\r
+                <File Id="cl_memory.h" Compressed="yes" DiskId="1"\r
+                      LongName="cl_memory.h" Name="CL_MEMO.H" \r
+                      Source="..\bin\Inc\complib\cl_memory.h" />\r
+                <File Id="cl_memory_osd.h" Compressed="yes" DiskId="1"\r
+                      LongName="cl_memory_osd.h" Name="CL_MEMO1.H" \r
+                      Source="..\bin\Inc\complib\cl_memory_osd.h" />\r
+                <File Id="cl_mutex.h" Compressed="yes" DiskId="1"\r
+                      LongName="cl_mutex.h" Name="CL_MUTE.H" \r
+                      Source="..\bin\Inc\complib\cl_mutex.h" />\r
+                <File Id="cl_mutex_osd.h" Compressed="yes" DiskId="1"\r
+                      LongName="cl_mutex_osd.h" Name="CL_MUTE1.H" \r
+                      Source="..\bin\Inc\complib\cl_mutex_osd.h" />\r
+                <File Id="cl_obj.h" Compressed="yes" DiskId="1"\r
+                      LongName="cl_obj.h" Name="CL_OBJ.H" \r
+                      Source="..\bin\Inc\complib\cl_obj.h" />\r
+                <File Id="cl_packoff.h" Compressed="yes" DiskId="1"\r
+                      LongName="cl_packoff.h" Name="CL_PACK.H" \r
+                      Source="..\bin\Inc\complib\cl_packoff.h" />\r
+                <File Id="cl_packon.h" Compressed="yes" DiskId="1"\r
+                      LongName="cl_packon.h" Name="CL_PACK1.H" \r
+                      Source="..\bin\Inc\complib\cl_packon.h" />\r
+                <File Id="cl_passivelock.h" Compressed="yes" DiskId="1"\r
+                      LongName="cl_passivelock.h" Name="CL_PASS.H" \r
+                      Source="..\bin\Inc\complib\cl_passivelock.h" />\r
+                <File Id="cl_perf.h" Compressed="yes" DiskId="1"\r
+                      LongName="cl_perf.h" Name="CL_PERF.H" \r
+                      Source="..\bin\Inc\complib\cl_perf.h" />\r
+                <File Id="cl_pool.h" Compressed="yes" DiskId="1"\r
+                      LongName="cl_pool.h" Name="CL_POOL.H" \r
+                      Source="..\bin\Inc\complib\cl_pool.h" />\r
+                <File Id="cl_ptr_vector.h" Compressed="yes" DiskId="1"\r
+                      LongName="cl_ptr_vector.h" Name="CL_PTR_.H" \r
+                      Source="..\bin\Inc\complib\cl_ptr_vector.h" />\r
+                <File Id="cl_qcomppool.h" Compressed="yes" DiskId="1"\r
+                      LongName="cl_qcomppool.h" Name="CL_QCOM.H" \r
+                      Source="..\bin\Inc\complib\cl_qcomppool.h" />\r
+                <File Id="cl_qlist.h" Compressed="yes" DiskId="1"\r
+                      LongName="cl_qlist.h" Name="CL_QLIS.H" \r
+                      Source="..\bin\Inc\complib\cl_qlist.h" />\r
+                <File Id="cl_qlockpool.h" Compressed="yes" DiskId="1"\r
+                      LongName="cl_qlockpool.h" Name="CL_QLOC.H" \r
+                      Source="..\bin\Inc\complib\cl_qlockpool.h" />\r
+                <File Id="cl_qmap.h" Compressed="yes" DiskId="1"\r
+                      LongName="cl_qmap.h" Name="CL_QMAP.H" \r
+                      Source="..\bin\Inc\complib\cl_qmap.h" />\r
+                <File Id="cl_qpool.h" Compressed="yes" DiskId="1"\r
+                      LongName="cl_qpool.h" Name="CL_QPOO.H" \r
+                      Source="..\bin\Inc\complib\cl_qpool.h" />\r
+                <File Id="cl_rbmap.h" Compressed="yes" DiskId="1"\r
+                      LongName="cl_rbmap.h" Name="CL_RBMA.H" \r
+                      Source="..\bin\Inc\complib\cl_rbmap.h" />\r
+                <File Id="cl_reqmgr.h" Compressed="yes" DiskId="1"\r
+                      LongName="cl_reqmgr.h" Name="CL_REQM.H" \r
+                      Source="..\bin\Inc\complib\cl_reqmgr.h" />\r
+                <File Id="cl_spinlock.h" Compressed="yes" DiskId="1"\r
+                      LongName="cl_spinlock.h" Name="CL_SPIN.H" \r
+                      Source="..\bin\Inc\complib\cl_spinlock.h" />\r
+                <File Id="cl_spinlock_osd.h" Compressed="yes" DiskId="1"\r
+                      LongName="cl_spinlock_osd.h" Name="CL_SPIN1.H" \r
+                      Source="..\bin\Inc\complib\cl_spinlock_osd.h" />\r
+                <File Id="cl_syscallback.h" Compressed="yes" DiskId="1"\r
+                      LongName="cl_syscallback.h" Name="CL_SYSC.H" \r
+                      Source="..\bin\Inc\complib\cl_syscallback.h" />\r
+                <File Id="cl_syscallback_osd.h" Compressed="yes" DiskId="1"\r
+                      LongName="cl_syscallback_osd.h" Name="CL_SYSC1.H" \r
+                      Source="..\bin\Inc\complib\cl_syscallback_osd.h" />\r
+                <File Id="cl_thread.h" Compressed="yes" DiskId="1"\r
+                      LongName="cl_thread.h" Name="CL_THRE.H" \r
+                      Source="..\bin\Inc\complib\cl_thread.h" />\r
+                <File Id="cl_thread_osd.h" Compressed="yes" DiskId="1"\r
+                      LongName="cl_thread_osd.h" Name="CL_THRE1.H" \r
+                      Source="..\bin\Inc\complib\cl_thread_osd.h" />\r
+                <File Id="cl_threadpool.h" Compressed="yes" DiskId="1"\r
+                      LongName="cl_threadpool.h" Name="CL_THRE2.H" \r
+                      Source="..\bin\Inc\complib\cl_threadpool.h" />\r
+                <File Id="cl_timer.h" Compressed="yes" DiskId="1"\r
+                      LongName="cl_timer.h" Name="CL_TIME.H" \r
+                      Source="..\bin\Inc\complib\cl_timer.h" />\r
+                <File Id="cl_timer_osd.h" Compressed="yes" DiskId="1"\r
+                      LongName="cl_timer_osd.h" Name="CL_TIME1.H" \r
+                      Source="..\bin\Inc\complib\cl_timer_osd.h" />\r
+                <File Id="cl_types.h" Compressed="yes" DiskId="1"\r
+                      LongName="cl_types.h" Name="CL_TYPE.H" \r
+                      Source="..\bin\Inc\complib\cl_types.h" />\r
+                <File Id="cl_types_osd.h" Compressed="yes" DiskId="1"\r
+                      LongName="cl_types_osd.h" Name="CL_TYPE1.H" \r
+                      Source="..\bin\Inc\complib\cl_types_osd.h" />\r
+                <File Id="cl_vector.h" Compressed="yes" DiskId="1"\r
+                      LongName="cl_vector.h" Name="CL_VECT.H" \r
+                      Source="..\bin\Inc\complib\cl_vector.h" />\r
+                <File Id="cl_waitobj.h" Compressed="yes" DiskId="1"\r
+                      LongName="cl_waitobj.h" Name="CL_WAIT.H" \r
+                      Source="..\bin\Inc\complib\cl_waitobj.h" />\r
+                <File Id="cl_waitobj_osd.h" Compressed="yes" DiskId="1"\r
+                      LongName="cl_waitobj_osd.h" Name="CL_WAIT1.H" \r
+                      Source="..\bin\Inc\complib\cl_waitobj_osd.h" />\r
+                <File Id="comp_lib.h" Compressed="yes" DiskId="1"\r
+                      LongName="comp_lib.h" Name="COMP_LI.H" \r
+                      Source="..\bin\Inc\complib\comp_lib.h" />\r
+              </Component>\r
+            </Directory>\r
+\r
+            <Directory Id="IB_iba" Name="iba">\r
+              <Component Id="cIBAL_IBA"\r
+                         Guid="2EC5C324-734D-4a06-AE35-D7B80D76B77A">\r
+                <CreateFolder />\r
+                <File Id="ib_al.h" Compressed="yes" DiskId="1"\r
+                      LongName="ib_al.h" Name="ib_al.h"\r
+                      Source="..\bin\Inc\iba\ib_al.h" />\r
+                <File Id="ib_al_ioctl.h" Compressed="yes" DiskId="1"\r
+                      LongName="ib_al_ioctl.h" Name="ib_ioctl.h"\r
+                      Source="..\bin\Inc\iba\ib_al_ioctl.h" />\r
+                <File Id="ib_at_ioctl.h" Compressed="yes" DiskId="1"\r
+                      LongName="ib_at_ioctl.h" Name="ib_iocat.h"\r
+                      Source="..\bin\Inc\iba\ib_at_ioctl.h" />\r
+                <File Id="ib_ci.h" Compressed="yes" DiskId="1"\r
+                      LongName="ib_ci.h" Name="ib_ci.h"\r
+                      Source="..\bin\Inc\iba\ib_ci.h" />\r
+                <File Id="ib_types.h" Compressed="yes" DiskId="1"\r
+                      LongName="ib_types.h" Name="ib_types.h"\r
+                      Source="..\bin\Inc\iba\ib_types.h" />\r
+                <File Id="ib_uvp.h" Compressed="yes" DiskId="1"\r
+                      LongName="ib_uvp.h" Name="ib_uvp.h"\r
+                      Source="..\bin\Inc\iba\ib_uvp.h" />\r
+              </Component>\r
+            </Directory>\r
+          </Directory>\r
+\r
+          <Directory Id="IB_samples" Name="Samples">\r
+            <Directory Id="sample_DDK" Name="DDK">\r
+              <Component Id="cDDK_example"\r
+                         Guid="8C27B926-FCFE-4f46-83B4-A27482A5EB3B">\r
+                <CreateFolder />\r
+                    <File Id="cmtest.c" Compressed="yes" DiskId="1"\r
+                          LongName="cmtest.c" Name="cmtest.c"\r
+                          Source="..\bin\misc\cmtest.c" />\r
+                    <File Id="cmtest.rc" Compressed="yes" DiskId="1"\r
+                          LongName="cmtest.rc" Name="cmtest.rc"\r
+                          Source="..\..\SDK_Samples\DDK\cmtest.rc" />\r
+                    <File Id="makefile" Compressed="yes" DiskId="1"\r
+                          LongName="makefile" Name="makefile"\r
+                          Source="..\..\SDK_Samples\DDK\makefile" />\r
+                    <File Id="SOURCES" Compressed="yes" DiskId="1"\r
+                          LongName="SOURCES" Name="SOURCES"\r
+                          Source="..\..\SDK_Samples\DDK\SOURCES" />\r
+                    <File Id="README.txt" Compressed="yes" DiskId="1"\r
+                          LongName="README.txt" Name="README.txt"\r
+                          Source="..\..\SDK_Samples\DDK\README.txt" />\r
+              </Component>\r
+            </Directory>    <!-- End DDK -->\r
+\r
+            <Directory Id="sample_VS" Name="VS">\r
+              <Component Id="cVS_example"\r
+                         Guid="35E03D7E-E943-4346-8F63-7E991AF68F53">\r
+                <CreateFolder />\r
+                    <File Id="vs_cmtest.c" Compressed="yes" DiskId="1"\r
+                          LongName="cmtest.c" Name="cmtest.c"\r
+                          Source="..\bin\misc\cmtest.c" />\r
+                    <File Id="vs_cmtest.rc" Compressed="yes" DiskId="1"\r
+                          LongName="cmtest.rc" Name="cmtest.rc"\r
+                          Source="..\..\SDK_Samples\VS\cmtest.rc" />\r
+                    <File Id="vsREADME.txt" Compressed="yes" DiskId="1"\r
+                          LongName="README.txt" Name="README.txt"\r
+                          Source="..\..\SDK_Samples\VS\README.txt" />\r
+              </Component>\r
+            </Directory>   <!-- End VS -->\r
+          </Directory>   <!-- End Samples -->\r
+        </Directory>  <!-- End IBSDK -->\r
+      </Directory>  <!-- End WinRoot -->\r
+    </Directory>  <!-- End TARGETDIR -->\r
 \r
 <!--\r
     <Property Id='ARPNOMODIFY'>1</Property>\r
       <ComponentRef Id="OpenSMservice" />\r
     </Feature>\r
 \r
+    <Feature Id="fIBsdk" Title="InfiniBand SDK" Level="2"\r
+         Description="InfiniBand Software Development Kit (Headers + Libs)"\r
+         Display="expand" ConfigurableDirectory="INSTALLDIR"\r
+         AllowAdvertise='no' InstallDefault='local' Absent='disallow'>\r
+      <ComponentRef Id="cIBAL_Libs" />\r
+      <ComponentRef Id="cIBAL_Incs" />\r
+      <ComponentRef Id="cIBAL_Complib" />\r
+      <ComponentRef Id="cIBAL_IBA" />\r
+      <ComponentRef Id="cDDK_example" />\r
+      <ComponentRef Id="cVS_example" />\r
+    </Feature>\r
+\r
     <Feature Id="fIPoIB" Title="IPoIB" Level="1"\r
          Description="Internet Protocols over InfiniBand" Display="expand"\r
          ConfigurableDirectory="INSTALLDIR"\r
          Description="DAT-DAPL runtime configuration file; installed if %SystemDrive%\DAT\dat.conf does not exist."\r
          Display="expand" Level="1" \r
          AllowAdvertise='no' InstallDefault='local' Absent='allow'>\r
-        <Condition Level="0"> DAT_CONF_EXISTS AND Not Installed </Condition>\r
+        <Condition Level="0"> Not Installed AND DAT_CONF_EXISTS </Condition>\r
         <ComponentRef Id="cDatCfg" />\r
       </Feature>\r
 \r
index b91664f1c1167b167e2a99bd0173a79bfda5f30c..b436542d615c29650ebbb318c947eda246ee12d8 100644 (file)
@@ -4,17 +4,19 @@
 -->\r
 <Wix xmlns="http://schemas.microsoft.com/wix/2003/01/wi">\r
 \r
-  <Product Name="Windows OpenFabrics InfiniBand v1.0.1"\r
+  <Product Name="Windows OpenFabrics InfiniBand v1.1"\r
    Id="3A6A276E-A636-48e8-8624-9A0DE3F2A15E"\r
    UpgradeCode='E38964D6-359D-4E38-9BBF-8C79D84DF6CF'\r
-   Version="1.0.1"\r
+   Version="1.1.0"\r
    Language="1033" Codepage="1252"\r
    Manufacturer="Open Fabrics Alliance Windows">\r
 \r
    <Package Id="????????-????-????-????-????????????"\r
-    Keywords="Installer, InfiniBand" Description="WinOF Installer"\r
+    Keywords="Installer, InfiniBand, WinOF, OpenFabrics"\r
+    InstallPrivileges='elevated'\r
+    Description="WinOF Installer"\r
     Comments="Open Fabrics Alliance Windows InfiniBand stack"\r
-    Manufacturer="OpenFabrics Alliance Windows" InstallerVersion="100"\r
+    Manufacturer="OpenFabrics Alliance Windows" InstallerVersion="200"\r
     Languages="1033" Compressed="yes" SummaryCodepage="1252" />\r
 \r
     <Condition Message="Administrator required to install [ProductName].">\r
@@ -69,7 +71,7 @@
        SC_EXISTS\r
     </Condition>\r
     <Media Id="1" Cabinet="Data1.cab" EmbedCab="yes" DiskPrompt="CD-ROM #1" />\r
-    <Property Id="DiskPrompt" Value="WinOF 1.0 Installation [1]" />\r
+    <Property Id="DiskPrompt" Value="WinOF 1.1 Installation [1]" />\r
 \r
     <Directory Id="TARGETDIR" Name="SourceDir">\r
         <Directory Id="ProgramMenuFolder" Name="PMenu" LongName="Programs">\r
@@ -88,7 +90,7 @@
                    <!-- implies WIX build only from an svn structured tree.  -->\r
                     <File Id="manual.htm" Compressed="yes" DiskId="1"\r
                           Name="Manual.htm" LongName="Manual.htm" Vital="yes"\r
-                          Source="..\..\..\..\trunk\docs\Manual.htm" /> \r
+                          Source="..\bin\Misc\Manual.htm" /> \r
 \r
                     <Shortcut Id="Manual.htm" Directory="ProgramMenuDir"\r
                           Name="Manual.htm" LongName="Manual"\r
                            Guid="3A148CF8-129D-4AE0-A769-5FC0E0828B5E">\r
                 </Component>\r
             </Directory>\r
-        </Directory>\r
-    </Directory> <!-- End TARGETDIR -->\r
-\r
-    <!-- copy DAT header files to\r
-           %SystemDrive%\DAT\v1-1\DAT\r
-           %SystemDrive%\DAT\v2-0\DAT\r
-     -->\r
-    <Directory Id="WindowsVolume" Name="Root" SourceName="WinRoot">\r
+          </Directory>\r
 \r
-       <Directory Id="dDATD" Name="DAT">\r
-          <Component Id="cDatCfg" Guid="54A4F997-AC33-45D8-9899-6332E40B62A8" >\r
-            <File Id="_dat.conf" Compressed="yes" DiskId="1" KeyPath="yes"\r
-                   LongName="dat.conf" Name="dat.conf"\r
-                   Source="..\dat.conf" />\r
-          </Component>\r
+      <!-- copy DAT header files to\r
+             %SystemDrive%\DAT\v1-1\DAT\r
+             %SystemDrive%\DAT\v2-0\DAT\r
+       -->\r
+      <Directory Id="WindowsVolume" Name="Root" SourceName="WinRoot">\r
 \r
-          <Directory Id="v1_1" Name="v1-1">\r
-            <Component Id="cDATV1" Guid="D8EB75CB-8DE0-41B1-904B-CED87C893049">\r
+         <Directory Id="dDATD" Name="DAT">\r
+            <Component Id="cDatCfg" Guid="54A4F997-AC33-45D8-9899-6332E40B62A8" >\r
               <CreateFolder />\r
+              <File Id="_dat.conf" Compressed="yes" DiskId="1" KeyPath="yes"\r
+                     LongName="dat.conf" Name="dat.conf"\r
+                     Source="..\dat.conf" />\r
             </Component>\r
-            <Directory Id="DDID" Name="DAT">    \r
-              <Component Id="cDatBldV1Hdrs"\r
-                         Guid="AA6BB350-5146-452F-B5F0-80BB9E3B0F55">    \r
-                <CreateFolder />    \r
-                <File Id="dat.h" Compressed="yes" DiskId="1"    \r
-                      LongName="dat.h" Name="dat.h"    \r
-                      Source="..\bin\DAPL\dat.h" />    \r
-\r
-                <File Id="dat_error.h" Compressed="yes" DiskId="1"    \r
-                      LongName="dat_error.h" Name="dat.h"    \r
-                      Source="..\bin\DAPL\dat_error.h" />    \r
-       \r
-                <File Id="dat_platform_specific.h" Compressed="yes"    \r
-                      DiskId="1" LongName="dat_platform_specific.h"    \r
-                      Name="dat_plat.h"    \r
-                     Source="..\bin\DAPL\dat_platform_specific.h" />    \r
-       \r
-                <File Id="dat_redirection.h" Compressed="yes"    \r
-                      DiskId="1" LongName="dat_redirection.h"    \r
-                      Name="dat_redi.h"    \r
-                      Source="..\bin\DAPL\dat_redirection.h" />    \r
-       \r
-                <File Id="dat_registry.h" Compressed="yes"    \r
-                      DiskId="1" LongName="dat_registry.h"    \r
-                      Name="dat_reg.h"    \r
-                      Source="..\bin\DAPL\dat_registry.h" />    \r
-       \r
-                <File Id="dat_vendor_specific.h" Compressed="yes"    \r
-                      DiskId="1" LongName="dat_vendor_specific.h"    \r
-                      Name="dat_vend.h"    \r
-                      Source="..\bin\DAPL\dat_vendor_specific.h" />    \r
-       \r
-                <File Id="udat.h" Compressed="yes" DiskId="1"    \r
-                      LongName="udat.h" Name="udat.h"    \r
-                      Source="..\bin\DAPL\udat.h" />    \r
-       \r
-                <File Id="udat_config.h" Compressed="yes" DiskId="1"    \r
-                      LongName="udat_config.h" Name="udat_cfg.h"    \r
-                      Source="..\bin\DAPL\udat_config.h" />    \r
-       \r
-                <File Id="udat_redirection.h" Compressed="yes"    \r
-                      DiskId="1" LongName="udat_redirection.h"    \r
-                      Name="udat_red.h"    \r
-                      Source="..\bin\DAPL\udat_redirection.h" />    \r
-       \r
-                <File Id="udat_vendor_specific.h" Compressed="yes"    \r
-                      DiskId="1" LongName="udat_vendor_specific.h"    \r
-                      Name="udat_ven.h"    \r
-                      Source="..\bin\DAPL\udat_vendor_specific.h" />    \r
-              </Component>\r
-            </Directory>\r
-\r
-            <Component Id="cDatBldV1Libs"\r
-                        Guid="1BB9291E-79F5-4EC5-9400-4175BA1E5A91">    \r
-                <File Id="dat.lib" Compressed="yes" DiskId="1"\r
-                      LongName="dat.lib" Name="dat.lib"\r
-                      Source="..\bin\DAPL\x86\dat.lib" />\r
 \r
-                <File Id="datd.lib" Compressed="yes" DiskId="1"\r
-                      LongName="datd.lib" Name="datd.lib"\r
-                      Source="..\bin\DAPL\x86\datd.lib" />\r
-            </Component>\r
-          </Directory>\r
+            <Directory Id="v1_1" Name="v1-1">\r
+              <Component Id="cDATV1" Guid="D8EB75CB-8DE0-41B1-904B-CED87C893049">\r
+                <CreateFolder />\r
+              </Component>\r
+              <Directory Id="DDID" Name="DAT">    \r
+                <Component Id="cDatBldV1Hdrs"\r
+                           Guid="AA6BB350-5146-452F-B5F0-80BB9E3B0F55">    \r
+                  <CreateFolder />    \r
+                  <File Id="dat.h" Compressed="yes" DiskId="1"    \r
+                        LongName="dat.h" Name="dat.h"    \r
+                        Source="..\bin\DAPL\dat.h" />    \r
+\r
+                  <File Id="dat_error.h" Compressed="yes" DiskId="1"    \r
+                        LongName="dat_error.h" Name="dat.h"    \r
+                        Source="..\bin\DAPL\dat_error.h" />    \r
+         \r
+                  <File Id="dat_platform_specific.h" Compressed="yes"    \r
+                        DiskId="1" LongName="dat_platform_specific.h"    \r
+                        Name="dat_plat.h"    \r
+                       Source="..\bin\DAPL\dat_platform_specific.h" />    \r
+         \r
+                  <File Id="dat_redirection.h" Compressed="yes"    \r
+                        DiskId="1" LongName="dat_redirection.h"    \r
+                        Name="dat_redi.h"    \r
+                        Source="..\bin\DAPL\dat_redirection.h" />    \r
+         \r
+                  <File Id="dat_registry.h" Compressed="yes"    \r
+                        DiskId="1" LongName="dat_registry.h"    \r
+                        Name="dat_reg.h"    \r
+                        Source="..\bin\DAPL\dat_registry.h" />    \r
+         \r
+                  <File Id="dat_vendor_specific.h" Compressed="yes"    \r
+                        DiskId="1" LongName="dat_vendor_specific.h"    \r
+                        Name="dat_vend.h"    \r
+                        Source="..\bin\DAPL\dat_vendor_specific.h" />    \r
+         \r
+                  <File Id="udat.h" Compressed="yes" DiskId="1"    \r
+                        LongName="udat.h" Name="udat.h"    \r
+                        Source="..\bin\DAPL\udat.h" />    \r
+         \r
+                  <File Id="udat_config.h" Compressed="yes" DiskId="1"    \r
+                        LongName="udat_config.h" Name="udat_cfg.h"    \r
+                        Source="..\bin\DAPL\udat_config.h" />    \r
+         \r
+                  <File Id="udat_redirection.h" Compressed="yes"    \r
+                        DiskId="1" LongName="udat_redirection.h"    \r
+                        Name="udat_red.h"    \r
+                        Source="..\bin\DAPL\udat_redirection.h" />    \r
+         \r
+                  <File Id="udat_vendor_specific.h" Compressed="yes"    \r
+                        DiskId="1" LongName="udat_vendor_specific.h"    \r
+                        Name="udat_ven.h"    \r
+                        Source="..\bin\DAPL\udat_vendor_specific.h" />    \r
+                </Component>\r
+              </Directory>\r
 \r
-          <Directory Id="v2_0" Name="v2-0">\r
-            <Component Id="cDATV2" Guid="A3CD6CA7-309B-48D2-B375-C9A91B37A876">\r
-              <CreateFolder />\r
-            </Component>\r
+              <Component Id="cDatBldV1Libs"\r
+                          Guid="1BB9291E-79F5-4EC5-9400-4175BA1E5A91">    \r
+                  <File Id="dat.lib" Compressed="yes" DiskId="1"\r
+                        LongName="dat.lib" Name="dat.lib"\r
+                        Source="..\bin\DAPL\x86\dat.lib" />\r
 \r
-            <Directory Id="DDID2" Name="DAT">    \r
-              <Component Id="cDatBldV2Hdrs"\r
-                        Guid="4D688030-53AC-4351-8999-E3AFEB38A92C" >    \r
-                <CreateFolder />    \r
-                <File Id="_dat.h" Compressed="yes" DiskId="1"    \r
-                      LongName="dat.h" Name="dat.h"    \r
-                      Source="..\bin\DAPL2\dat.h" />    \r
-\r
-                <File Id="_dat_error.h" Compressed="yes" DiskId="1"    \r
-                      LongName="dat_error.h" Name="dat.h"    \r
-                      Source="..\bin\DAPL2\dat_error.h" />    \r
-       \r
-                <File Id="_dat_platform_specific.h" Compressed="yes"    \r
-                      DiskId="1" LongName="dat_platform_specific.h"    \r
-                      Name="dat_plat.h"    \r
-                     Source="..\bin\DAPL2\dat_platform_specific.h" />    \r
-       \r
-                <File Id="_dat_redirection.h" Compressed="yes"    \r
-                      DiskId="1" LongName="dat_redirection.h"    \r
-                      Name="dat_redi.h"    \r
-                      Source="..\bin\DAPL2\dat_redirection.h" />    \r
-       \r
-                <File Id="_dat_registry.h" Compressed="yes"    \r
-                      DiskId="1" LongName="dat_registry.h"    \r
-                      Name="dat_reg.h"    \r
-                      Source="..\bin\DAPL2\dat_registry.h" />    \r
-       \r
-                <File Id="_dat_vendor_specific.h" Compressed="yes"    \r
-                      DiskId="1" LongName="dat_vendor_specific.h"    \r
-                      Name="dat_vend.h"    \r
-                      Source="..\bin\DAPL2\dat_vendor_specific.h" />    \r
-       \r
-                <File Id="_udat.h" Compressed="yes" DiskId="1"    \r
-                      LongName="udat.h" Name="udat.h"    \r
-                      Source="..\bin\DAPL2\udat.h" />    \r
-       \r
-                <File Id="_udat_config.h" Compressed="yes" DiskId="1"    \r
-                      LongName="udat_config.h" Name="udat_cfg.h"    \r
-                      Source="..\bin\DAPL2\udat_config.h" />    \r
-       \r
-                <File Id="_udat_redirection.h" Compressed="yes"    \r
-                      DiskId="1" LongName="udat_redirection.h"    \r
-                      Name="udat_red.h"    \r
-                      Source="..\bin\DAPL2\udat_redirection.h" />    \r
-       \r
-                <File Id="_udat_vendor_specific.h" Compressed="yes"    \r
-                      DiskId="1" LongName="udat_vendor_specific.h"    \r
-                      Name="udat_ven.h"    \r
-                      Source="..\bin\DAPL2\udat_vendor_specific.h" />    \r
+                  <File Id="datd.lib" Compressed="yes" DiskId="1"\r
+                        LongName="datd.lib" Name="datd.lib"\r
+                        Source="..\bin\DAPL\x86\datd.lib" />\r
               </Component>\r
             </Directory>\r
 \r
-            <Component Id="cDatBldV2Libs"\r
-                        Guid="4DCE2855-1F42-4A7D-957A-44A47715C051" >    \r
+            <Directory Id="v2_0" Name="v2-0">\r
+              <Component Id="cDATV2" Guid="A3CD6CA7-309B-48D2-B375-C9A91B37A876">\r
+                <CreateFolder />\r
+              </Component>\r
+\r
+              <Directory Id="DDID2" Name="DAT">    \r
+                <Component Id="cDatBldV2Hdrs"\r
+                          Guid="4D688030-53AC-4351-8999-E3AFEB38A92C" >    \r
+                  <CreateFolder />    \r
+                  <File Id="_dat.h" Compressed="yes" DiskId="1"    \r
+                        LongName="dat.h" Name="dat.h"    \r
+                        Source="..\bin\DAPL2\dat.h" />    \r
+\r
+                  <File Id="_dat_error.h" Compressed="yes" DiskId="1"    \r
+                        LongName="dat_error.h" Name="dat.h"    \r
+                        Source="..\bin\DAPL2\dat_error.h" />    \r
+         \r
+                  <File Id="_dat_platform_specific.h" Compressed="yes"    \r
+                        DiskId="1" LongName="dat_platform_specific.h"    \r
+                        Name="dat_plat.h"    \r
+                       Source="..\bin\DAPL2\dat_platform_specific.h" />    \r
+         \r
+                  <File Id="_dat_redirection.h" Compressed="yes"    \r
+                        DiskId="1" LongName="dat_redirection.h"    \r
+                        Name="dat_redi.h"    \r
+                        Source="..\bin\DAPL2\dat_redirection.h" />    \r
+         \r
+                  <File Id="_dat_registry.h" Compressed="yes"    \r
+                        DiskId="1" LongName="dat_registry.h"    \r
+                        Name="dat_reg.h"    \r
+                        Source="..\bin\DAPL2\dat_registry.h" />    \r
+         \r
+                  <File Id="_dat_vendor_specific.h" Compressed="yes"    \r
+                        DiskId="1" LongName="dat_vendor_specific.h"    \r
+                        Name="dat_vend.h"    \r
+                        Source="..\bin\DAPL2\dat_vendor_specific.h" />    \r
+         \r
+                  <File Id="_udat.h" Compressed="yes" DiskId="1"    \r
+                        LongName="udat.h" Name="udat.h"    \r
+                        Source="..\bin\DAPL2\udat.h" />    \r
+         \r
+                  <File Id="_udat_config.h" Compressed="yes" DiskId="1"    \r
+                        LongName="udat_config.h" Name="udat_cfg.h"    \r
+                        Source="..\bin\DAPL2\udat_config.h" />    \r
+         \r
+                  <File Id="_udat_redirection.h" Compressed="yes"    \r
+                        DiskId="1" LongName="udat_redirection.h"    \r
+                        Name="udat_red.h"    \r
+                        Source="..\bin\DAPL2\udat_redirection.h" />    \r
+         \r
+                  <File Id="_udat_vendor_specific.h" Compressed="yes"    \r
+                        DiskId="1" LongName="udat_vendor_specific.h"    \r
+                        Name="udat_ven.h"    \r
+                        Source="..\bin\DAPL2\udat_vendor_specific.h" />    \r
+                </Component>\r
+              </Directory>\r
+\r
+              <Component Id="cDatBldV2Libs"\r
+                          Guid="4DCE2855-1F42-4A7D-957A-44A47715C051" >    \r
 \r
-                <File Id="dat2.lib" Compressed="yes" DiskId="1"\r
-                      LongName="dat2.lib" Name="dat2.lib"\r
-                      Source="..\bin\DAPL2\x86\dat2.lib" />\r
+                  <File Id="dat2.lib" Compressed="yes" DiskId="1"\r
+                        LongName="dat2.lib" Name="dat2.lib"\r
+                        Source="..\bin\DAPL2\x86\dat2.lib" />\r
 \r
-                <File Id="dat2d.lib" Compressed="yes" DiskId="1"\r
-                      LongName="dat2d.lib" Name="dat2d.lib"\r
-                      Source="..\bin\DAPL2\x86\dat2d.lib" />\r
-            </Component>    \r
-          </Directory>\r
-       </Directory>\r
+                  <File Id="dat2d.lib" Compressed="yes" DiskId="1"\r
+                        LongName="dat2d.lib" Name="dat2d.lib"\r
+                        Source="..\bin\DAPL2\x86\dat2d.lib" />\r
+              </Component>    \r
+            </Directory>\r
+         </Directory>  <!-- End DAT -->\r
+\r
+         <!-- setup IBSDK file structure -->\r
+         <Directory Id="IBSDK" Name="IBSDK">\r
+           <Directory Id="IB_libs" Name="lib">\r
+             <Component Id="cIBAL_Libs"\r
+                        Guid="12E15947-F84E-49d0-B5DF-FFC505C3F5C9">\r
+               <CreateFolder />\r
+               <File Id="ibal.lib" Compressed="yes" DiskId="1"\r
+                     LongName="ibal.lib" Name="ibal.lib"\r
+                     Source="..\bin\HCA\x86\ibal.lib" />\r
+               <File Id="ibal.pdb" Compressed="yes" DiskId="1"\r
+                     LongName="ibal.pdb" Name="ibal.pdb"\r
+                     Source="..\bin\HCA\x86\ibal.pdb" />\r
+               <File Id="complib.lib" Compressed="yes" DiskId="1"\r
+                     LongName="complib.lib" Name="complib.lib"\r
+                     Source="..\bin\HCA\x86\complib.lib" />\r
+               <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
+             </Component>\r
+           </Directory>\r
+\r
+           <Directory Id="IB_inc" Name="Inc">\r
+             <Component Id="cIBAL_Incs"\r
+                        Guid="54C2903E-65DF-4c62-B31D-21DB1AFB5819">\r
+               <CreateFolder />\r
+\r
+               <File Id="oib_ver.h" Compressed="yes" DiskId="1"\r
+                     LongName="oib_ver.h" Name="oib_ver.h"\r
+                     Source="..\bin\Inc\oib_ver.h" />\r
+               <File Id="openib.def" Compressed="yes" DiskId="1"\r
+                     LongName="openib.def" Name="openib.def"\r
+                     Source="..\bin\Inc\openib.def" />\r
+             </Component>\r
+\r
+             <Directory Id="IB_complib" Name="complib">\r
+               <Component Id="cIBAL_Complib"\r
+                          Guid="9F9EE1F2-5ACE-47c7-89F8-B0EA1D4363AF">\r
+                 <CreateFolder />\r
+                 <File Id="cl_async_proc.h" Compressed="yes" DiskId="1"\r
+                       LongName="cl_async_proc.h" Name="CL_ASYN.H" \r
+                       Source="..\bin\Inc\complib\cl_async_proc.h" />\r
+                 <File Id="cl_atomic.h" Compressed="yes" DiskId="1"\r
+                       LongName="cl_atomic.h" Name="CL_ATOM.H" \r
+                       Source="..\bin\Inc\complib\cl_atomic.h" />\r
+                 <File Id="cl_atomic_osd.h" Compressed="yes" DiskId="1"\r
+                       LongName="cl_atomic_osd.h" Name="CL_ATOM1.H" \r
+                       Source="..\bin\Inc\complib\cl_atomic_osd.h" />\r
+                 <File Id="cl_byteswap.h" Compressed="yes" DiskId="1"\r
+                       LongName="cl_byteswap.h" Name="CL_BYTE.H" \r
+                       Source="..\bin\Inc\complib\cl_byteswap.h" />\r
+                 <File Id="cl_byteswap_osd.h" Compressed="yes" DiskId="1"\r
+                       LongName="cl_byteswap_osd.h" Name="CL_BYTE1.H" \r
+                       Source="..\bin\Inc\complib\cl_byteswap_osd.h" />\r
+                 <File Id="cl_comppool.h" Compressed="yes" DiskId="1"\r
+                       LongName="cl_comppool.h" Name="CL_COMP.H" \r
+                       Source="..\bin\Inc\complib\cl_comppool.h" />\r
+                 <File Id="cl_debug.h" Compressed="yes" DiskId="1"\r
+                       LongName="cl_debug.h" Name="CL_DEBU.H" \r
+                       Source="..\bin\Inc\complib\cl_debug.h" />\r
+                 <File Id="cl_debug_osd.h" Compressed="yes" DiskId="1"\r
+                       LongName="cl_debug_osd.h" Name="CL_DEBU1.H" \r
+                       Source="..\bin\Inc\complib\cl_debug_osd.h" />\r
+                 <File Id="cl_event.h" Compressed="yes" DiskId="1"\r
+                       LongName="cl_event.h" Name="CL_EVEN.H" \r
+                       Source="..\bin\Inc\complib\cl_event.h" />\r
+                 <File Id="cl_event_osd.h" Compressed="yes" DiskId="1"\r
+                       LongName="cl_event_osd.h" Name="CL_EVEN1.H" \r
+                       Source="..\bin\Inc\complib\cl_event_osd.h" />\r
+                 <File Id="cl_fleximap.h" Compressed="yes" DiskId="1"\r
+                       LongName="cl_fleximap.h" Name="CL_FLEX.H" \r
+                       Source="..\bin\Inc\complib\cl_fleximap.h" />\r
+                 <File Id="cl_ioctl.h" Compressed="yes" DiskId="1"\r
+                       LongName="cl_ioctl.h" Name="CL_IOCT.H" \r
+                       Source="..\bin\Inc\complib\cl_ioctl.h" />\r
+                 <File Id="cl_ioctl_osd.h" Compressed="yes" DiskId="1"\r
+                       LongName="cl_ioctl_osd.h" Name="CL_IOCT1.H" \r
+                       Source="..\bin\Inc\complib\cl_ioctl_osd.h" />\r
+                 <File Id="cl_irqlock.h" Compressed="yes" DiskId="1"\r
+                       LongName="cl_irqlock.h" Name="CL_IRQL.H" \r
+                       Source="..\bin\Inc\complib\cl_irqlock.h" />\r
+                 <File Id="cl_list.h" Compressed="yes" DiskId="1"\r
+                       LongName="cl_list.h" Name="CL_LIST.H" \r
+                       Source="..\bin\Inc\complib\cl_list.h" />\r
+                 <File Id="cl_log.h" Compressed="yes" DiskId="1"\r
+                       LongName="cl_log.h" Name="CL_LOG.H" \r
+                       Source="..\bin\Inc\complib\cl_log.h" />\r
+                 <File Id="cl_map.h" Compressed="yes" DiskId="1"\r
+                       LongName="cl_map.h" Name="CL_MAP.H" \r
+                       Source="..\bin\Inc\complib\cl_map.h" />\r
+                 <File Id="cl_math.h" Compressed="yes" DiskId="1"\r
+                       LongName="cl_math.h" Name="CL_MATH.H" \r
+                       Source="..\bin\Inc\complib\cl_math.h" />\r
+                 <File Id="cl_memory.h" Compressed="yes" DiskId="1"\r
+                       LongName="cl_memory.h" Name="CL_MEMO.H" \r
+                       Source="..\bin\Inc\complib\cl_memory.h" />\r
+                 <File Id="cl_memory_osd.h" Compressed="yes" DiskId="1"\r
+                       LongName="cl_memory_osd.h" Name="CL_MEMO1.H" \r
+                       Source="..\bin\Inc\complib\cl_memory_osd.h" />\r
+                 <File Id="cl_mutex.h" Compressed="yes" DiskId="1"\r
+                       LongName="cl_mutex.h" Name="CL_MUTE.H" \r
+                       Source="..\bin\Inc\complib\cl_mutex.h" />\r
+                 <File Id="cl_mutex_osd.h" Compressed="yes" DiskId="1"\r
+                       LongName="cl_mutex_osd.h" Name="CL_MUTE1.H" \r
+                       Source="..\bin\Inc\complib\cl_mutex_osd.h" />\r
+                 <File Id="cl_obj.h" Compressed="yes" DiskId="1"\r
+                       LongName="cl_obj.h" Name="CL_OBJ.H" \r
+                       Source="..\bin\Inc\complib\cl_obj.h" />\r
+                 <File Id="cl_packoff.h" Compressed="yes" DiskId="1"\r
+                       LongName="cl_packoff.h" Name="CL_PACK.H" \r
+                       Source="..\bin\Inc\complib\cl_packoff.h" />\r
+                 <File Id="cl_packon.h" Compressed="yes" DiskId="1"\r
+                       LongName="cl_packon.h" Name="CL_PACK1.H" \r
+                       Source="..\bin\Inc\complib\cl_packon.h" />\r
+                 <File Id="cl_passivelock.h" Compressed="yes" DiskId="1"\r
+                       LongName="cl_passivelock.h" Name="CL_PASS.H" \r
+                       Source="..\bin\Inc\complib\cl_passivelock.h" />\r
+                 <File Id="cl_perf.h" Compressed="yes" DiskId="1"\r
+                       LongName="cl_perf.h" Name="CL_PERF.H" \r
+                       Source="..\bin\Inc\complib\cl_perf.h" />\r
+                 <File Id="cl_pool.h" Compressed="yes" DiskId="1"\r
+                       LongName="cl_pool.h" Name="CL_POOL.H" \r
+                       Source="..\bin\Inc\complib\cl_pool.h" />\r
+                 <File Id="cl_ptr_vector.h" Compressed="yes" DiskId="1"\r
+                       LongName="cl_ptr_vector.h" Name="CL_PTR_.H" \r
+                       Source="..\bin\Inc\complib\cl_ptr_vector.h" />\r
+                 <File Id="cl_qcomppool.h" Compressed="yes" DiskId="1"\r
+                       LongName="cl_qcomppool.h" Name="CL_QCOM.H" \r
+                       Source="..\bin\Inc\complib\cl_qcomppool.h" />\r
+                 <File Id="cl_qlist.h" Compressed="yes" DiskId="1"\r
+                       LongName="cl_qlist.h" Name="CL_QLIS.H" \r
+                       Source="..\bin\Inc\complib\cl_qlist.h" />\r
+                 <File Id="cl_qlockpool.h" Compressed="yes" DiskId="1"\r
+                       LongName="cl_qlockpool.h" Name="CL_QLOC.H" \r
+                       Source="..\bin\Inc\complib\cl_qlockpool.h" />\r
+                 <File Id="cl_qmap.h" Compressed="yes" DiskId="1"\r
+                       LongName="cl_qmap.h" Name="CL_QMAP.H" \r
+                       Source="..\bin\Inc\complib\cl_qmap.h" />\r
+                 <File Id="cl_qpool.h" Compressed="yes" DiskId="1"\r
+                       LongName="cl_qpool.h" Name="CL_QPOO.H" \r
+                       Source="..\bin\Inc\complib\cl_qpool.h" />\r
+                 <File Id="cl_rbmap.h" Compressed="yes" DiskId="1"\r
+                       LongName="cl_rbmap.h" Name="CL_RBMA.H" \r
+                       Source="..\bin\Inc\complib\cl_rbmap.h" />\r
+                 <File Id="cl_reqmgr.h" Compressed="yes" DiskId="1"\r
+                       LongName="cl_reqmgr.h" Name="CL_REQM.H" \r
+                       Source="..\bin\Inc\complib\cl_reqmgr.h" />\r
+                 <File Id="cl_spinlock.h" Compressed="yes" DiskId="1"\r
+                       LongName="cl_spinlock.h" Name="CL_SPIN.H" \r
+                       Source="..\bin\Inc\complib\cl_spinlock.h" />\r
+                 <File Id="cl_spinlock_osd.h" Compressed="yes" DiskId="1"\r
+                       LongName="cl_spinlock_osd.h" Name="CL_SPIN1.H" \r
+                       Source="..\bin\Inc\complib\cl_spinlock_osd.h" />\r
+                 <File Id="cl_syscallback.h" Compressed="yes" DiskId="1"\r
+                       LongName="cl_syscallback.h" Name="CL_SYSC.H" \r
+                       Source="..\bin\Inc\complib\cl_syscallback.h" />\r
+                 <File Id="cl_syscallback_osd.h" Compressed="yes"\r
+                       DiskId="1"\r
+                       LongName="cl_syscallback_osd.h" Name="CL_SYSC1.H" \r
+                      Source="..\bin\Inc\complib\cl_syscallback_osd.h" />\r
+                 <File Id="cl_thread.h" Compressed="yes" DiskId="1"\r
+                       LongName="cl_thread.h" Name="CL_THRE.H" \r
+                       Source="..\bin\Inc\complib\cl_thread.h" />\r
+                 <File Id="cl_thread_osd.h" Compressed="yes" DiskId="1"\r
+                       LongName="cl_thread_osd.h" Name="CL_THRE1.H" \r
+                       Source="..\bin\Inc\complib\cl_thread_osd.h" />\r
+                 <File Id="cl_threadpool.h" Compressed="yes" DiskId="1"\r
+                       LongName="cl_threadpool.h" Name="CL_THRE2.H" \r
+                       Source="..\bin\Inc\complib\cl_threadpool.h" />\r
+                 <File Id="cl_timer.h" Compressed="yes" DiskId="1"\r
+                       LongName="cl_timer.h" Name="CL_TIME.H" \r
+                       Source="..\bin\Inc\complib\cl_timer.h" />\r
+                 <File Id="cl_timer_osd.h" Compressed="yes" DiskId="1"\r
+                       LongName="cl_timer_osd.h" Name="CL_TIME1.H" \r
+                       Source="..\bin\Inc\complib\cl_timer_osd.h" />\r
+                 <File Id="cl_types.h" Compressed="yes" DiskId="1"\r
+                       LongName="cl_types.h" Name="CL_TYPE.H" \r
+                       Source="..\bin\Inc\complib\cl_types.h" />\r
+                 <File Id="cl_types_osd.h" Compressed="yes" DiskId="1"\r
+                       LongName="cl_types_osd.h" Name="CL_TYPE1.H" \r
+                       Source="..\bin\Inc\complib\cl_types_osd.h" />\r
+                 <File Id="cl_vector.h" Compressed="yes" DiskId="1"\r
+                       LongName="cl_vector.h" Name="CL_VECT.H" \r
+                       Source="..\bin\Inc\complib\cl_vector.h" />\r
+                 <File Id="cl_waitobj.h" Compressed="yes" DiskId="1"\r
+                       LongName="cl_waitobj.h" Name="CL_WAIT.H" \r
+                       Source="..\bin\Inc\complib\cl_waitobj.h" />\r
+                 <File Id="cl_waitobj_osd.h" Compressed="yes" DiskId="1"\r
+                       LongName="cl_waitobj_osd.h" Name="CL_WAIT1.H" \r
+                       Source="..\bin\Inc\complib\cl_waitobj_osd.h" />\r
+                 <File Id="comp_lib.h" Compressed="yes" DiskId="1"\r
+                       LongName="comp_lib.h" Name="COMP_LI.H" \r
+                       Source="..\bin\Inc\complib\comp_lib.h" />\r
+               </Component>\r
+             </Directory>\r
+\r
+             <Directory Id="IB_iba" Name="iba">\r
+               <Component Id="cIBAL_IBA"\r
+                          Guid="2EC5C324-734D-4a06-AE35-D7B80D76B77A">\r
+                 <CreateFolder />\r
+                 <File Id="ib_al.h" Compressed="yes" DiskId="1"\r
+                       LongName="ib_al.h" Name="ib_al.h"\r
+                       Source="..\bin\Inc\iba\ib_al.h" />\r
+                 <File Id="ib_al_ioctl.h" Compressed="yes" DiskId="1"\r
+                       LongName="ib_al_ioctl.h" Name="ib_ioctl.h"\r
+                       Source="..\bin\Inc\iba\ib_al_ioctl.h" />\r
+                 <File Id="ib_at_ioctl.h" Compressed="yes" DiskId="1"\r
+                       LongName="ib_at_ioctl.h" Name="ib_iocat.h"\r
+                       Source="..\bin\Inc\iba\ib_at_ioctl.h" />\r
+                 <File Id="ib_ci.h" Compressed="yes" DiskId="1"\r
+                       LongName="ib_ci.h" Name="ib_ci.h"\r
+                       Source="..\bin\Inc\iba\ib_ci.h" />\r
+                 <File Id="ib_types.h" Compressed="yes" DiskId="1"\r
+                       LongName="ib_types.h" Name="ib_types.h"\r
+                       Source="..\bin\Inc\iba\ib_types.h" />\r
+                 <File Id="ib_uvp.h" Compressed="yes" DiskId="1"\r
+                       LongName="ib_uvp.h" Name="ib_uvp.h"\r
+                       Source="..\bin\Inc\iba\ib_uvp.h" />\r
+               </Component>\r
+             </Directory>\r
+           </Directory>\r
+\r
+          <Directory Id="IB_samples" Name="Samples">\r
+            <Directory Id="sample_DDK" Name="DDK">\r
+              <Component Id="cDDK_example"\r
+                         Guid="8C27B926-FCFE-4f46-83B4-A27482A5EB3B">\r
+                <CreateFolder />\r
+                    <File Id="cmtest.c" Compressed="yes" DiskId="1"\r
+                          LongName="cmtest.c" Name="cmtest.c"\r
+                          Source="..\bin\Misc\cmtest.c" />\r
+                    <File Id="makefile" Compressed="yes" DiskId="1"\r
+                          LongName="makefile" Name="makefile"\r
+                          Source="..\..\SDK_Samples\DDK\makefile" />\r
+                    <File Id="SOURCES" Compressed="yes" DiskId="1"\r
+                          LongName="SOURCES" Name="SOURCES"\r
+                          Source="..\..\SDK_Samples\DDK\SOURCES" />\r
+                    <File Id="README.txt" Compressed="yes" DiskId="1"\r
+                          LongName="README.txt" Name="README.txt"\r
+                          Source="..\..\SDK_Samples\DDK\README.txt" />\r
+              </Component>\r
+            </Directory>    <!-- End DDK -->\r
+\r
+              <Directory Id="sample_VS" Name="VS">\r
+                <Component Id="cVS_example"\r
+                           Guid="35E03D7E-E943-4346-8F63-7E991AF68F53">\r
+                  <CreateFolder />\r
+                    <File Id="vs_cmtest.c" Compressed="yes" DiskId="1"\r
+                          LongName="cmtest.c" Name="cmtest.c"\r
+                          Source="..\bin\misc\cmtest.c" />\r
+                      <File Id="vscmtest.rc" Compressed="yes" DiskId="1"\r
+                            LongName="cmtest.rc" Name="cmtest.rc"\r
+                            Source="..\..\SDK_Samples\VS\cmtest.rc" />\r
+                      <File Id="vsREADME.txt" Compressed="yes" DiskId="1"\r
+                            LongName="README.txt" Name="README.txt"\r
+                            Source="..\..\SDK_Samples\VS\README.txt" />\r
+                </Component>\r
+              </Directory>    <!-- End VS -->\r
+          </Directory>    <!-- End Samples -->\r
+         </Directory>  <!-- End IBSDK -->\r
 \r
-    </Directory>\r
+      </Directory>  <!-- End WinRoot -->\r
+    </Directory> <!-- End TARGETDIR -->\r
 \r
     <Property Id='ARPCOMMENTS'>OpenFabrics Windows InfiniBand</Property>\r
     <Property Id='ARPCONTACT'>Openfabrics Alliance [www.openfabrics.org]</Property>\r
         <ComponentRef Id="HcaDriver" />\r
         <ComponentRef Id="OpenSMservice" />\r
     </Feature>\r
+\r
+    <Feature Id="fIBskd" Title="InfiniBand SDK" Level="2"\r
+         Description="InfiniBand Software Development Kit (Headers + Libs)"\r
+         Display="expand" ConfigurableDirectory="INSTALLDIR"\r
+         AllowAdvertise='no' InstallDefault='local' Absent='disallow'>\r
+      <ComponentRef Id="cIBAL_Libs" />\r
+      <ComponentRef Id="cIBAL_Incs" />\r
+      <ComponentRef Id="cIBAL_Complib" />\r
+      <ComponentRef Id="cIBAL_IBA" />\r
+      <ComponentRef Id="cDDK_example" />\r
+      <ComponentRef Id="cVS_example" />\r
+    </Feature>\r
+\r
     <Feature Id="fIPoIB" Title="IPoIB" Level="1"\r
         Description="Internet Protocols over InfiniBand" Display="expand"\r
         ConfigurableDirectory="INSTALLDIR" AllowAdvertise="no"\r
         InstallDefault="local" Absent="allow">\r
         <ComponentRef Id="IPoIB" />\r
     </Feature>\r
+\r
     <Feature Id="fWSD" Title="WSD" Description="Winsock Direct Enabled"\r
         Display="expand" Level="1" ConfigurableDirectory="INSTALLDIR"\r
         AllowAdvertise="no" InstallDefault="local" Absent="allow">\r
         <Condition Level="201"> IPOIB_EXISTS </Condition>\r
         <ComponentRef Id="WinsockDirect" />\r
     </Feature>\r
+\r
     <Feature Id="fDAPL" Title="DAPL" Description="DAT/DAPL over InfiniBand"\r
         Display="collapse" Level="1" ConfigurableDirectory="INSTALLDIR"\r
         AllowAdvertise="no" InstallDefault="local" Absent="allow">\r
         AllowAdvertise="no" InstallDefault="local" Absent="allow">\r
         <ComponentRef Id="VNIC" />\r
     </Feature>\r
+\r
     <Feature Id="fSRP" Title="SRP" Level="5" Description="SCSI over RDMA"\r
         Display="expand" ConfigurableDirectory="INSTALLDIR" AllowAdvertise="no"\r
         InstallDefault="local" Absent="allow">\r
         <ComponentRef Id="SRP_inf" />\r
         <ComponentRef Id="SRP_driver" />\r
     </Feature>\r
+\r
     <Feature Id="fOSMS" Title="OpenSM Service Started" Level="5"\r
         Description="Open Subnet Management started as a Windows Service"\r
         Display="expand" ConfigurableDirectory="INSTALLDIR" AllowAdvertise="no"\r
index a45e48687336d97442f32724f82a97f96dbc2597..de5ecf0a1961b701497e56e75c0878e98f3381db 100644 (file)
@@ -10,12 +10,12 @@ div.Section1
 \r
 <h1 align="left">\r
 <img border="0" src="openfabrics.gif" width="107" height="93">&nbsp; \r
-<a name="TOP" href="#TOP"></a> </h1>\r
+<a href="#TOP"></a> </h1>\r
 <h1 align="center">Windows OpenFabrics </h1>\r
 <h1 align="center">User's Manual</h1>\r
-<h2 align="center">Release 1.0.1</h2>\r
+<h2 align="center">Release 1.1</h2>\r
 <h3 align="center">\r
-<!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%m/%d/%Y" startspan -->11/14/2007<!--webbot bot="Timestamp" endspan i-checksum="12565" --></h3>\r
+<!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%m/%d/%Y" startspan -->12/05/2007<!--webbot bot="Timestamp" endspan i-checksum="12575" --></h3>\r
 <h2 align="left"><u>Overview</u></h2>\r
 <p align="left"><span style="FONT-SIZE: 12pt; FONT-FAMILY: 'Times New Roman'">\r
 The Windows OpenFabrics (WinOF) package is composed of software modules intended \r
@@ -57,11 +57,46 @@ style='background-position: 0% 0%; mso-highlight:yellow; background-image:none;
 <li>\r
 <p align="left">Release Notes</li>\r
 </ul>\r
-<h2 align="left"><u>Features</u></h2>\r
+<p align="left">&nbsp;</p>\r
+<h2 align="left"><u><a name="TOP"></a>WinOF Features</u></h2>\r
 <ul>\r
        <li>\r
-       <h3 align="left">Tools</h3></li>\r
+       <h3 align="left"><a href="#Tools">Tools</a><br>\r
+&nbsp;</h3></li>\r
 </ul>\r
+<ul>\r
+       <li>\r
+       <h3 align="left"><a href="#IPoIB">IPoIB - Internet Protocols over InfiniBand</a><br>\r
+&nbsp;</h3>\r
+       </li>\r
+       <li>\r
+       <h3 align="left"><a href="#winsockdirect">Winsock Direct Service Provider</a><br>\r
+&nbsp;</h3>\r
+       </li>\r
+       <li>\r
+       <h3 align="left"><a href="#DAT">DAT and uDAPL</a></h3>\r
+<ul>\r
+       <li>\r
+       <h4 align="left"><a href="#DAPLTEST">DAPLtest</a></h4></li>\r
+       <li>\r
+       <h4 align="left"><a href="#DAPLtest-examples">DAPLtest Examples</a></h4>\r
+       </li>\r
+       <li>\r
+       <p align="left"><b><a href="#DAT_App_Build">DAT Application Build</a></b><br>\r
+       <br>&nbsp;</li>\r
+</ul></li>\r
+       <li>\r
+       <h3 align="left"><a href="#SRP">SRP - SCSI RDMA Protocol</a><br>\r
+&nbsp;</h3></li>\r
+       <li>\r
+       <h3 align="left"><u><a href="#InfiniBand_Software_Development_Kit">\r
+       InfiniBand Software Development Kit</a></u></h3></li>\r
+</ul>\r
+<h3 align="left">&nbsp;</h3>\r
+<p align="left">&nbsp;</p>\r
+<p align="left">&nbsp;</p>\r
+<h2 align="left"><a name="verbs_benchmarks0"></a><a name="Tools">Tools</a></h2>\r
+<hr>\r
 <blockquote>\r
        <blockquote>\r
                <p align="left">The OpenFabrics Alliance Windows release contains a set of \r
@@ -71,7 +106,7 @@ style='background-position: 0% 0%; mso-highlight:yellow; background-image:none;
                Files\WinOF' is appended to the system wide search path registry entry. \r
                A start menu short-cut 'WinOF Cmd Window' is provided to faciliate \r
                correction tool operation.</p>\r
-               <h4 align="left">Infiniband Subnet Management</h4>\r
+               <h4 align="left"><u>Infiniband Subnet Management</u></h4>\r
                <ul>\r
                        <li>\r
                        <p align="left"><a href="#opensm">opensm</a>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; Open Subnet \r
@@ -117,30 +152,7 @@ Display HCA attributes (lids), statistics and error counters.<br>&nbsp;</li>
                </ul>\r
        </blockquote>\r
 </blockquote>\r
-<ul>\r
-       <li>\r
-       <h3 align="left"><a href="#IPoIB">IPoIB - Internet Protocols over InfiniBand</a></h3>\r
-       </li>\r
-       <li>\r
-       <h3 align="left"><a href="#winsockdirect">Winsock Direct Service Provider</a></h3>\r
-       </li>\r
-       <li>\r
-       <h3 align="left"><a href="#DAT">DAT and uDAPL</a></h3>\r
-<ul>\r
-       <li>\r
-       <h4 align="left"><a href="#DAPLTEST">DAPLtest</a></h4></li>\r
-       <li>\r
-       <h4 align="left"><a href="#DAPLtest-examples">DAPLtest Examples</a></h4>\r
-       </li>\r
-       <li>\r
-       <p align="left"><b><a href="#DAT_App_Build">DAT Application Build</a></b><br>\r
-&nbsp;</li>\r
-</ul></li>\r
-       <li>\r
-       <h3 align="left"><a href="#SRP">SRP - SCSI RDMA Protocol</a></h3></li>\r
-</ul>\r
-<h3 align="left">&nbsp;</h3>\r
-<p align="left">&nbsp;</p>\r
+<h4 align="left"><a href="#TOP"><font color="#000000">&lt;return-to-top&gt;</font></a></h4>\r
 <p align="left">&nbsp;</p>\r
 <h2 align="left"><a name="verbs_benchmarks"></a>User mode micro-benchmarks</h2>\r
 <hr>\r
@@ -327,7 +339,8 @@ Options specific to -r:
        <lid>This option specifies the local endpoint.<br>\r
 &nbsp;-r\r
        <lid>--remote\r
-       <lid>This option specifies the remote endpoint.<br>\r
+       <lid>This option specifies the remote endpoint LID as a hex integer 0x; see \r
+       vstat command for active port LID hex integer.<br>\r
 &nbsp;-c\r
        <number>--connect\r
        <number>This option specifies the number of connections to open. Default of \r
@@ -1165,7 +1178,7 @@ include</font></p>
                </table>\r
        </div>\r
 </div>\r
-<p align="left">&nbsp;</p>\r
+<p align="left"><a href="#TOP"><font color="#000000">&lt;<b>return-to-top</b>&gt;</font></a></p>\r
 <div align="left">\r
        <h3 align="left"><font face="Courier New" size="3">DAT ENVIRONMENT</font><font face="Courier New" size="2">:</font></h3>\r
 </div>\r
@@ -1301,46 +1314,16 @@ For example, 0x3 will output to both stdout and the syslog.
 </pre>\r
        <h4>\r
 <u>DAPL Provider library environment variables</u></h4>\r
-       <p>\r
-<br>\r
-<font size="2">DAPL_DBG_TYPE<br>\r
--------------<br>\r
-<br>\r
-<font face="Courier New">Value specifies which parts of the registry will print \r
-debugging information, valid values are</font> <br>\r
-<br>\r
-</font><font face="Courier New"><font size="2">DAPL_DBG_TYPE_ERR&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; = 0x0001<br>\r
-DAPL_DBG_TYPE_WARN&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; = 0x0002<br>\r
-DAPL_DBG_TYPE_EVD&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; = 0x0004<br>\r
-DAPL_DBG_TYPE_CM&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; = 0x0008<br>\r
-DAPL_DBG_TYPE_EP&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; = 0x0010<br>\r
-DAPL_DBG_TYPE_UTIL&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; = 0x0020<br>\r
-DAPL_DBG_TYPE_CALLBACK&nbsp;&nbsp;&nbsp;&nbsp; = 0x0040<br>\r
-DAPL_DBG_TYPE_DTO_COMP_ERR = 0x0080<br>\r
-DAPL_DBG_TYPE_API&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; = 0x0100<br>\r
-DAPL_DBG_TYPE_RTN&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; = 0x0200<br>\r
-DAPL_DBG_TYPE_EXCEPTION&nbsp;&nbsp;&nbsp; = 0x0400<br>\r
-<br>\r
-or any combination of these. For example you can use 0xC to get both <br>\r
-EVD and CM output.<br>\r
-<br>\r
-Example set DAPL_DBG_TYPE=0xC<br>\r
-<br>\r
-<br>\r
-DAPL_DBG_DEST<br>\r
--------------<br>\r
-<br>\r
-Value sets the output destination, valid values are <br>\r
-<br>\r
-DAPL_DBG_DEST_STDOUT = 0x1<br>\r
-DAPL_DBG_DEST_SYSLOG = 0x2 <br>\r
-DAPL_DBG_DEST_ALL&nbsp;&nbsp;&nbsp; = 0x3 <br>\r
-<br>\r
-For example, 0x3 will output to both stdout and the syslog.</font> </font><br>\r
-<br>\r
-<br>\r
-\r
-</p>\r
+       <p><br><font size="2">DAPL_DBG_TYPE<br>-------------<br><br>\r
+       <font face="Courier New">Value specifies which parts of the registry will print \r
+debugging information, valid values are</font> <br><br></font>\r
+       <font face="Courier New"><font size="2">DAPL_DBG_TYPE_ERR&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; = 0x0001<br>DAPL_DBG_TYPE_WARN&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; = 0x0002<br>DAPL_DBG_TYPE_EVD&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; = 0x0004<br>DAPL_DBG_TYPE_CM&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; = 0x0008<br>DAPL_DBG_TYPE_EP&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; = 0x0010<br>DAPL_DBG_TYPE_UTIL&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; = 0x0020<br>DAPL_DBG_TYPE_CALLBACK&nbsp;&nbsp;&nbsp;&nbsp; = 0x0040<br>DAPL_DBG_TYPE_DTO_COMP_ERR = 0x0080<br>DAPL_DBG_TYPE_API&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; = 0x0100<br>DAPL_DBG_TYPE_RTN&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; = 0x0200<br>DAPL_DBG_TYPE_EXCEPTION&nbsp;&nbsp;&nbsp; = 0x0400<br>\r
+       <br>or any combination of these. For example you can use 0xC to get both <br>EVD and CM output.<br>\r
+       <br>Example set DAPL_DBG_TYPE=0xC<br><br><br>DAPL_DBG_DEST<br>-------------<br>\r
+       <br>Value sets the output destination, valid values are <br><br>DAPL_DBG_DEST_STDOUT = 0x1<br>DAPL_DBG_DEST_SYSLOG = 0x2\r
+       <br>DAPL_DBG_DEST_ALL&nbsp;&nbsp;&nbsp; = 0x3 <br><br>For example, 0x3 will output to both stdout and the syslog.</font>\r
+       </font><br><br></p>\r
+<p align="left"><a href="#TOP"><font color="#000000">&lt;<b>return-to-top</b>&gt;</font></a><br></p>\r
 </blockquote><hr>\r
 <h3><a name="DAPLTEST"></a>DAPLTEST</h3>\r
 <pre>\r
@@ -1699,3 +1682,40 @@ Once completed, the &quot;New Hardware Found&quot; Wizard pops up again.<br>
 &nbsp; The flags and level of debug can be controlled at load-time or run-time.<br>\r
 &nbsp;</p>\r
 <h4 align="left"><a href="#TOP"><font color="#000000">&lt;return-to-top&gt;</font></a></h4>\r
+<p align="left">&nbsp;</p>\r
+<h2><u><a name="InfiniBand_Software_Development_Kit">InfiniBand Software \r
+Development Kit</a></u></h2>\r
+<p>If selected during a WinOF install, the IB Software Development Kit will \r
+be installed as '%SystemDrive%\IBSDK'. Underneath the IBSDK\ folder you will find an \r
+include folder 'Inc\',&nbsp; library definition files 'Lib\'&nbsp; along with a \r
+'Samples' folder.</p>\r
+<h4>Compilation:</h4>\r
+<blockquote>\r
+       <p>Add the additional include path '%SystemDrive%\IBSDK\Inc'; resource files \r
+       may also use this path.</p>\r
+</blockquote>\r
+<h4>Linking:</h4>\r
+<blockquote>\r
+       <p>Add the additional library search path '%SystemDrive%\IBSDK\Lib'.</p>\r
+       <p>Include dependent libraries: ibal.lib and complib.lib, or ibal32.lib &amp; \r
+       complib32.lib for win32 applications on 64-bit platforms.</p>\r
+</blockquote>\r
+<h4>Samples:</h4>\r
+<ul>\r
+       <li>DDK\ demonstrates how to build an IB application in the <b>Windows \r
+       Server 2003 SP1 DDK </b>&nbsp;(Driver Development Kit) environment.<br>\r
+       Consult the README.txt file for details.<br>\r
+       See <a href="http://www.microsoft.com/whdc/devtools/ddk/default.mspx">\r
+       http://www.microsoft.com/whdc/devtools/ddk/default.mspx</a> for DDK \r
+       installation details.<br>\r
+&nbsp;</li>\r
+       <li>VS\ demonstrates how to build an IB application in the <b>Windows Server \r
+       2003 R2 SP1 </b>Visual Studio 2005 environment.<br>\r
+       Consult the README.txt file for details.</li>\r
+</ul>\r
+\r
+<p align="left">&nbsp;</p>\r
+<p align="left"><a href="#TOP"><font color="#000000">&lt;<b>return-to-top</b>&gt;</font></a></p>\r
+<p>&nbsp;</p>\r
+\r
+\r
index 4d9110db81ff3bed3630d633355fcf16037972c7..d98db4e127cad2b4ab8076a2b0f4be9e2b6ec048 100644 (file)
@@ -1,5 +1,6 @@
 @echo off\r
 setlocal\r
+\r
 echo %1 %2\r
 \r
 if "%1"=="" goto usage\r
@@ -55,69 +56,89 @@ rem
 \r
 set bin_dir=%1\bin\user\objchk_wnet_amd64\amd64\r
 set dest_dir=%2\HCA\amd64\\r
+\r
 for %%i in (%bin_dir%\ibald.dll, %bin_dir%\complibd.dll, %bin_dir%\mthcaud.dll, %bin_dir%\mt23108ud.dll, %bin_dir%\IbInstaller.dll) do xcopy %%i %dest_dir% /y\r
-xcopy %bin_dir%\*.exe %2\tools\amd64\debug\ /y\r
 \r
-xcopy %bin_dir%\dapld.dll  %2\DAPL\amd64\ /y\r
-xcopy %bin_dir%\dapld.pdb  %2\DAPL\amd64\ /y\r
-xcopy %bin_dir%\datd.dll   %2\DAPL\amd64\ /y\r
-xcopy %bin_dir%\datd.lib   %2\DAPL\amd64\ /y\r
-xcopy %bin_dir%\datd.pdb   %2\DAPL\amd64\ /y\r
+for %%i in (%bin_dir%\ibald.lib, %bin_dir%\ibald.pdb, %bin_dir%\complibd.lib, %bin_dir%\complibd.pdb) do xcopy %%i %dest_dir% /yq\r
 \r
-xcopy %bin_dir%\dapl2d.dll %2\DAPL2\amd64\ /y\r
-xcopy %bin_dir%\dapl2d.pdb %2\DAPL2\amd64\ /y\r
-xcopy %bin_dir%\dapl2-scmd.dll %2\DAPL2\amd64\ /y\r
-xcopy %bin_dir%\dapl2-scmd.pdb %2\DAPL2\amd64\ /y\r
-xcopy %bin_dir%\dat2d.dll  %2\DAPL2\amd64\ /y\r
-xcopy %bin_dir%\dat2d.lib  %2\DAPL2\amd64\ /y\r
-xcopy %bin_dir%\dat2d.pdb  %2\DAPL2\amd64\ /y\r
+xcopy %bin_dir%\*.exe %2\tools\amd64\debug\ /y\r
 \r
-rem Copy IA64 drivers\r
+xcopy %bin_dir%\dapld.dll  %2\DAPL\amd64\ /yq\r
+xcopy %bin_dir%\dapld.pdb  %2\DAPL\amd64\ /yq\r
+xcopy %bin_dir%\datd.dll   %2\DAPL\amd64\ /yq\r
+xcopy %bin_dir%\datd.lib   %2\DAPL\amd64\ /yq\r
+xcopy %bin_dir%\datd.pdb   %2\DAPL\amd64\ /yq\r
+\r
+xcopy %bin_dir%\dapl2d.dll %2\DAPL2\amd64\ /yq\r
+xcopy %bin_dir%\dapl2d.pdb %2\DAPL2\amd64\ /yq\r
+xcopy %bin_dir%\dapl2-scmd.dll %2\DAPL2\amd64\ /yq\r
+xcopy %bin_dir%\dapl2-scmd.pdb %2\DAPL2\amd64\ /yq\r
+xcopy %bin_dir%\dat2d.dll  %2\DAPL2\amd64\ /yq\r
+xcopy %bin_dir%\dat2d.lib  %2\DAPL2\amd64\ /yq\r
+xcopy %bin_dir%\dat2d.pdb  %2\DAPL2\amd64\ /yq\r
+\r
+rem Copy checked IA64 drivers\r
 set bin_dir=%1\bin\user\objchk_wnet_ia64\ia64\r
 set dest_dir=%2\HCA\ia64\\r
 for %%i in (%bin_dir%\ibald.dll, %bin_dir%\complibd.dll, %bin_dir%\mthcaud.dll, %bin_dir%\mt23108ud.dll, %bin_dir%\IbInstaller.dll) do xcopy %%i %dest_dir% /y\r
-xcopy %bin_dir%\*.exe %2\tools\ia64\debug\ /y\r
 \r
-xcopy %bin_dir%\dapld.dll   %2\DAPL\ia64\ /y\r
-xcopy %bin_dir%\dapld.pdb   %2\DAPL\ia64\ /y\r
-xcopy %bin_dir%\datd.dll    %2\DAPL\ia64\ /y\r
-xcopy %bin_dir%\datd.lib    %2\DAPL\ia64\ /y\r
-xcopy %bin_dir%\datd.pdb    %2\DAPL\ia64\ /y\r
+for %%i in (%bin_dir%\ibald.lib, %bin_dir%\ibald.pdb, %bin_dir%\complibd.lib, %bin_dir%\complibd.pdb) do xcopy %%i %dest_dir% /yq\r
 \r
-xcopy %bin_dir%\dapl2d.dll  %2\DAPL2\ia64\ /y\r
-xcopy %bin_dir%\dapl2d.pdb  %2\DAPL2\ia64\ /y\r
-xcopy %bin_dir%\dapl2-scmd.dll  %2\DAPL2\ia64\ /y\r
-xcopy %bin_dir%\dapl2-scmd.pdb  %2\DAPL2\ia64\ /y\r
-xcopy %bin_dir%\dat2d.dll   %2\DAPL2\ia64\ /y\r
-xcopy %bin_dir%\dat2d.lib   %2\DAPL2\ia64\ /y\r
-xcopy %bin_dir%\dat2d.pdb   %2\DAPL2\ia64\ /y\r
+xcopy %bin_dir%\*.exe %2\tools\ia64\debug\ /y\r
 \r
-rem Copy x86 drivers\r
+xcopy %bin_dir%\dapld.dll   %2\DAPL\ia64\ /yq\r
+xcopy %bin_dir%\dapld.pdb   %2\DAPL\ia64\ /yq\r
+xcopy %bin_dir%\datd.dll    %2\DAPL\ia64\ /yq\r
+xcopy %bin_dir%\datd.lib    %2\DAPL\ia64\ /yq\r
+xcopy %bin_dir%\datd.pdb    %2\DAPL\ia64\ /yq\r
+\r
+xcopy %bin_dir%\dapl2d.dll  %2\DAPL2\ia64\ /yq\r
+xcopy %bin_dir%\dapl2d.pdb  %2\DAPL2\ia64\ /yq\r
+xcopy %bin_dir%\dapl2-scmd.dll  %2\DAPL2\ia64\ /yq\r
+xcopy %bin_dir%\dapl2-scmd.pdb  %2\DAPL2\ia64\ /yq\r
+xcopy %bin_dir%\dat2d.dll   %2\DAPL2\ia64\ /yq\r
+xcopy %bin_dir%\dat2d.lib   %2\DAPL2\ia64\ /yq\r
+xcopy %bin_dir%\dat2d.pdb   %2\DAPL2\ia64\ /yq\r
+\r
+rem Copy checked x86 drivers\r
 set bin_dir=%1\bin\user\objchk_wnet_x86\i386\r
 set dest_dir=%2\HCA\x86\\r
 for %%i in (%bin_dir%\ibald.dll, %bin_dir%\complibd.dll, %bin_dir%\mthcaud.dll, %bin_dir%\mt23108ud.dll, %bin_dir%\IbInstaller.dll) do xcopy %%i %dest_dir% /y\r
+\r
+for %%i in (%bin_dir%\ibald.lib, %bin_dir%\ibald.pdb, %bin_dir%\complibd.lib, %bin_dir%\complibd.pdb) do xcopy %%i %dest_dir% /yq\r
+\r
 xcopy %bin_dir%\*.exe %2\tools\x86\debug\ /y\r
 \r
-xcopy %bin_dir%\dapld.dll   %2\DAPL\x86\ /y\r
-xcopy %bin_dir%\dapld.pdb   %2\DAPL\x86\ /y\r
-xcopy %bin_dir%\datd.dll    %2\DAPL\x86\ /y\r
-xcopy %bin_dir%\datd.lib    %2\DAPL\x86\ /y\r
-xcopy %bin_dir%\datd.pdb    %2\DAPL\x86\ /y\r
-\r
-xcopy %bin_dir%\dapl2d.dll  %2\DAPL2\x86\ /y\r
-xcopy %bin_dir%\dapl2d.pdb  %2\DAPL2\x86\ /y\r
-xcopy %bin_dir%\dapl2-scmd.dll  %2\DAPL2\x86\ /y\r
-xcopy %bin_dir%\dapl2-scmd.pdb  %2\DAPL2\x86\ /y\r
-xcopy %bin_dir%\dat2d.dll   %2\DAPL2\x86\ /y\r
-xcopy %bin_dir%\dat2d.lib   %2\DAPL2\x86\ /y\r
-xcopy %bin_dir%\dat2d.pdb   %2\DAPL2\x86\ /y\r
-\r
-rem WOW64 DLLs\r
-copy /B %bin_dir%\installsp.exe %2\tools\x86\debug /y\r
+xcopy %bin_dir%\dapld.dll   %2\DAPL\x86\ /yq\r
+xcopy %bin_dir%\dapld.pdb   %2\DAPL\x86\ /yq\r
+xcopy %bin_dir%\datd.dll    %2\DAPL\x86\ /yq\r
+xcopy %bin_dir%\datd.lib    %2\DAPL\x86\ /yq\r
+xcopy %bin_dir%\datd.pdb    %2\DAPL\x86\ /yq\r
+\r
+xcopy %bin_dir%\dapl2d.dll  %2\DAPL2\x86\ /yq\r
+xcopy %bin_dir%\dapl2d.pdb  %2\DAPL2\x86\ /yq\r
+xcopy %bin_dir%\dapl2-scmd.dll  %2\DAPL2\x86\ /yq\r
+xcopy %bin_dir%\dapl2-scmd.pdb  %2\DAPL2\x86\ /yq\r
+xcopy %bin_dir%\dat2d.dll   %2\DAPL2\x86\ /yq\r
+xcopy %bin_dir%\dat2d.lib   %2\DAPL2\x86\ /yq\r
+xcopy %bin_dir%\dat2d.pdb   %2\DAPL2\x86\ /yq\r
+\r
+rem checked x86 DLLs --> WOW64 DLLs\r
+rem xcopy had problems determining if dest was File | Dir ??\r
+\r
+copy /B %bin_dir%\installsp.exe %2\tools\x86\debug\ /y\r
 copy /B %bin_dir%\ibald.dll %2\HCA\amd64\ibal32d.dll /y\r
+copy /B %bin_dir%\ibald.lib %2\HCA\amd64\ibal32d.lib /y\r
+copy /B %bin_dir%\ibald.pdb %2\HCA\amd64\ibal32d.pdb /y\r
 copy /B %bin_dir%\complibd.dll %2\HCA\amd64\cl32d.dll /y\r
+copy /B %bin_dir%\complibd.lib %2\HCA\amd64\cl32d.lib /y\r
+copy /B %bin_dir%\complibd.pdb %2\HCA\amd64\cl32d.pdb /y\r
 copy /B %bin_dir%\ibald.dll %2\HCA\ia64\ibal32d.dll /y\r
+copy /B %bin_dir%\ibald.lib %2\HCA\ia64\ibal32d.lib /y\r
+copy /B %bin_dir%\ibald.pdb %2\HCA\ia64\ibal32d.pdb /y\r
 copy /B %bin_dir%\complibd.dll %2\HCA\ia64\cl32d.dll /y\r
+copy /B %bin_dir%\complibd.lib %2\HCA\ia64\cl32d.lib /y\r
+copy /B %bin_dir%\complibd.pdb %2\HCA\ia64\cl32d.pdb /y\r
 \r
 copy /B %bin_dir%\mthcaud.dll %2\HCA\amd64\mthca32d.dll /y\r
 copy /B %bin_dir%\mthcaud.dll %2\HCA\ia64\mthca32d.dll /y\r
@@ -134,91 +155,108 @@ copy /B %bin_dir%\dat2d.dll  %2\DAPL2\amd64\dat232d.dll /y
 copy /B %bin_dir%\dapl2d.dll %2\DAPL2\ia64\dapl232d.dll /y\r
 copy /B %bin_dir%\dat2d.dll  %2\DAPL2\ia64\dat232d.dll /y\r
 \r
+rem Copy Free x64 drivers\r
 set bin_dir=%1\bin\user\objfre_wnet_amd64\amd64\r
 set dest_dir=%2\HCA\amd64\\r
 for %%i in (%bin_dir%\ibal.dll, %bin_dir%\complib.dll, %bin_dir%\mthcau.dll, %bin_dir%\mt23108u.dll, %bin_dir%\IbInstaller.dll) do xcopy %%i %dest_dir% /y\r
+\r
+for %%i in (%bin_dir%\ibal.lib, %bin_dir%\ibal.pdb, %bin_dir%\complib.lib, %bin_dir%\complib.pdb) do xcopy %%i %dest_dir% /yq\r
+\r
 xcopy %bin_dir%\ibwsd.dll %2\net\amd64\ /y\r
 xcopy %bin_dir%\installsp.exe %2\net\amd64\ /y\r
 xcopy %bin_dir%\*.exe %2\tools\amd64\release\ /y\r
 \r
-xcopy %bin_dir%\dapl.dll  %2\DAPL\amd64\ /y\r
-xcopy %bin_dir%\dapl.pdb  %2\DAPL\amd64\ /y\r
-xcopy %bin_dir%\dat.dll   %2\DAPL\amd64\ /y\r
-xcopy %bin_dir%\dat.lib   %2\DAPL\amd64\ /y\r
-xcopy %bin_dir%\dat.pdb   %2\DAPL\amd64\ /y\r
+xcopy %bin_dir%\dapl.dll  %2\DAPL\amd64\ /yq\r
+xcopy %bin_dir%\dapl.pdb  %2\DAPL\amd64\ /yq\r
+xcopy %bin_dir%\dat.dll   %2\DAPL\amd64\ /yq\r
+xcopy %bin_dir%\dat.lib   %2\DAPL\amd64\ /yq\r
+xcopy %bin_dir%\dat.pdb   %2\DAPL\amd64\ /yq\r
 \r
-xcopy %bin_dir%\dapl2.dll %2\DAPL2\amd64\ /y\r
-xcopy %bin_dir%\dapl2.pdb %2\DAPL2\amd64\ /y\r
-xcopy %bin_dir%\dapl2-scm.dll %2\DAPL2\amd64\ /y\r
-xcopy %bin_dir%\dapl2-scm.pdb %2\DAPL2\amd64\ /y\r
-xcopy %bin_dir%\dat2.dll  %2\DAPL2\amd64\ /y\r
-xcopy %bin_dir%\dat2.lib  %2\DAPL2\amd64\ /y\r
-xcopy %bin_dir%\dat2.pdb  %2\DAPL2\amd64\ /y\r
+xcopy %bin_dir%\dapl2.dll %2\DAPL2\amd64\ /yq\r
+xcopy %bin_dir%\dapl2.pdb %2\DAPL2\amd64\ /yq\r
+xcopy %bin_dir%\dapl2-scm.dll %2\DAPL2\amd64\ /yq\r
+xcopy %bin_dir%\dapl2-scm.pdb %2\DAPL2\amd64\ /yq\r
+xcopy %bin_dir%\dat2.dll  %2\DAPL2\amd64\ /yq\r
+xcopy %bin_dir%\dat2.lib  %2\DAPL2\amd64\ /yq\r
+xcopy %bin_dir%\dat2.pdb  %2\DAPL2\amd64\ /yq\r
 \r
 xcopy %bin_dir%\mtcr.dll %2\FwTools\amd64\ /y\r
 xcopy %bin_dir%\flint.exe %2\FwTools\amd64\ /y\r
 xcopy %bin_dir%\mst.exe %2\FwTools\amd64\ /y\r
 \r
-rem Copy IA64 drivers\r
+rem Copy Free IA64 drivers\r
 set bin_dir=%1\bin\user\objfre_wnet_ia64\ia64\r
 set dest_dir=%2\HCA\ia64\\r
 for %%i in (%bin_dir%\ibal.dll, %bin_dir%\complib.dll, %bin_dir%\mthcau.dll, %bin_dir%\mt23108u.dll, %bin_dir%\IbInstaller.dll) do xcopy %%i %dest_dir% /y\r
+\r
+for %%i in (%bin_dir%\ibal.lib, %bin_dir%\ibal.pdb, %bin_dir%\complib.lib, %bin_dir%\complib.pdb) do xcopy %%i %dest_dir% /yq\r
+\r
 xcopy %bin_dir%\ibwsd.dll %2\net\ia64\ /y\r
 xcopy %bin_dir%\installsp.exe %2\net\ia64\ /y\r
 xcopy %bin_dir%\*.exe %2\tools\ia64\release\ /y\r
 \r
-xcopy %bin_dir%\dapl.dll  %2\DAPL\ia64\ /y\r
-xcopy %bin_dir%\dapl.pdb  %2\DAPL\ia64\ /y\r
-xcopy %bin_dir%\dat.dll   %2\DAPL\ia64\ /y\r
-xcopy %bin_dir%\dat.lib   %2\DAPL\ia64\ /y\r
-xcopy %bin_dir%\dat.pdb   %2\DAPL\ia64\ /y\r
+xcopy %bin_dir%\dapl.dll  %2\DAPL\ia64\ /yq\r
+xcopy %bin_dir%\dapl.pdb  %2\DAPL\ia64\ /yq\r
+xcopy %bin_dir%\dat.dll   %2\DAPL\ia64\ /yq\r
+xcopy %bin_dir%\dat.lib   %2\DAPL\ia64\ /yq\r
+xcopy %bin_dir%\dat.pdb   %2\DAPL\ia64\ /yq\r
 \r
-xcopy %bin_dir%\dapl2.dll %2\DAPL2\ia64\ /y\r
-xcopy %bin_dir%\dapl2.pdb %2\DAPL2\ia64\ /y\r
-xcopy %bin_dir%\dapl2-scm.dll %2\DAPL2\ia64\ /y\r
-xcopy %bin_dir%\dapl2-scm.pdb %2\DAPL2\ia64\ /y\r
-xcopy %bin_dir%\dat2.dll  %2\DAPL2\ia64\ /y\r
-xcopy %bin_dir%\dat2.lib  %2\DAPL2\ia64\ /y\r
-xcopy %bin_dir%\dat2.pdb  %2\DAPL2\ia64\ /y\r
+xcopy %bin_dir%\dapl2.dll %2\DAPL2\ia64\ /yq\r
+xcopy %bin_dir%\dapl2.pdb %2\DAPL2\ia64\ /yq\r
+xcopy %bin_dir%\dapl2-scm.dll %2\DAPL2\ia64\ /yq\r
+xcopy %bin_dir%\dapl2-scm.pdb %2\DAPL2\ia64\ /yq\r
+xcopy %bin_dir%\dat2.dll  %2\DAPL2\ia64\ /yq\r
+xcopy %bin_dir%\dat2.lib  %2\DAPL2\ia64\ /yq\r
+xcopy %bin_dir%\dat2.pdb  %2\DAPL2\ia64\ /yq\r
 \r
 xcopy %bin_dir%\mtcr.dll %2\FwTools\ia64\ /y\r
 xcopy %bin_dir%\flint.exe %2\FwTools\ia64\ /y\r
 xcopy %bin_dir%\mst.exe %2\FwTools\ia64\ /y\r
 \r
-rem Copy x86 drivers\r
+rem Copy Free x86 drivers\r
 set bin_dir=%1\bin\user\objfre_wnet_x86\i386\r
 set dest_dir=%2\HCA\x86\\r
 for %%i in (%bin_dir%\ibal.dll, %bin_dir%\complib.dll, %bin_dir%\mthcau.dll, %bin_dir%\mt23108u.dll, %bin_dir%\IbInstaller.dll) do xcopy %%i %dest_dir% /y\r
-xcopy %bin_dir%\*.exe %2\tools\x86\release\ /y\r
 \r
-xcopy %bin_dir%\dapl.dll  %2\DAPL\x86\ /y\r
-xcopy %bin_dir%\dapl.pdb  %2\DAPL\x86\ /y\r
-xcopy %bin_dir%\dat.dll   %2\DAPL\x86\ /y\r
-xcopy %bin_dir%\dat.lib   %2\DAPL\x86\ /y\r
-xcopy %bin_dir%\dat.pdb   %2\DAPL\x86\ /y\r
+for %%i in (%bin_dir%\ibal.lib, %bin_dir%\ibal.pdb, %bin_dir%\complib.lib, %bin_dir%\complib.pdb) do xcopy %%i %dest_dir% /yq\r
 \r
-xcopy %bin_dir%\dapl2.dll %2\DAPL2\x86\ /y\r
-xcopy %bin_dir%\dapl2.pdb %2\DAPL2\x86\ /y\r
-xcopy %bin_dir%\dapl2-scm.dll %2\DAPL2\x86\ /y\r
-xcopy %bin_dir%\dapl2-scm.pdb %2\DAPL2\x86\ /y\r
-xcopy %bin_dir%\dat2.dll  %2\DAPL2\x86\ /y\r
-xcopy %bin_dir%\dat2.lib  %2\DAPL2\x86\ /y\r
-xcopy %bin_dir%\dat2.pdb  %2\DAPL2\x86\ /y\r
+xcopy %bin_dir%\*.exe %2\tools\x86\release\ /y\r
+xcopy %bin_dir%\dapl.dll  %2\DAPL\x86\ /yq\r
+xcopy %bin_dir%\dapl.pdb  %2\DAPL\x86\ /yq\r
+xcopy %bin_dir%\dat.dll   %2\DAPL\x86\ /yq\r
+xcopy %bin_dir%\dat.lib   %2\DAPL\x86\ /yq\r
+xcopy %bin_dir%\dat.pdb   %2\DAPL\x86\ /yq\r
+\r
+xcopy %bin_dir%\dapl2.dll %2\DAPL2\x86\ /yq\r
+xcopy %bin_dir%\dapl2.pdb %2\DAPL2\x86\ /yq\r
+xcopy %bin_dir%\dapl2-scm.dll %2\DAPL2\x86\ /yq\r
+xcopy %bin_dir%\dapl2-scm.pdb %2\DAPL2\x86\ /yq\r
+xcopy %bin_dir%\dat2.dll  %2\DAPL2\x86\ /yq\r
+xcopy %bin_dir%\dat2.lib  %2\DAPL2\x86\ /yq\r
+xcopy %bin_dir%\dat2.pdb  %2\DAPL2\x86\ /yq\r
 \r
 xcopy %bin_dir%\mtcr.dll %2\FwTools\x86\ /y\r
 xcopy %bin_dir%\flint.exe %2\FwTools\x86\ /y\r
 xcopy %bin_dir%\mst.exe %2\FwTools\x86\ /y\r
 \r
-rem WOW64 DLLs\r
-xcopy %bin_dir%\ibwsd.dll %2\net\x86\ /y\r
-xcopy %bin_dir%\installsp.exe %2\net\x86\ /y\r
-xcopy %bin_dir%\installsp.exe %2\tools\x86\release /y\r
+rem free x86 DLLs --> WOW64 DLLs\r
+copy %bin_dir%\ibwsd.dll %2\net\x86\ /y\r
+copy %bin_dir%\installsp.exe %2\net\x86\ /y\r
+copy %bin_dir%\installsp.exe %2\tools\x86\release /y\r
 copy /B %bin_dir%\ibwsd.dll %2\net\amd64\ibwsd32.dll /y\r
 copy /B %bin_dir%\ibwsd.dll %2\net\ia64\ibwsd32.dll /y\r
 copy /B %bin_dir%\ibal.dll %2\HCA\amd64\ibal32.dll /y\r
+copy /B %bin_dir%\ibal.lib %2\HCA\amd64\ibal32.lib /y\r
+copy /B %bin_dir%\ibal.pdb %2\HCA\amd64\ibal32.pdb /y\r
 copy /B %bin_dir%\complib.dll %2\HCA\amd64\cl32.dll /y\r
+copy /B %bin_dir%\complib.lib %2\HCA\amd64\cl32.lib /y\r
+copy /B %bin_dir%\complib.pdb %2\HCA\amd64\cl32.pdb /y\r
 copy /B %bin_dir%\ibal.dll %2\HCA\ia64\ibal32.dll /y\r
+copy /B %bin_dir%\ibal.lib %2\HCA\ia64\ibal32.lib /y\r
+copy /B %bin_dir%\ibal.pdb %2\HCA\ia64\ibal32.pdb /y\r
 copy /B %bin_dir%\complib.dll %2\HCA\ia64\cl32.dll /y\r
+copy /B %bin_dir%\complib.lib %2\HCA\ia64\cl32.lib /y\r
+copy /B %bin_dir%\complib.pdb %2\HCA\ia64\cl32.pdb /y\r
 copy /B %bin_dir%\mthcau.dll %2\HCA\amd64\mthca32.dll /y\r
 copy /B %bin_dir%\mthcau.dll %2\HCA\ia64\mthca32.dll /y\r
 copy /B %bin_dir%\mt23108u.dll %2\HCA\amd64\mtuvp32.dll /y\r
@@ -266,58 +304,81 @@ xcopy %1\tools\wsdinstall\user\installsp.exe.manifest %2\net\amd64 /y
 xcopy %1\tools\wsdinstall\user\installsp.exe.manifest %2\net\x86 /y\r
 xcopy %1\tools\wsdinstall\user\installsp.exe.manifest %2\net\ia64 /y\r
 \r
-xcopy %1\bin %2\bin\ /ey\r
-xcopy %1\bin\*.pdb %2\symbols\ /ey\r
+echo Copy bin\ files\r
+xcopy %1\bin %2\bin\ /eyq\r
+echo Copy symbol files\r
+xcopy %1\bin\*.pdb %2\symbols\ /eyq\r
 \r
 pushd %2\r
-del /s bin\*.pdb\r
-del /s ibtest*\r
-del /s pingpong*\r
-del /s *Sdp*\r
-del /s Select*\r
-del /s usrp*\r
-del /s bin\*.lib\r
-del /s bin\*.exp\r
+del /s bin\*.pdb > nul\r
+del /s ibtest*   > nul\r
+del /s pingpong* > nul\r
+del /s *Sdp*     > nul\r
+del /s Select*   > nul\r
+del /s usrp*     > nul\r
+del /s bin\*.lib > nul\r
+del /s bin\*.exp > nul\r
 popd\r
 \r
-rem Copy DAT header files\r
-\r
+rem Copy DAT v1.1 header files\r
 if exist %1\ulp\dapl\dat\include\dat (\r
     pushd %1\ulp\dapl\dat\include\dat\r
 \r
-    xcopy dat.h %2\DAPL /Y  \r
-    xcopy dat_error.h %2\DAPL /Y  \r
-    xcopy dat_platform_specific.h %2\DAPL /Y  \r
-    xcopy dat_redirection.h %2\DAPL /Y  \r
-    xcopy dat_registry.h %2\DAPL /Y\r
-    xcopy dat_vendor_specific.h %2\DAPL /Y\r
-    xcopy udat.h %2\DAPL /Y\r
-    xcopy udat_config.h %2\DAPL /Y\r
-    xcopy udat_redirection.h %2\DAPL /Y\r
-    xcopy udat_vendor_specific.h %2\DAPL /Y\r
+    xcopy dat.h %2\DAPL /Y/Q\r
+    xcopy dat_error.h %2\DAPL /Y/Q\r
+    xcopy dat_platform_specific.h %2\DAPL /Y/Q\r
+    xcopy dat_redirection.h %2\DAPL /Y/Q\r
+    xcopy dat_registry.h %2\DAPL /Y/Q\r
+    xcopy dat_vendor_specific.h %2\DAPL /Y/Q\r
+    xcopy udat.h %2\DAPL /Y/Q\r
+    xcopy udat_config.h %2\DAPL /Y/Q\r
+    xcopy udat_redirection.h %2\DAPL /Y/Q\r
+    xcopy udat_vendor_specific.h %2\DAPL /Y/Q\r
     popd\r
 )\r
 \r
+rem Copy DAT v2.0 header files\r
 if exist %1\ulp\dapl2\dat\include\dat (\r
     pushd %1\ulp\dapl2\dat\include\dat\r
 \r
-    xcopy dat.h %2\DAPL2 /Y  \r
-    xcopy dat_error.h %2\DAPL2 /Y  \r
-    xcopy dat_platform_specific.h %2\DAPL2 /Y  \r
-    xcopy dat_redirection.h %2\DAPL2 /Y  \r
-    xcopy dat_registry.h %2\DAPL2 /Y\r
-    xcopy dat_vendor_specific.h %2\DAPL2 /Y\r
-    xcopy udat.h %2\DAPL2 /Y\r
-    xcopy udat_config.h %2\DAPL2 /Y\r
-    xcopy udat_redirection.h %2\DAPL2 /Y\r
-    xcopy udat_vendor_specific.h %2\DAPL2 /Y\r
+    xcopy dat.h %2\DAPL2 /Y/Q  \r
+    xcopy dat_error.h %2\DAPL2 /Y/Q\r
+    xcopy dat_platform_specific.h %2\DAPL2 /Y/Q\r
+    xcopy dat_redirection.h %2\DAPL2 /Y/Q\r
+    xcopy dat_registry.h %2\DAPL2 /Y/Q\r
+    xcopy dat_vendor_specific.h %2\DAPL2 /Y/Q\r
+    xcopy udat.h %2\DAPL2 /Y/Q\r
+    xcopy udat_config.h %2\DAPL2 /Y/Q\r
+    xcopy udat_redirection.h %2\DAPL2 /Y/Q\r
+    xcopy udat_vendor_specific.h %2\DAPL2 /Y/Q\r
     popd\r
     pushd %1\ulp\dapl2\test\dapltest\scripts\r
-    xcopy dt-svr.bat %2\DAPL2 /Y\r
-    xcopy dt-cli.bat %2\DAPL2 /Y\r
+    xcopy dt-svr.bat %2\DAPL2 /Y/Q\r
+    xcopy dt-cli.bat %2\DAPL2 /Y/Q\r
+    popd\r
+)\r
+\r
+rem Copy IBAL header files\r
+if exist %1\inc (\r
+    if exist %2\inc rmdir /S/Q %2\inc\r
+    mkdir %2\Inc\r
+    pushd %1\inc\r
+    xcopy oib_ver.h %2\Inc /Y/Q\r
+    xcopy openib.def %2\Inc /Y/Q\r
+    xcopy Complib %2\Inc\Complib /I/S/Y/Q\r
+    xcopy Iba %2\Inc\Iba /I/S/Y/Q\r
+    xcopy User\Complib %2\Inc\Complib /I/S/Y/Q\r
+    xcopy User\Iba %2\Inc\Iba /I/S/Y/Q\r
     popd\r
 )\r
 \r
+rem Docs & SDK items\r
+if NOT exist %2\Misc (\r
+    mkdir %2\Misc\r
+)\r
+copy /Y %1\Docs\Manual.htm %2\Misc\Manual.htm /A\r
+copy /Y %1\tests\cmtest\user\cmtest_main.c %2\Misc\cmtest.c /A\r
+\r
 goto end\r
 \r
 :usage\r