From c95355383e281ab76c6951ccce33088267a2f0f7 Mon Sep 17 00:00:00 2001
From: stansmith <stansmith@ad392aa1-c5ef-ae45-8dd8-e69d62a5ef86>
Date: Wed, 15 Aug 2007 23:51:12 +0000
Subject: [PATCH] [WinOF] makebin now copies DAT header files to bin\DAPL if
 %1\ulp\dapl\dat\include\dat is present. xcopy becomes confused as to whether
 the dest is a file or directory when the file is copied and renamed (case of
 WOW64 files). Confusion results in xcopy prompting for user input. Changed
 offending copy lines from xcopy to copy /B, enable makebin script run to
 completion without user input.

git-svn-id: svn://openib.tc.cornell.edu/gen1@760 ad392aa1-c5ef-ae45-8dd8-e69d62a5ef86
---
 trunk/etc/makebin.bat | 75 +++++++++++++++++++++++++++----------------
 1 file changed, 48 insertions(+), 27 deletions(-)

diff --git a/trunk/etc/makebin.bat b/trunk/etc/makebin.bat
index 0ae16615..d94bfe95 100644
--- a/trunk/etc/makebin.bat
+++ b/trunk/etc/makebin.bat
@@ -1,4 +1,5 @@
 @echo off
+setlocal
 echo %1 %2
 
 if "%1"=="" goto usage
@@ -76,19 +77,19 @@ xcopy %bin_dir%\dapld.dll %2\DAPL\x86\ /y
 xcopy %bin_dir%\datd.dll %2\DAPL\x86\ /y
 
 rem WOW64 DLLs
-xcopy %bin_dir%\installsp.exe %2\tools\x86\debug /y
-xcopy %bin_dir%\ibald.dll %2\HCA\amd64\ibal32d.dll /y
-xcopy %bin_dir%\complibd.dll %2\HCA\amd64\cl32d.dll /y
-xcopy %bin_dir%\ibald.dll %2\HCA\ia64\ibal32d.dll /y
-xcopy %bin_dir%\complibd.dll %2\HCA\ia64\cl32d.dll /y
-xcopy %bin_dir%\mthcaud.dll %2\HCA\amd64\mthca32d.dll /y
-xcopy %bin_dir%\mthcaud.dll %2\HCA\ia64\mthca32d.dll /y
-xcopy %bin_dir%\mt23108ud.dll %2\HCA\amd64\mtuvp32d.dll /y
-xcopy %bin_dir%\mt23108ud.dll %2\HCA\ia64\mtuvp32d.dll /y
-xcopy %bin_dir%\dapld.dll %2\DAPL\amd64\dapl32d.dll /y
-xcopy %bin_dir%\datd.dll %2\DAPL\amd64\dat32d.dll /y
-xcopy %bin_dir%\dapld.dll %2\DAPL\ia64\dapl32d.dll /y
-xcopy %bin_dir%\datd.dll %2\DAPL\ia64\dat32d.dll /y
+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%\complibd.dll %2\HCA\amd64\cl32d.dll /y
+copy /B %bin_dir%\ibald.dll %2\HCA\ia64\ibal32d.dll /y
+copy /B %bin_dir%\complibd.dll %2\HCA\ia64\cl32d.dll /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
+copy /B %bin_dir%\mt23108ud.dll %2\HCA\amd64\mtuvp32d.dll /y
+copy /B %bin_dir%\mt23108ud.dll %2\HCA\ia64\mtuvp32d.dll /y
+copy /B %bin_dir%\dapld.dll %2\DAPL\amd64\dapl32d.dll /y
+copy /B %bin_dir%\datd.dll %2\DAPL\amd64\dat32d.dll /y
+copy /B %bin_dir%\dapld.dll %2\DAPL\ia64\dapl32d.dll /y
+copy /B %bin_dir%\datd.dll %2\DAPL\ia64\dat32d.dll /y
 
 set bin_dir=%1\bin\user\objfre_wnet_amd64\amd64
 set dest_dir=%2\HCA\amd64\
@@ -130,20 +131,20 @@ 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
-xcopy %bin_dir%\ibwsd.dll %2\net\amd64\ibwsd32.dll /y
-xcopy %bin_dir%\ibwsd.dll %2\net\ia64\ibwsd32.dll /y
-xcopy %bin_dir%\ibal.dll %2\HCA\amd64\ibal32.dll /y
-xcopy %bin_dir%\complib.dll %2\HCA\amd64\cl32.dll /y
-xcopy %bin_dir%\ibal.dll %2\HCA\ia64\ibal32.dll /y
-xcopy %bin_dir%\complib.dll %2\HCA\ia64\cl32.dll /y
-xcopy %bin_dir%\mthcau.dll %2\HCA\amd64\mthca32.dll /y
-xcopy %bin_dir%\mthcau.dll %2\HCA\ia64\mthca32.dll /y
-xcopy %bin_dir%\mt23108u.dll %2\HCA\amd64\mtuvp32.dll /y
-xcopy %bin_dir%\mt23108u.dll %2\HCA\ia64\mtuvp32.dll /y
-xcopy %bin_dir%\dapl.dll %2\DAPL\amd64\dapl32.dll /y
-xcopy %bin_dir%\dat.dll %2\DAPL\amd64\dat32.dll /y
-xcopy %bin_dir%\dapl.dll %2\DAPL\ia64\dapl32.dll /y
-xcopy %bin_dir%\dat.dll %2\DAPL\ia64\dat32.dll /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%\complib.dll %2\HCA\amd64\cl32.dll /y
+copy /B %bin_dir%\ibal.dll %2\HCA\ia64\ibal32.dll /y
+copy /B %bin_dir%\complib.dll %2\HCA\ia64\cl32.dll /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
+copy /B %bin_dir%\mt23108u.dll %2\HCA\ia64\mtuvp32.dll /y
+copy /B %bin_dir%\dapl.dll %2\DAPL\amd64\dapl32.dll /y
+copy /B %bin_dir%\dat.dll %2\DAPL\amd64\dat32.dll /y
+copy /B %bin_dir%\dapl.dll %2\DAPL\ia64\dapl32.dll /y
+copy /B %bin_dir%\dat.dll %2\DAPL\ia64\dat32.dll /y
 
 rem Copy INF files to arch specific dirs - WHQL reasons
 xcopy %1\hw\mthca\kernel\mthca.inf %2\HCA\amd64 /y
@@ -178,6 +179,25 @@ del /s *.lib
 del /s *.exp
 popd
 
+rem Copy DAT 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
+    popd
+) else (
+    echo Skip copy of DAT header files; files not present.
+)
 goto end
 
 :usage
@@ -208,3 +228,4 @@ echo %1\bin\user\objchk_wnet_x86\i386 missing
 echo missin 
 
 :end
+endlocal
-- 
2.41.0