From 6f6f79ae73c84cfaea25125650eb2505ca7c322e Mon Sep 17 00:00:00 2001 From: stansmith Date: Thu, 6 Dec 2007 01:20:05 +0000 Subject: [PATCH] {WinOF] IBSDK - InfiniBand software development kit. \IBSDK\ Inc\ Libs\ Samples\ git-svn-id: svn://openib.tc.cornell.edu/gen1@913 ad392aa1-c5ef-ae45-8dd8-e69d62a5ef86 --- branches/WinOF/WIX/CustomActions.vbs | 65 +- branches/WinOF/WIX/SDK_Samples/DDK/README.txt | 44 ++ branches/WinOF/WIX/SDK_Samples/DDK/SOURCES | 21 + branches/WinOF/WIX/SDK_Samples/DDK/cmtest.rc | 48 ++ branches/WinOF/WIX/SDK_Samples/DDK/makefile | 7 + branches/WinOF/WIX/SDK_Samples/VS/README.txt | 44 ++ branches/WinOF/WIX/SDK_Samples/VS/cmtest.rc | 55 ++ branches/WinOF/WIX/ia64/wof.wxs | 329 +++++++++- branches/WinOF/WIX/x64/wof.wxs | 350 ++++++++++- branches/WinOF/WIX/x86/wof.wxs | 589 +++++++++++++----- trunk/docs/Manual.htm | 164 ++--- trunk/etc/makebin.bat | 303 +++++---- 12 files changed, 1647 insertions(+), 372 deletions(-) create mode 100644 branches/WinOF/WIX/SDK_Samples/DDK/README.txt create mode 100644 branches/WinOF/WIX/SDK_Samples/DDK/SOURCES create mode 100644 branches/WinOF/WIX/SDK_Samples/DDK/cmtest.rc create mode 100644 branches/WinOF/WIX/SDK_Samples/DDK/makefile create mode 100644 branches/WinOF/WIX/SDK_Samples/VS/README.txt create mode 100644 branches/WinOF/WIX/SDK_Samples/VS/cmtest.rc diff --git a/branches/WinOF/WIX/CustomActions.vbs b/branches/WinOF/WIX/CustomActions.vbs index b5db7573..af4dc7b7 100644 --- a/branches/WinOF/WIX/CustomActions.vbs +++ b/branches/WinOF/WIX/CustomActions.vbs @@ -114,6 +114,65 @@ Function FileMove(filename,destination) End Function +' Remove the specified folder and all sub-folders & files. +' What rmdir does from the cmd line but will not do from vbs? + +Sub RemoveFolder(objStartFolder) + +Set objFSO = CreateObject("Scripting.FileSystemObject") + +If Not objFSO.FolderExists(objStartFolder) Then + Exit Sub +End if + +Set objFolder = objFSO.GetFolder(objStartFolder) +'Wscript.Echo objFolder.Path +Set colFiles = objFolder.Files + +' del files in top-level folder +For Each objFile in colFiles + objFSO.DeleteFile(objFolder.Path & "\" & objFile.Name) + If Err Then + ErrMsg("Del err on " & objFolder.Path & "\" & objFile.Name) + End if +Next + +ShowSubfolders objFSO.GetFolder(objStartFolder), objFSO + +On Error Resume Next +objFSO.DeleteFolder(objStartFolder) +If Err Then + ErrMsg("DelFolder err on " & objStartFolder) +End if + +End Sub + + +Sub ShowSubFolders(Folder,FSO) + On Error Resume Next + For Each Subfolder in Folder.SubFolders +' Wscript.Echo Subfolder.Path + Set objFolder = FSO.GetFolder(Subfolder.Path) + Set colFiles = objFolder.Files + For Each objFile in colFiles +' Wscript.Echo Subfolder.Path & "\" & objFile.Name + FSO.DeleteFile(Subfolder.Path & "\" & objFile.Name) + If Err Then + ErrMsg("DelFile err on " & Subfolder.Path & "\" & objFile.Name) + End if + Next +' Wscript.Echo + ShowSubFolders Subfolder, FSO + FSO.DeleteFolder(Subfolder.Path) + If Err Then + ErrMsg("DelFolder err on " & Subfolder.Path) + End if + Next +End Sub + + + + ' Attempt to clean out driver installed files which fail to be uninstalled ' when the driver is uninstalled. Win2K3/x64 files persist, XP & Win2K3/x86 ' the driver files are correctly remove? @@ -157,7 +216,7 @@ Function RemoveDriverFiles() FileDelete(sDRIVERS & "vnic.sys") If (MTARCH="amd64") Then - ' System64Folder = System32, SystemFolder = Syswow64 + ' System64Folder = System32, SystemFolder = SysWOW64 ' check/remove from .dll cache prior to removal from system32\ Dim dllCache dllCache = sSystem64Folder & "dllcache\" @@ -199,7 +258,7 @@ Function RemoveDriverFiles() FileDelete(sSystemFolder & "ibwsd.dll") FileDelete(Win & "lastgood\system32\ibwsd.dll") - FileDelete(Win & "lastgood\sys64wow\ibwsd.dll") + FileDelete(Win & "lastgood\SysWOW64\ibwsd.dll") ' delete opensm files Dim fso @@ -1157,6 +1216,8 @@ Sub HammerTime RC = wshShell.Run(cmd,0,true) End if + RemoveFolder "C:\IBSDK" + ' WIX does this - SysPathRemove(sInstallDir) End Sub diff --git a/branches/WinOF/WIX/SDK_Samples/DDK/README.txt b/branches/WinOF/WIX/SDK_Samples/DDK/README.txt new file mode 100644 index 00000000..bfaea6cc --- /dev/null +++ b/branches/WinOF/WIX/SDK_Samples/DDK/README.txt @@ -0,0 +1,44 @@ + +DDK (Driver Development Kit) Build Environment Example [12-06-07] +----------------------------------------------------------------- + +Install the Windows Server 2003 (SP1) DDK see http://www.microsoft.com/whdc/devtools/ddk/default.mspx . +Why use the DDK? Windows Server 2003 DDK (SP1) is what's used to build the WinOF distribution. +Installing the DDK first requires burning a CD of what you have just downloaded - sigh... + +Due to the problematic nature of spaces in path names, Windows Server 2003 DDK does not allow spaces in +pathnames; this is why IBSDK is not installed under WinOF. + + +Building CM test example +------------------------ + +Start a 'Free/Release' type DDK command prompt for you respective architecture [x86,amd64,ia64]. + +cd to C:\IBAL\Sampes\DDK + +build -wg + +The executable will be created in a processor specific directory: + x64 (Release/Free) example: C:\IBAL\Sampes\DDK\objfre_wnet_amd64\amd64\cmtest.exe + x64 (Checked/Debug)) example: C:\IBAL\Sampes\DDK\objchk_wnet_amd64\amd64\cmtest.exe + + +Executing cmtest.exe +-------------------- + +cmtest.exe passes messages between the server and client over a reliable IB queue-pair connection (RC). +Connection end-points (hosts) are identified by IB port LID (hex integer, as displayed by the vstat command). +Note: are not allowed between command line switch and it's argument. + +Server side: cmtest -s -l0xlll -r0xrrr -m1024 -n100 + +Client side: cmtest.exe -l0xlll -r0xrrr -m1024 -n100 + +where: + lll == local port lid as displayed by vstat command. + rrr == Remote port lid as displayed by vstat; lll == rrr for local loopback operation. + -m == bytes per message + -n == number of messages to send. + -c == number of connections (default is -c1) + cmtest -h reveals all... diff --git a/branches/WinOF/WIX/SDK_Samples/DDK/SOURCES b/branches/WinOF/WIX/SDK_Samples/DDK/SOURCES new file mode 100644 index 00000000..99254f96 --- /dev/null +++ b/branches/WinOF/WIX/SDK_Samples/DDK/SOURCES @@ -0,0 +1,21 @@ +TARGETNAME=cmtest +TARGETPATH=obj$(BUILD_ALT_DIR) +TARGETTYPE=PROGRAM +UMTYPE=console +USE_CRTDLL=1 +_LIBS=..\..\Lib + +SOURCES=cmtest.c cmtest.rc + +INCLUDES=..\..\Inc; + +TARGETLIBS= \ +!if $(FREEBUILD) + $(_LIBS)\complib.lib \ + $(_LIBS)\ibal.lib +!else + $(_LIBS)\complibd.lib \ + $(_LIBS)\ibald.lib +!endif + +MSC_WARNING_LEVEL= /W3 diff --git a/branches/WinOF/WIX/SDK_Samples/DDK/cmtest.rc b/branches/WinOF/WIX/SDK_Samples/DDK/cmtest.rc new file mode 100644 index 00000000..3c02ca9b --- /dev/null +++ b/branches/WinOF/WIX/SDK_Samples/DDK/cmtest.rc @@ -0,0 +1,48 @@ +/* + * Copyright (c) 2007 Intel Corporation. All rights reserved. + * + * This software is available to you under the OpenIB.org BSD license + * below: + * + * Redistribution and use in source and binary forms, with or + * without modification, are permitted provided that the following + * conditions are met: + * + * - Redistributions of source code must retain the above + * copyright notice, this list of conditions and the following + * disclaimer. + * + * - Redistributions in binary form must reproduce the above + * copyright notice, this list of conditions and the following + * disclaimer in the documentation and/or other materials + * provided with the distribution. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS + * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN + * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + * + * $Id$ + */ + + +#include + +#define VER_FILETYPE VFT_DLL +#define VER_FILESUBTYPE VFT2_UNKNOWN + +#if DBG +#define VER_FILEDESCRIPTION_STR "Connection Manager Test (Debug)" +#define VER_INTERNALNAME_STR "cmtest.exe" +#define VER_ORIGINALFILENAME_STR "cmtest.exe" +#else +#define VER_FILEDESCRIPTION_STR "Connection Manager Test (Release)" +#define VER_INTERNALNAME_STR "cmtest.exe" +#define VER_ORIGINALFILENAME_STR "cmtest.exe" +#endif + +#include diff --git a/branches/WinOF/WIX/SDK_Samples/DDK/makefile b/branches/WinOF/WIX/SDK_Samples/DDK/makefile new file mode 100644 index 00000000..f86adf81 --- /dev/null +++ b/branches/WinOF/WIX/SDK_Samples/DDK/makefile @@ -0,0 +1,7 @@ +# +# DO NOT EDIT THIS FILE!!! Edit .\sources. if you want to add a new source +# file to this component. This file merely indirects to the real make file +# that is shared by all the driver components of the OpenIB Windows project. +# + +!INCLUDE C:\IBSDK\Inc\openib.def diff --git a/branches/WinOF/WIX/SDK_Samples/VS/README.txt b/branches/WinOF/WIX/SDK_Samples/VS/README.txt new file mode 100644 index 00000000..0cf2b6ae --- /dev/null +++ b/branches/WinOF/WIX/SDK_Samples/VS/README.txt @@ -0,0 +1,44 @@ + +Visual Studio 8/5.0 (C++) Build Environment [12-06-07] +----------------------------------------------------------------- + +Install Microsoft Visual Studio 8/5.0 (C++ env) + +Building CM test example +------------------------ + + +cd to C:\IBAL\Samples\VS + +copy ..\DDK\cmtest.c cmtest.c + +Create a New Solution 'Project from Existing Code', using cmtest.c & cmtest.rc +Select a C++ console application project. + +Salient Solution points: + compile as a C program + set additional Include path as C:\IBSDK\Inc + set additional Resource Include path as C:\IBSDK\Inc + Set additional Library path as C:\IBSDK\Lib + Link with additional libraries ibal.lib & complib.lib + If building a win32 application on a 64-bit platform then link with lbal32.lib & complib32.lib + + +Executing cmtest.exe +-------------------- + +cmtest.exe passes messages between the server and client over a reliable IB queue-pair connection (RC). +Connection end-points (hosts) are identified by IB port LID (hex integer, as displayed by the vstat command). +Note: are not allowed between command line switch and it's argument. + +Server side: cmtest -s -l0xlll -r0xrrr -m1024 -n100 + +Client side: cmtest.exe -l0xlll -r0xrrr -m1024 -n100 + +where: + lll == local port lid as displayed by vstat command. + rrr == Remote port lid as displayed by vstat; lll == rrr for local loopback operation. + -m == bytes per message + -n == number of messages to send. + -c == number of connections (default is -c1) + cmtest -h reveals all... diff --git a/branches/WinOF/WIX/SDK_Samples/VS/cmtest.rc b/branches/WinOF/WIX/SDK_Samples/VS/cmtest.rc new file mode 100644 index 00000000..b0a596b0 --- /dev/null +++ b/branches/WinOF/WIX/SDK_Samples/VS/cmtest.rc @@ -0,0 +1,55 @@ +/* + * Copyright (c) 2007 Intel Corporation. All rights reserved. + * + * This software is available to you under the OpenIB.org BSD license + * below: + * + * Redistribution and use in source and binary forms, with or + * without modification, are permitted provided that the following + * conditions are met: + * + * - Redistributions of source code must retain the above + * copyright notice, this list of conditions and the following + * disclaimer. + * + * - Redistributions in binary form must reproduce the above + * copyright notice, this list of conditions and the following + * disclaimer in the documentation and/or other materials + * provided with the distribution. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS + * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN + * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + * + * $Id$ + */ + +#define IB_COMPANYNAME "OpenFabricsAlliance\x20Windows" +#define IB_PRODUCTNAME "WinOF" +#define VER_FILEMAJORVERSION 1 +#define VER_FILEMINORVERSION 0 +#define VER_FILEBUILD 1 +#define VER_FILEREV 906 + +#include + +#define VER_FILETYPE VFT_DLL +#define VER_FILESUBTYPE VFT2_UNKNOWN + + +#if DBG +#define VER_FILEDESCRIPTION_STR "Connection Manager Test (Debug)" +#define VER_INTERNALNAME_STR "cmtest.exe" +#define VER_ORIGINALFILENAME_STR "cmtest.exe" +#else +#define VER_FILEDESCRIPTION_STR "Connection Manager Test (Release)" +#define VER_INTERNALNAME_STR "cmtest.exe" +#define VER_ORIGINALFILENAME_STR "cmtest.exe" +#endif + +#include diff --git a/branches/WinOF/WIX/ia64/wof.wxs b/branches/WinOF/WIX/ia64/wof.wxs index 4a1ce4a7..f8d5357b 100644 --- a/branches/WinOF/WIX/ia64/wof.wxs +++ b/branches/WinOF/WIX/ia64/wof.wxs @@ -3,17 +3,18 @@ WinOF 1.0.1 for IA64 Itanium (IPF) on Win2K3 or XP --> - @@ -79,7 +80,7 @@ - + @@ -98,7 +99,7 @@ + Source="..\bin\Misc\Manual.htm" Vital="yes" /> - + - + - + @@ -648,9 +649,303 @@ - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - @@ -97,7 +100,7 @@ + Source="..\bin\Misc\Manual.htm" Vital="yes" /> - + - - - - - @@ -492,15 +496,17 @@ + + - + @@ -649,8 +655,306 @@ - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - @@ -69,7 +71,7 @@ SC_EXISTS - + @@ -88,7 +90,7 @@ + Source="..\bin\Misc\Manual.htm" /> - - - - - + - - - - + + - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - + + - - - - - - - - - - - - - - - - - - - - - - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + OpenFabrics Windows InfiniBand Openfabrics Alliance [www.openfabrics.org] @@ -598,12 +872,26 @@ + + + + + + + + + + + @@ -612,6 +900,7 @@ IPOIB_EXISTS + @@ -665,12 +954,14 @@ AllowAdvertise="no" InstallDefault="local" Absent="allow"> + +   - +

Windows OpenFabrics

User's Manual

-

Release 1.0.1

+

Release 1.1

-11/14/2007

+12/05/2007

Overview

The Windows OpenFabrics (WinOF) package is composed of software modules intended @@ -57,11 +57,46 @@ style='background-position: 0% 0%; mso-highlight:yellow; background-image:none;

  • Release Notes

    • -

    Features

    +

     

    +

    WinOF Features

    + +

     

    +

     

    +

     

    +

    Tools

    +

    The OpenFabrics Alliance Windows release contains a set of @@ -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. A start menu short-cut 'WinOF Cmd Window' is provided to faciliate correction tool operation.

    -

    Infiniband Subnet Management

    +

    Infiniband Subnet Management

    • opensm        Open Subnet @@ -117,30 +152,7 @@ Display HCA attributes (lids), statistics and error counters.
       

    - -

     

    -

     

    +

    <return-to-top>

     

    User mode micro-benchmarks

    @@ -327,7 +339,8 @@ Options specific to -r: This option specifies the local endpoint.
     -r --remote - This option specifies the remote endpoint.
    + This option specifies the remote endpoint LID as a hex integer 0x; see + vstat command for active port LID hex integer.
     -c --connect This option specifies the number of connections to open. Default of @@ -1165,7 +1178,7 @@ include

    -

     

    +

    <return-to-top>

    DAT ENVIRONMENT:

    @@ -1301,46 +1314,16 @@ For example, 0x3 will output to both stdout and the syslog.

    DAPL Provider library environment variables

    -

    -
    -DAPL_DBG_TYPE
    --------------
    -
    -Value specifies which parts of the registry will print -debugging information, valid values are
    -
    -    DAPL_DBG_TYPE_ERR          = 0x0001
    -DAPL_DBG_TYPE_WARN         = 0x0002
    -DAPL_DBG_TYPE_EVD          = 0x0004
    -DAPL_DBG_TYPE_CM           = 0x0008
    -DAPL_DBG_TYPE_EP           = 0x0010
    -DAPL_DBG_TYPE_UTIL         = 0x0020
    -DAPL_DBG_TYPE_CALLBACK     = 0x0040
    -DAPL_DBG_TYPE_DTO_COMP_ERR = 0x0080
    -DAPL_DBG_TYPE_API          = 0x0100
    -DAPL_DBG_TYPE_RTN          = 0x0200
    -DAPL_DBG_TYPE_EXCEPTION    = 0x0400
    -
    -or any combination of these. For example you can use 0xC to get both
    -EVD and CM output.
    -
    -Example set DAPL_DBG_TYPE=0xC
    -
    -
    -DAPL_DBG_DEST
    --------------
    -
    -Value sets the output destination, valid values are
    -
    -DAPL_DBG_DEST_STDOUT = 0x1
    -DAPL_DBG_DEST_SYSLOG = 0x2
    -DAPL_DBG_DEST_ALL    = 0x3
    -
    -For example, 0x3 will output to both stdout and the syslog.
    -
    -
    - -

    +


    DAPL_DBG_TYPE
    -------------

    + Value specifies which parts of the registry will print +debugging information, valid values are

    + DAPL_DBG_TYPE_ERR          = 0x0001
    DAPL_DBG_TYPE_WARN         = 0x0002
    DAPL_DBG_TYPE_EVD          = 0x0004
    DAPL_DBG_TYPE_CM           = 0x0008
    DAPL_DBG_TYPE_EP           = 0x0010
    DAPL_DBG_TYPE_UTIL         = 0x0020
    DAPL_DBG_TYPE_CALLBACK     = 0x0040
    DAPL_DBG_TYPE_DTO_COMP_ERR = 0x0080
    DAPL_DBG_TYPE_API          = 0x0100
    DAPL_DBG_TYPE_RTN          = 0x0200
    DAPL_DBG_TYPE_EXCEPTION    = 0x0400
    +
    or any combination of these. For example you can use 0xC to get both
    EVD and CM output.
    +
    Example set DAPL_DBG_TYPE=0xC


    DAPL_DBG_DEST
    -------------
    +
    Value sets the output destination, valid values are

    DAPL_DBG_DEST_STDOUT = 0x1
    DAPL_DBG_DEST_SYSLOG = 0x2 +
    DAPL_DBG_DEST_ALL    = 0x3

    For example, 0x3 will output to both stdout and the syslog.     +

    +

    <return-to-top>

    DAPLTEST

    @@ -1699,3 +1682,40 @@ Once completed, the "New Hardware Found" Wizard pops up again.
    
   The flags and level of debug can be controlled at load-time or run-time.
    
  
    
 
    <return-to-top>
    
+
     
    
+
    InfiniBand Software 
+Development Kit
    
+
    If selected during a WinOF install, the IB Software Development Kit will 
+be installed as '%SystemDrive%\IBSDK'. Underneath the IBSDK\ folder you will find an 
+include folder 'Inc\',  library definition files 'Lib\'  along with a 
+'Samples' folder.
    
+
    Compilation:
    
+
    
+	
    Add the additional include path '%SystemDrive%\IBSDK\Inc'; resource files 
+	may also use this path.
    
+
    
+
    Linking:
    
+
    
+	
    Add the additional library search path '%SystemDrive%\IBSDK\Lib'.
    
+	
    Include dependent libraries: ibal.lib and complib.lib, or ibal32.lib & 
+	complib32.lib for win32 applications on 64-bit platforms.
    
+
    
+
    Samples:
    
+
      
+	
    • DDK\ demonstrates how to build an IB application in the Windows 
+	Server 2003 SP1 DDK  (Driver Development Kit) environment.
      
+	Consult the README.txt file for details.
      
+	See 
+	http://www.microsoft.com/whdc/devtools/ddk/default.mspx for DDK 
+	installation details.
      
+ 
      • 
+	
    • VS\ demonstrates how to build an IB application in the Windows Server 
+	2003 R2 SP1 Visual Studio 2005 environment.
      
+	Consult the README.txt file for details.
      • 
+
    
+
+
     
    
+
    <return-to-top>
    
+
     
    
+
+
diff --git a/trunk/etc/makebin.bat b/trunk/etc/makebin.bat
index 4d9110db..d98db4e1 100644
--- a/trunk/etc/makebin.bat
+++ b/trunk/etc/makebin.bat
@@ -1,5 +1,6 @@
 @echo off
 setlocal
+
 echo %1 %2
 
 if "%1"=="" goto usage
@@ -55,69 +56,89 @@ rem
 
 set bin_dir=%1\bin\user\objchk_wnet_amd64\amd64
 set dest_dir=%2\HCA\amd64\
+
 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
-xcopy %bin_dir%\*.exe %2\tools\amd64\debug\ /y
 
-xcopy %bin_dir%\dapld.dll  %2\DAPL\amd64\ /y
-xcopy %bin_dir%\dapld.pdb  %2\DAPL\amd64\ /y
-xcopy %bin_dir%\datd.dll   %2\DAPL\amd64\ /y
-xcopy %bin_dir%\datd.lib   %2\DAPL\amd64\ /y
-xcopy %bin_dir%\datd.pdb   %2\DAPL\amd64\ /y
+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
 
-xcopy %bin_dir%\dapl2d.dll %2\DAPL2\amd64\ /y
-xcopy %bin_dir%\dapl2d.pdb %2\DAPL2\amd64\ /y
-xcopy %bin_dir%\dapl2-scmd.dll %2\DAPL2\amd64\ /y
-xcopy %bin_dir%\dapl2-scmd.pdb %2\DAPL2\amd64\ /y
-xcopy %bin_dir%\dat2d.dll  %2\DAPL2\amd64\ /y
-xcopy %bin_dir%\dat2d.lib  %2\DAPL2\amd64\ /y
-xcopy %bin_dir%\dat2d.pdb  %2\DAPL2\amd64\ /y
+xcopy %bin_dir%\*.exe %2\tools\amd64\debug\ /y
 
-rem Copy IA64 drivers
+xcopy %bin_dir%\dapld.dll  %2\DAPL\amd64\ /yq
+xcopy %bin_dir%\dapld.pdb  %2\DAPL\amd64\ /yq
+xcopy %bin_dir%\datd.dll   %2\DAPL\amd64\ /yq
+xcopy %bin_dir%\datd.lib   %2\DAPL\amd64\ /yq
+xcopy %bin_dir%\datd.pdb   %2\DAPL\amd64\ /yq
+
+xcopy %bin_dir%\dapl2d.dll %2\DAPL2\amd64\ /yq
+xcopy %bin_dir%\dapl2d.pdb %2\DAPL2\amd64\ /yq
+xcopy %bin_dir%\dapl2-scmd.dll %2\DAPL2\amd64\ /yq
+xcopy %bin_dir%\dapl2-scmd.pdb %2\DAPL2\amd64\ /yq
+xcopy %bin_dir%\dat2d.dll  %2\DAPL2\amd64\ /yq
+xcopy %bin_dir%\dat2d.lib  %2\DAPL2\amd64\ /yq
+xcopy %bin_dir%\dat2d.pdb  %2\DAPL2\amd64\ /yq
+
+rem Copy checked IA64 drivers
 set bin_dir=%1\bin\user\objchk_wnet_ia64\ia64
 set dest_dir=%2\HCA\ia64\
 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
-xcopy %bin_dir%\*.exe %2\tools\ia64\debug\ /y
 
-xcopy %bin_dir%\dapld.dll   %2\DAPL\ia64\ /y
-xcopy %bin_dir%\dapld.pdb   %2\DAPL\ia64\ /y
-xcopy %bin_dir%\datd.dll    %2\DAPL\ia64\ /y
-xcopy %bin_dir%\datd.lib    %2\DAPL\ia64\ /y
-xcopy %bin_dir%\datd.pdb    %2\DAPL\ia64\ /y
+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
 
-xcopy %bin_dir%\dapl2d.dll  %2\DAPL2\ia64\ /y
-xcopy %bin_dir%\dapl2d.pdb  %2\DAPL2\ia64\ /y
-xcopy %bin_dir%\dapl2-scmd.dll  %2\DAPL2\ia64\ /y
-xcopy %bin_dir%\dapl2-scmd.pdb  %2\DAPL2\ia64\ /y
-xcopy %bin_dir%\dat2d.dll   %2\DAPL2\ia64\ /y
-xcopy %bin_dir%\dat2d.lib   %2\DAPL2\ia64\ /y
-xcopy %bin_dir%\dat2d.pdb   %2\DAPL2\ia64\ /y
+xcopy %bin_dir%\*.exe %2\tools\ia64\debug\ /y
 
-rem Copy x86 drivers
+xcopy %bin_dir%\dapld.dll   %2\DAPL\ia64\ /yq
+xcopy %bin_dir%\dapld.pdb   %2\DAPL\ia64\ /yq
+xcopy %bin_dir%\datd.dll    %2\DAPL\ia64\ /yq
+xcopy %bin_dir%\datd.lib    %2\DAPL\ia64\ /yq
+xcopy %bin_dir%\datd.pdb    %2\DAPL\ia64\ /yq
+
+xcopy %bin_dir%\dapl2d.dll  %2\DAPL2\ia64\ /yq
+xcopy %bin_dir%\dapl2d.pdb  %2\DAPL2\ia64\ /yq
+xcopy %bin_dir%\dapl2-scmd.dll  %2\DAPL2\ia64\ /yq
+xcopy %bin_dir%\dapl2-scmd.pdb  %2\DAPL2\ia64\ /yq
+xcopy %bin_dir%\dat2d.dll   %2\DAPL2\ia64\ /yq
+xcopy %bin_dir%\dat2d.lib   %2\DAPL2\ia64\ /yq
+xcopy %bin_dir%\dat2d.pdb   %2\DAPL2\ia64\ /yq
+
+rem Copy checked x86 drivers
 set bin_dir=%1\bin\user\objchk_wnet_x86\i386
 set dest_dir=%2\HCA\x86\
 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
+
+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
+
 xcopy %bin_dir%\*.exe %2\tools\x86\debug\ /y
 
-xcopy %bin_dir%\dapld.dll   %2\DAPL\x86\ /y
-xcopy %bin_dir%\dapld.pdb   %2\DAPL\x86\ /y
-xcopy %bin_dir%\datd.dll    %2\DAPL\x86\ /y
-xcopy %bin_dir%\datd.lib    %2\DAPL\x86\ /y
-xcopy %bin_dir%\datd.pdb    %2\DAPL\x86\ /y
-
-xcopy %bin_dir%\dapl2d.dll  %2\DAPL2\x86\ /y
-xcopy %bin_dir%\dapl2d.pdb  %2\DAPL2\x86\ /y
-xcopy %bin_dir%\dapl2-scmd.dll  %2\DAPL2\x86\ /y
-xcopy %bin_dir%\dapl2-scmd.pdb  %2\DAPL2\x86\ /y
-xcopy %bin_dir%\dat2d.dll   %2\DAPL2\x86\ /y
-xcopy %bin_dir%\dat2d.lib   %2\DAPL2\x86\ /y
-xcopy %bin_dir%\dat2d.pdb   %2\DAPL2\x86\ /y
-
-rem WOW64 DLLs
-copy /B %bin_dir%\installsp.exe %2\tools\x86\debug /y
+xcopy %bin_dir%\dapld.dll   %2\DAPL\x86\ /yq
+xcopy %bin_dir%\dapld.pdb   %2\DAPL\x86\ /yq
+xcopy %bin_dir%\datd.dll    %2\DAPL\x86\ /yq
+xcopy %bin_dir%\datd.lib    %2\DAPL\x86\ /yq
+xcopy %bin_dir%\datd.pdb    %2\DAPL\x86\ /yq
+
+xcopy %bin_dir%\dapl2d.dll  %2\DAPL2\x86\ /yq
+xcopy %bin_dir%\dapl2d.pdb  %2\DAPL2\x86\ /yq
+xcopy %bin_dir%\dapl2-scmd.dll  %2\DAPL2\x86\ /yq
+xcopy %bin_dir%\dapl2-scmd.pdb  %2\DAPL2\x86\ /yq
+xcopy %bin_dir%\dat2d.dll   %2\DAPL2\x86\ /yq
+xcopy %bin_dir%\dat2d.lib   %2\DAPL2\x86\ /yq
+xcopy %bin_dir%\dat2d.pdb   %2\DAPL2\x86\ /yq
+
+rem checked x86 DLLs --> WOW64 DLLs
+rem xcopy had problems determining if dest was File | Dir ??
+
+copy /B %bin_dir%\installsp.exe %2\tools\x86\debug\ /y
 copy /B %bin_dir%\ibald.dll %2\HCA\amd64\ibal32d.dll /y
+copy /B %bin_dir%\ibald.lib %2\HCA\amd64\ibal32d.lib /y
+copy /B %bin_dir%\ibald.pdb %2\HCA\amd64\ibal32d.pdb /y
 copy /B %bin_dir%\complibd.dll %2\HCA\amd64\cl32d.dll /y
+copy /B %bin_dir%\complibd.lib %2\HCA\amd64\cl32d.lib /y
+copy /B %bin_dir%\complibd.pdb %2\HCA\amd64\cl32d.pdb /y
 copy /B %bin_dir%\ibald.dll %2\HCA\ia64\ibal32d.dll /y
+copy /B %bin_dir%\ibald.lib %2\HCA\ia64\ibal32d.lib /y
+copy /B %bin_dir%\ibald.pdb %2\HCA\ia64\ibal32d.pdb /y
 copy /B %bin_dir%\complibd.dll %2\HCA\ia64\cl32d.dll /y
+copy /B %bin_dir%\complibd.lib %2\HCA\ia64\cl32d.lib /y
+copy /B %bin_dir%\complibd.pdb %2\HCA\ia64\cl32d.pdb /y
 
 copy /B %bin_dir%\mthcaud.dll %2\HCA\amd64\mthca32d.dll /y
 copy /B %bin_dir%\mthcaud.dll %2\HCA\ia64\mthca32d.dll /y
@@ -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
 copy /B %bin_dir%\dat2d.dll  %2\DAPL2\ia64\dat232d.dll /y
 
+rem Copy Free x64 drivers
 set bin_dir=%1\bin\user\objfre_wnet_amd64\amd64
 set dest_dir=%2\HCA\amd64\
 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
+
+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
+
 xcopy %bin_dir%\ibwsd.dll %2\net\amd64\ /y
 xcopy %bin_dir%\installsp.exe %2\net\amd64\ /y
 xcopy %bin_dir%\*.exe %2\tools\amd64\release\ /y
 
-xcopy %bin_dir%\dapl.dll  %2\DAPL\amd64\ /y
-xcopy %bin_dir%\dapl.pdb  %2\DAPL\amd64\ /y
-xcopy %bin_dir%\dat.dll   %2\DAPL\amd64\ /y
-xcopy %bin_dir%\dat.lib   %2\DAPL\amd64\ /y
-xcopy %bin_dir%\dat.pdb   %2\DAPL\amd64\ /y
+xcopy %bin_dir%\dapl.dll  %2\DAPL\amd64\ /yq
+xcopy %bin_dir%\dapl.pdb  %2\DAPL\amd64\ /yq
+xcopy %bin_dir%\dat.dll   %2\DAPL\amd64\ /yq
+xcopy %bin_dir%\dat.lib   %2\DAPL\amd64\ /yq
+xcopy %bin_dir%\dat.pdb   %2\DAPL\amd64\ /yq
 
-xcopy %bin_dir%\dapl2.dll %2\DAPL2\amd64\ /y
-xcopy %bin_dir%\dapl2.pdb %2\DAPL2\amd64\ /y
-xcopy %bin_dir%\dapl2-scm.dll %2\DAPL2\amd64\ /y
-xcopy %bin_dir%\dapl2-scm.pdb %2\DAPL2\amd64\ /y
-xcopy %bin_dir%\dat2.dll  %2\DAPL2\amd64\ /y
-xcopy %bin_dir%\dat2.lib  %2\DAPL2\amd64\ /y
-xcopy %bin_dir%\dat2.pdb  %2\DAPL2\amd64\ /y
+xcopy %bin_dir%\dapl2.dll %2\DAPL2\amd64\ /yq
+xcopy %bin_dir%\dapl2.pdb %2\DAPL2\amd64\ /yq
+xcopy %bin_dir%\dapl2-scm.dll %2\DAPL2\amd64\ /yq
+xcopy %bin_dir%\dapl2-scm.pdb %2\DAPL2\amd64\ /yq
+xcopy %bin_dir%\dat2.dll  %2\DAPL2\amd64\ /yq
+xcopy %bin_dir%\dat2.lib  %2\DAPL2\amd64\ /yq
+xcopy %bin_dir%\dat2.pdb  %2\DAPL2\amd64\ /yq
 
 xcopy %bin_dir%\mtcr.dll %2\FwTools\amd64\ /y
 xcopy %bin_dir%\flint.exe %2\FwTools\amd64\ /y
 xcopy %bin_dir%\mst.exe %2\FwTools\amd64\ /y
 
-rem Copy IA64 drivers
+rem Copy Free IA64 drivers
 set bin_dir=%1\bin\user\objfre_wnet_ia64\ia64
 set dest_dir=%2\HCA\ia64\
 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
+
+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
+
 xcopy %bin_dir%\ibwsd.dll %2\net\ia64\ /y
 xcopy %bin_dir%\installsp.exe %2\net\ia64\ /y
 xcopy %bin_dir%\*.exe %2\tools\ia64\release\ /y
 
-xcopy %bin_dir%\dapl.dll  %2\DAPL\ia64\ /y
-xcopy %bin_dir%\dapl.pdb  %2\DAPL\ia64\ /y
-xcopy %bin_dir%\dat.dll   %2\DAPL\ia64\ /y
-xcopy %bin_dir%\dat.lib   %2\DAPL\ia64\ /y
-xcopy %bin_dir%\dat.pdb   %2\DAPL\ia64\ /y
+xcopy %bin_dir%\dapl.dll  %2\DAPL\ia64\ /yq
+xcopy %bin_dir%\dapl.pdb  %2\DAPL\ia64\ /yq
+xcopy %bin_dir%\dat.dll   %2\DAPL\ia64\ /yq
+xcopy %bin_dir%\dat.lib   %2\DAPL\ia64\ /yq
+xcopy %bin_dir%\dat.pdb   %2\DAPL\ia64\ /yq
 
-xcopy %bin_dir%\dapl2.dll %2\DAPL2\ia64\ /y
-xcopy %bin_dir%\dapl2.pdb %2\DAPL2\ia64\ /y
-xcopy %bin_dir%\dapl2-scm.dll %2\DAPL2\ia64\ /y
-xcopy %bin_dir%\dapl2-scm.pdb %2\DAPL2\ia64\ /y
-xcopy %bin_dir%\dat2.dll  %2\DAPL2\ia64\ /y
-xcopy %bin_dir%\dat2.lib  %2\DAPL2\ia64\ /y
-xcopy %bin_dir%\dat2.pdb  %2\DAPL2\ia64\ /y
+xcopy %bin_dir%\dapl2.dll %2\DAPL2\ia64\ /yq
+xcopy %bin_dir%\dapl2.pdb %2\DAPL2\ia64\ /yq
+xcopy %bin_dir%\dapl2-scm.dll %2\DAPL2\ia64\ /yq
+xcopy %bin_dir%\dapl2-scm.pdb %2\DAPL2\ia64\ /yq
+xcopy %bin_dir%\dat2.dll  %2\DAPL2\ia64\ /yq
+xcopy %bin_dir%\dat2.lib  %2\DAPL2\ia64\ /yq
+xcopy %bin_dir%\dat2.pdb  %2\DAPL2\ia64\ /yq
 
 xcopy %bin_dir%\mtcr.dll %2\FwTools\ia64\ /y
 xcopy %bin_dir%\flint.exe %2\FwTools\ia64\ /y
 xcopy %bin_dir%\mst.exe %2\FwTools\ia64\ /y
 
-rem Copy x86 drivers
+rem Copy Free x86 drivers
 set bin_dir=%1\bin\user\objfre_wnet_x86\i386
 set dest_dir=%2\HCA\x86\
 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
-xcopy %bin_dir%\*.exe %2\tools\x86\release\ /y
 
-xcopy %bin_dir%\dapl.dll  %2\DAPL\x86\ /y
-xcopy %bin_dir%\dapl.pdb  %2\DAPL\x86\ /y
-xcopy %bin_dir%\dat.dll   %2\DAPL\x86\ /y
-xcopy %bin_dir%\dat.lib   %2\DAPL\x86\ /y
-xcopy %bin_dir%\dat.pdb   %2\DAPL\x86\ /y
+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
 
-xcopy %bin_dir%\dapl2.dll %2\DAPL2\x86\ /y
-xcopy %bin_dir%\dapl2.pdb %2\DAPL2\x86\ /y
-xcopy %bin_dir%\dapl2-scm.dll %2\DAPL2\x86\ /y
-xcopy %bin_dir%\dapl2-scm.pdb %2\DAPL2\x86\ /y
-xcopy %bin_dir%\dat2.dll  %2\DAPL2\x86\ /y
-xcopy %bin_dir%\dat2.lib  %2\DAPL2\x86\ /y
-xcopy %bin_dir%\dat2.pdb  %2\DAPL2\x86\ /y
+xcopy %bin_dir%\*.exe %2\tools\x86\release\ /y
+xcopy %bin_dir%\dapl.dll  %2\DAPL\x86\ /yq
+xcopy %bin_dir%\dapl.pdb  %2\DAPL\x86\ /yq
+xcopy %bin_dir%\dat.dll   %2\DAPL\x86\ /yq
+xcopy %bin_dir%\dat.lib   %2\DAPL\x86\ /yq
+xcopy %bin_dir%\dat.pdb   %2\DAPL\x86\ /yq
+
+xcopy %bin_dir%\dapl2.dll %2\DAPL2\x86\ /yq
+xcopy %bin_dir%\dapl2.pdb %2\DAPL2\x86\ /yq
+xcopy %bin_dir%\dapl2-scm.dll %2\DAPL2\x86\ /yq
+xcopy %bin_dir%\dapl2-scm.pdb %2\DAPL2\x86\ /yq
+xcopy %bin_dir%\dat2.dll  %2\DAPL2\x86\ /yq
+xcopy %bin_dir%\dat2.lib  %2\DAPL2\x86\ /yq
+xcopy %bin_dir%\dat2.pdb  %2\DAPL2\x86\ /yq
 
 xcopy %bin_dir%\mtcr.dll %2\FwTools\x86\ /y
 xcopy %bin_dir%\flint.exe %2\FwTools\x86\ /y
 xcopy %bin_dir%\mst.exe %2\FwTools\x86\ /y
 
-rem WOW64 DLLs
-xcopy %bin_dir%\ibwsd.dll %2\net\x86\ /y
-xcopy %bin_dir%\installsp.exe %2\net\x86\ /y
-xcopy %bin_dir%\installsp.exe %2\tools\x86\release /y
+rem free x86 DLLs --> WOW64 DLLs
+copy %bin_dir%\ibwsd.dll %2\net\x86\ /y
+copy %bin_dir%\installsp.exe %2\net\x86\ /y
+copy %bin_dir%\installsp.exe %2\tools\x86\release /y
 copy /B %bin_dir%\ibwsd.dll %2\net\amd64\ibwsd32.dll /y
 copy /B %bin_dir%\ibwsd.dll %2\net\ia64\ibwsd32.dll /y
 copy /B %bin_dir%\ibal.dll %2\HCA\amd64\ibal32.dll /y
+copy /B %bin_dir%\ibal.lib %2\HCA\amd64\ibal32.lib /y
+copy /B %bin_dir%\ibal.pdb %2\HCA\amd64\ibal32.pdb /y
 copy /B %bin_dir%\complib.dll %2\HCA\amd64\cl32.dll /y
+copy /B %bin_dir%\complib.lib %2\HCA\amd64\cl32.lib /y
+copy /B %bin_dir%\complib.pdb %2\HCA\amd64\cl32.pdb /y
 copy /B %bin_dir%\ibal.dll %2\HCA\ia64\ibal32.dll /y
+copy /B %bin_dir%\ibal.lib %2\HCA\ia64\ibal32.lib /y
+copy /B %bin_dir%\ibal.pdb %2\HCA\ia64\ibal32.pdb /y
 copy /B %bin_dir%\complib.dll %2\HCA\ia64\cl32.dll /y
+copy /B %bin_dir%\complib.lib %2\HCA\ia64\cl32.lib /y
+copy /B %bin_dir%\complib.pdb %2\HCA\ia64\cl32.pdb /y
 copy /B %bin_dir%\mthcau.dll %2\HCA\amd64\mthca32.dll /y
 copy /B %bin_dir%\mthcau.dll %2\HCA\ia64\mthca32.dll /y
 copy /B %bin_dir%\mt23108u.dll %2\HCA\amd64\mtuvp32.dll /y
@@ -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
 xcopy %1\tools\wsdinstall\user\installsp.exe.manifest %2\net\ia64 /y
 
-xcopy %1\bin %2\bin\ /ey
-xcopy %1\bin\*.pdb %2\symbols\ /ey
+echo Copy bin\ files
+xcopy %1\bin %2\bin\ /eyq
+echo Copy symbol files
+xcopy %1\bin\*.pdb %2\symbols\ /eyq
 
 pushd %2
-del /s bin\*.pdb
-del /s ibtest*
-del /s pingpong*
-del /s *Sdp*
-del /s Select*
-del /s usrp*
-del /s bin\*.lib
-del /s bin\*.exp
+del /s bin\*.pdb > nul
+del /s ibtest*   > nul
+del /s pingpong* > nul
+del /s *Sdp*     > nul
+del /s Select*   > nul
+del /s usrp*     > nul
+del /s bin\*.lib > nul
+del /s bin\*.exp > nul
 popd
 
-rem Copy DAT header files
-
+rem Copy DAT v1.1 header files
 if exist %1\ulp\dapl\dat\include\dat (
     pushd %1\ulp\dapl\dat\include\dat
 
-    xcopy dat.h %2\DAPL /Y  
-    xcopy dat_error.h %2\DAPL /Y  
-    xcopy dat_platform_specific.h %2\DAPL /Y  
-    xcopy dat_redirection.h %2\DAPL /Y  
-    xcopy dat_registry.h %2\DAPL /Y
-    xcopy dat_vendor_specific.h %2\DAPL /Y
-    xcopy udat.h %2\DAPL /Y
-    xcopy udat_config.h %2\DAPL /Y
-    xcopy udat_redirection.h %2\DAPL /Y
-    xcopy udat_vendor_specific.h %2\DAPL /Y
+    xcopy dat.h %2\DAPL /Y/Q
+    xcopy dat_error.h %2\DAPL /Y/Q
+    xcopy dat_platform_specific.h %2\DAPL /Y/Q
+    xcopy dat_redirection.h %2\DAPL /Y/Q
+    xcopy dat_registry.h %2\DAPL /Y/Q
+    xcopy dat_vendor_specific.h %2\DAPL /Y/Q
+    xcopy udat.h %2\DAPL /Y/Q
+    xcopy udat_config.h %2\DAPL /Y/Q
+    xcopy udat_redirection.h %2\DAPL /Y/Q
+    xcopy udat_vendor_specific.h %2\DAPL /Y/Q
     popd
 )
 
+rem Copy DAT v2.0 header files
 if exist %1\ulp\dapl2\dat\include\dat (
     pushd %1\ulp\dapl2\dat\include\dat
 
-    xcopy dat.h %2\DAPL2 /Y  
-    xcopy dat_error.h %2\DAPL2 /Y  
-    xcopy dat_platform_specific.h %2\DAPL2 /Y  
-    xcopy dat_redirection.h %2\DAPL2 /Y  
-    xcopy dat_registry.h %2\DAPL2 /Y
-    xcopy dat_vendor_specific.h %2\DAPL2 /Y
-    xcopy udat.h %2\DAPL2 /Y
-    xcopy udat_config.h %2\DAPL2 /Y
-    xcopy udat_redirection.h %2\DAPL2 /Y
-    xcopy udat_vendor_specific.h %2\DAPL2 /Y
+    xcopy dat.h %2\DAPL2 /Y/Q  
+    xcopy dat_error.h %2\DAPL2 /Y/Q
+    xcopy dat_platform_specific.h %2\DAPL2 /Y/Q
+    xcopy dat_redirection.h %2\DAPL2 /Y/Q
+    xcopy dat_registry.h %2\DAPL2 /Y/Q
+    xcopy dat_vendor_specific.h %2\DAPL2 /Y/Q
+    xcopy udat.h %2\DAPL2 /Y/Q
+    xcopy udat_config.h %2\DAPL2 /Y/Q
+    xcopy udat_redirection.h %2\DAPL2 /Y/Q
+    xcopy udat_vendor_specific.h %2\DAPL2 /Y/Q
     popd
     pushd %1\ulp\dapl2\test\dapltest\scripts
-    xcopy dt-svr.bat %2\DAPL2 /Y
-    xcopy dt-cli.bat %2\DAPL2 /Y
+    xcopy dt-svr.bat %2\DAPL2 /Y/Q
+    xcopy dt-cli.bat %2\DAPL2 /Y/Q
+    popd
+)
+
+rem Copy IBAL header files
+if exist %1\inc (
+    if exist %2\inc rmdir /S/Q %2\inc
+    mkdir %2\Inc
+    pushd %1\inc
+    xcopy oib_ver.h %2\Inc /Y/Q
+    xcopy openib.def %2\Inc /Y/Q
+    xcopy Complib %2\Inc\Complib /I/S/Y/Q
+    xcopy Iba %2\Inc\Iba /I/S/Y/Q
+    xcopy User\Complib %2\Inc\Complib /I/S/Y/Q
+    xcopy User\Iba %2\Inc\Iba /I/S/Y/Q
     popd
 )
 
+rem Docs & SDK items
+if NOT exist %2\Misc (
+    mkdir %2\Misc
+)
+copy /Y %1\Docs\Manual.htm %2\Misc\Manual.htm /A
+copy /Y %1\tests\cmtest\user\cmtest_main.c %2\Misc\cmtest.c /A
+
 goto end
 
 :usage
-- 
2.41.0