[WinOF] makebin now copies DAT header files to bin\DAPL if %1\ulp\dapl\dat\include...

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

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